From b18b618bedd860622731786039deeb4c229b6468 Mon Sep 17 00:00:00 2001 From: Aki Tuomi Date: Wed, 19 Oct 2016 21:03:24 +0300 Subject: [PATCH] lib-program-client: Correctly handle error code --- src/lib-program-client/program-client-remote.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/lib-program-client/program-client-remote.c b/src/lib-program-client/program-client-remote.c index e70def4224..16266b3552 100644 --- a/src/lib-program-client/program-client-remote.c +++ b/src/lib-program-client/program-client-remote.c @@ -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; } -- 2.47.3