]> git.ipfire.org Git - thirdparty/dovecot/core.git/commitdiff
doveadm deduplicate: Simplify code by using doveadm_mail_iter_deinit_sync()
authorTimo Sirainen <timo.sirainen@open-xchange.com>
Thu, 29 Apr 2021 18:09:01 +0000 (21:09 +0300)
committeraki.tuomi <aki.tuomi@open-xchange.com>
Wed, 16 Feb 2022 11:25:56 +0000 (11:25 +0000)
src/doveadm/doveadm-mail-deduplicate.c

index d0ce3d2999ab6ef345421383e714043262541d73..abe41559fba53b8e9a6377881f626d81f1038da7 100644 (file)
@@ -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;
 }