From: Timo Sirainen <timo.sirainen@open-xchange.com>
Date: Wed, 29 Sep 2021 16:04:37 +0000 (+0200)
Subject: doveadm mail batch: Fix run() return value on errors
X-Git-Tag: 2.3.18~317
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f318731eacd4e1090511c52bc4697c57cb9c4a07;p=thirdparty%2Fdovecot%2Fcore.git

doveadm mail batch: Fix run() return value on errors

The function always returned 0, even when there was an error. This practically
doesn't fix anything, but makes it work the way it was intended. It also makes
scan-build happier.

Broken by fd4360e30b695e596a5081a6080152188a12852a
---

diff --git a/src/doveadm/doveadm-mail-batch.c b/src/doveadm/doveadm-mail-batch.c
index 5acacc9163..2dbbb891bb 100644
--- a/src/doveadm/doveadm-mail-batch.c
+++ b/src/doveadm/doveadm-mail-batch.c
@@ -42,12 +42,11 @@ static int cmd_batch_run(struct doveadm_mail_cmd_context *_ctx,
 			event_reason_code_prefix("doveadm", "cmd_",
 						 cmd->cmd->name);
 		struct event_reason *reason = event_reason_begin(reason_code);
-		int ret = cmd->v.run(cmd, user);
+		ret = cmd->v.run(cmd, user);
 		event_reason_end(&reason);
 		if (ret < 0) {
 			i_assert(cmd->exit_code != 0);
 			_ctx->exit_code = cmd->exit_code;
-			ret = -1;
 			break;
 		}
 		cmd->cur_mail_user = NULL;