doveadm: doveadm_mail_iter_init() - Change bool parameter to flags

diff --git a/src/doveadm/doveadm-mail-altmove.c b/src/doveadm/doveadm-mail-altmove.c
index 42b5d6029d4f8b42c02a6997661921c19d158ba0..7bcf7b057039cb51279df581a0f5623f926e5335 100644 (file)
--- a/src/doveadm/doveadm-mail-altmove.c
+++ b/src/doveadm/doveadm-mail-altmove.c
@@ -24,7 +24,7 @@ cmd_altmove_box(struct doveadm_mail_cmd_context *ctx,
        enum modify_type modify_type =
                !reverse ? MODIFY_ADD : MODIFY_REMOVE;
 
-       if (doveadm_mail_iter_init(ctx, info, search_args, 0, NULL, FALSE,
+       if (doveadm_mail_iter_init(ctx, info, search_args, 0, NULL, 0,
                                   &iter) < 0)
                return -1;
 

diff --git a/src/doveadm/doveadm-mail-copymove.c b/src/doveadm/doveadm-mail-copymove.c
index 93b74547eee1eea84ac759e0d8b5c680eed33339..7e26ed8a24672cc0b5a469bd98e6f25dc7d1deb3 100644 (file)
--- a/src/doveadm/doveadm-mail-copymove.c
+++ b/src/doveadm/doveadm-mail-copymove.c
@@ -32,7 +32,7 @@ cmd_copy_box(struct copy_cmd_context *ctx, struct mailbox *destbox,
        int ret = 0, ret2;
 
        if (doveadm_mail_iter_init(&ctx->ctx, info, ctx->ctx.search_args, 0,
-                                  NULL, FALSE, &iter) < 0)
+                                  NULL, 0, &iter) < 0)
                return -1;
 
        /* use a separately committed transaction for each mailbox.

diff --git a/src/doveadm/doveadm-mail-deduplicate.c b/src/doveadm/doveadm-mail-deduplicate.c
index 55d747f50205bfbe324aa9030e7f907098285dbf..2854a4a746a3efb12e14790061c8f604d9f1e3bc 100644 (file)
--- a/src/doveadm/doveadm-mail-deduplicate.c
+++ b/src/doveadm/doveadm-mail-deduplicate.c
@@ -82,7 +82,7 @@ cmd_deduplicate_box(struct doveadm_mail_cmd_context *_ctx,
        struct uidlist *value;
        int ret = 0;
 
-       if (doveadm_mail_iter_init(_ctx, info, search_args, 0, NULL, FALSE,
+       if (doveadm_mail_iter_init(_ctx, info, search_args, 0, NULL, 0,
                                   &iter) < 0)
                return -1;
 

diff --git a/src/doveadm/doveadm-mail-expunge.c b/src/doveadm/doveadm-mail-expunge.c
index c7fc6149ac5d65fa72d290bfa5ebda176f184beb..4ab7e3dc581d8470e67504efa666df8259abdd32 100644 (file)
--- a/src/doveadm/doveadm-mail-expunge.c
+++ b/src/doveadm/doveadm-mail-expunge.c
@@ -26,7 +26,7 @@ cmd_expunge_box(struct doveadm_mail_cmd_context *_ctx,
        enum mail_error error;
        int ret = 0;
 
-       if (doveadm_mail_iter_init(_ctx, info, search_args, 0, NULL, FALSE,
+       if (doveadm_mail_iter_init(_ctx, info, search_args, 0, NULL, 0,
                                   &iter) < 0)
                return -1;
 

diff --git a/src/doveadm/doveadm-mail-fetch.c b/src/doveadm/doveadm-mail-fetch.c
index d8b396a199bfed4cd851d4bb0fc40f210a5507b4..4bd7464bef6b1d3bf84ff6f7d0f8a5628c174e5e 100644 (file)
--- a/src/doveadm/doveadm-mail-fetch.c
+++ b/src/doveadm/doveadm-mail-fetch.c
@@ -609,7 +609,7 @@ cmd_fetch_box(struct fetch_cmd_context *ctx, const struct mailbox_info *info)
        if (doveadm_mail_iter_init(&ctx->ctx, info, ctx->ctx.search_args,
                                   ctx->wanted_fields,
                                   array_front(&ctx->header_fields),
-                                  FALSE,
+                                  0,
                                   &iter) < 0)
                return -1;
 

diff --git a/src/doveadm/doveadm-mail-flags.c b/src/doveadm/doveadm-mail-flags.c
index 5d3dac91a533a4822e96704b55045b48db4fc5bc..7c252a7255ee68b59b3b5645b7bbf407da6c49c0 100644 (file)
--- a/src/doveadm/doveadm-mail-flags.c
+++ b/src/doveadm/doveadm-mail-flags.c
@@ -26,7 +26,7 @@ cmd_flags_run_box(struct flags_cmd_context *ctx,
        struct mail_keywords *kw = NULL;
 
        if (doveadm_mail_iter_init(&ctx->ctx, info, ctx->ctx.search_args,
-                                  0, NULL, FALSE, &iter) < 0)
+                                  0, NULL, 0, &iter) < 0)
                return -1;
        box = doveadm_mail_iter_get_mailbox(iter);
 

diff --git a/src/doveadm/doveadm-mail-import.c b/src/doveadm/doveadm-mail-import.c
index aec85d3ffdaf536a38c489bb07ba1d3b67a9aaed..bd6ef6d0f5c046f06c61fd4ffd1a1889e41eac91 100644 (file)
--- a/src/doveadm/doveadm-mail-import.c
+++ b/src/doveadm/doveadm-mail-import.c
@@ -135,7 +135,8 @@ cmd_import_box(struct import_cmd_context *ctx, struct mail_user *dest_user,
        struct mail *mail;
        int ret = 0;
 
-       if (doveadm_mail_iter_init(&ctx->ctx, info, search_args, 0, NULL, TRUE,
+       if (doveadm_mail_iter_init(&ctx->ctx, info, search_args, 0, NULL,
+                                  DOVEADM_MAIL_ITER_FLAG_READONLY,
                                   &iter) < 0)
                return -1;
 

diff --git a/src/doveadm/doveadm-mail-iter.c b/src/doveadm/doveadm-mail-iter.c
index 0bf3cc56a90e0629b5fca7ac3463564accc18191..c4c6d9273af31025c44b10b9bb59dc59d2fc9458 100644 (file)
--- a/src/doveadm/doveadm-mail-iter.c
+++ b/src/doveadm/doveadm-mail-iter.c
@@ -22,7 +22,7 @@ int doveadm_mail_iter_init(struct doveadm_mail_cmd_context *ctx,
                           struct mail_search_args *search_args,
                           enum mail_fetch_field wanted_fields,
                           const char *const *wanted_headers,
-                          bool readonly,
+                          enum doveadm_mail_iter_flags flags,
                           struct doveadm_mail_iter **iter_r)
 {
        struct doveadm_mail_iter *iter;
@@ -31,7 +31,8 @@ int doveadm_mail_iter_init(struct doveadm_mail_cmd_context *ctx,
        enum mail_error error;
 
        enum mailbox_flags readonly_flag =
-               readonly ? MAILBOX_FLAG_READONLY : 0;
+               (flags & DOVEADM_MAIL_ITER_FLAG_READONLY) != 0 ?
+               MAILBOX_FLAG_READONLY : 0;
 
        iter = i_new(struct doveadm_mail_iter, 1);
        iter->ctx = ctx;

diff --git a/src/doveadm/doveadm-mail-iter.h b/src/doveadm/doveadm-mail-iter.h
index 7217a68054297d71b8eb517f18712f8fc39c2ce9..cbb51044e314e279cde1a72e143ac555533253f3 100644 (file)
--- a/src/doveadm/doveadm-mail-iter.h
+++ b/src/doveadm/doveadm-mail-iter.h
@@ -3,6 +3,11 @@
 
 #include "mailbox-list-iter.h"
 
+enum doveadm_mail_iter_flags {
+       /* Open the mailbox with MAILBOX_FLAG_READONLY */
+       DOVEADM_MAIL_ITER_FLAG_READONLY = BIT(0),
+};
+
 struct doveadm_mail_iter;
 struct doveadm_mail_cmd_context;
 
@@ -11,7 +16,7 @@ int doveadm_mail_iter_init(struct doveadm_mail_cmd_context *ctx,
                           struct mail_search_args *search_args,
                           enum mail_fetch_field wanted_fields,
                           const char *const *wanted_headers,
-                          bool readonly,
+                          enum doveadm_mail_iter_flags flags,
                           struct doveadm_mail_iter **iter_r) ATTR_NULL(6);
 int doveadm_mail_iter_deinit(struct doveadm_mail_iter **iter);
 int doveadm_mail_iter_deinit_sync(struct doveadm_mail_iter **iter);

diff --git a/src/doveadm/doveadm-mail-mailbox-cache.c b/src/doveadm/doveadm-mail-mailbox-cache.c
index 8eb5165a872335724d540538de532fff9afc25ff..718fca4d3f866373e52bd1d91f2e30d80f7c0ec8 100644 (file)
--- a/src/doveadm/doveadm-mail-mailbox-cache.c
+++ b/src/doveadm/doveadm-mail-mailbox-cache.c
@@ -250,7 +250,7 @@ static int cmd_mailbox_cache_remove_box(struct mailbox_cache_cmd_context *ctx,
        int ret = 0, count = 0;
 
        if (doveadm_mail_iter_init(&ctx->ctx, info, ctx->ctx.search_args,
-                                  0, NULL, FALSE, &iter) < 0)
+                                  0, NULL, 0, &iter) < 0)
                return -1;
 
        box = doveadm_mail_iter_get_mailbox(iter);

