From: Timo Sirainen <timo.sirainen@open-xchange.com>
Date: Thu, 29 Apr 2021 18:09:01 +0000 (+0300)
Subject: doveadm deduplicate: Simplify code by using doveadm_mail_iter_deinit_sync()
X-Git-Tag: 2.3.19~78
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=41e439f9935521df3791a2da6f20503ac4279f2a;p=thirdparty%2Fdovecot%2Fcore.git

doveadm deduplicate: Simplify code by using doveadm_mail_iter_deinit_sync()
---

diff --git a/src/doveadm/doveadm-mail-deduplicate.c b/src/doveadm/doveadm-mail-deduplicate.c
index d0ce3d2999..abe41559fb 100644
--- a/src/doveadm/doveadm-mail-deduplicate.c
+++ b/src/doveadm/doveadm-mail-deduplicate.c
@@ -21,7 +21,6 @@ cmd_deduplicate_box(struct doveadm_mail_cmd_context *_ctx,
 	struct deduplicate_cmd_context *ctx =
 		(struct deduplicate_cmd_context *)_ctx;
 	struct doveadm_mail_iter *iter;
-	struct mailbox *box;
 	struct mail *mail;
 	enum mail_error error;
 	pool_t pool;
@@ -67,20 +66,11 @@ cmd_deduplicate_box(struct doveadm_mail_cmd_context *_ctx,
 		}
 	}
 
-	if (doveadm_mail_iter_deinit_keep_box(&iter, &box) < 0)
+	if (doveadm_mail_iter_deinit_sync(&iter) < 0)
 		ret = -1;
 
 	hash_table_destroy(&hash);
 	pool_unref(&pool);
-
-	if (mailbox_sync(box, 0) < 0) {
-		i_error("Syncing mailbox '%s' failed: %s",
-			mailbox_get_vname(box),
-			mailbox_get_last_internal_error(box, NULL));
-		doveadm_mail_failed_mailbox(_ctx, box);
-		ret = -1;
-	}
-	mailbox_free(&box);
 	return ret;
 }