]> git.ipfire.org Git - thirdparty/dovecot/core.git/commitdiff
lib-program-client: Correctly handle error code
authorAki Tuomi <aki.tuomi@dovecot.fi>
Wed, 19 Oct 2016 18:03:24 +0000 (21:03 +0300)
committerTimo Sirainen <timo.sirainen@dovecot.fi>
Wed, 19 Oct 2016 18:38:26 +0000 (21:38 +0300)
src/lib-program-client/program-client-remote.c

index e70def42242abc23b7fbdbab173a3cbf97956355..16266b355215f44e13d46ca313ef7d67a0ae0b05 100644 (file)
@@ -298,7 +298,6 @@ void program_client_remote_disconnect(struct program_client *pclient, bool force
 {
        struct program_client_remote *slclient =
                (struct program_client_remote *)pclient;
-       int ret;
 
        if (pclient->error == PROGRAM_CLIENT_ERROR_NONE && !slclient->noreply &&
            pclient->program_input != NULL && !force) {
@@ -306,16 +305,14 @@ void program_client_remote_disconnect(struct program_client *pclient, bool force
                size_t size;
 
                /* Skip any remaining program output and parse the exit code */
-               while ((ret = i_stream_read_more
-                       (pclient->program_input, &data, &size)) > 0) {
+               while (i_stream_read_more
+                       (pclient->program_input, &data, &size) > 0) {
                        i_stream_skip(pclient->program_input, size);
                }
 
                /* Get exit code */
                if (!pclient->program_input->eof)
                        pclient->exit_code = -1;
-               else
-                       ret = pclient->exit_code;
        } else {
                pclient->exit_code = 1;
        }