diff --git a/src/doveadm/doveadm-mail-rebuild.c b/src/doveadm/doveadm-mail-rebuild.c
index e7ae242c762e6d2aed755d0cb0fb75896b6ec5d7..211c3c39a869899f96ae859a3b1590e48d161daf 100644 (file)
--- a/src/doveadm/doveadm-mail-rebuild.c
+++ b/src/doveadm/doveadm-mail-rebuild.c
@@ -18,7 +18,7 @@ cmd_rebuild_attachment_box(struct doveadm_mail_cmd_context *ctx,
 
        if (doveadm_mail_iter_init(ctx, info, ctx->search_args,
                                   MAIL_FETCH_IMAP_BODYSTRUCTURE|
-                                  MAIL_FETCH_MESSAGE_PARTS, NULL, FALSE,
+                                  MAIL_FETCH_MESSAGE_PARTS, NULL, 0,
                                   &iter) < 0)
                return -1;
 

diff --git a/src/doveadm/doveadm-mail-search.c b/src/doveadm/doveadm-mail-search.c
index a2936313b3fb06d228a94773fc950ab110695408..81400c103f7ef6203eb8dd883fdf3e8f6fa869c4 100644 (file)
--- a/src/doveadm/doveadm-mail-search.c
+++ b/src/doveadm/doveadm-mail-search.c
@@ -20,7 +20,7 @@ cmd_search_box(struct doveadm_mail_cmd_context *ctx,
        const char *guid_str;
        int ret = 0;
 
-       if (doveadm_mail_iter_init(ctx, info, ctx->search_args, 0, NULL, FALSE,
+       if (doveadm_mail_iter_init(ctx, info, ctx->search_args, 0, NULL, 0,
                                   &iter) < 0)
                return -1;
        box = doveadm_mail_iter_get_mailbox(iter);