From: Aki Tuomi <aki.tuomi@dovecot.fi>
Date: Wed, 19 Oct 2016 18:03:24 +0000 (+0300)
Subject: lib-program-client: Correctly handle error code
X-Git-Tag: 2.2.26~85
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b18b618bedd860622731786039deeb4c229b6468;p=thirdparty%2Fdovecot%2Fcore.git

lib-program-client: Correctly handle error code
---

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;
 	}