From: Timo Sirainen <timo.sirainen@open-xchange.com>
Date: Fri, 21 Jan 2022 14:24:39 +0000 (+0200)
Subject: doveadm: doveadm_mail_iter_init() - Change bool parameter to flags
X-Git-Tag: 2.4.0~4623
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=97a30482dc72cf6d07636ad3ea31f0d5cbbfdbd6;p=thirdparty%2Fdovecot%2Fcore.git

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 42b5d6029d..7bcf7b0570 100644
--- 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 93b74547ee..7e26ed8a24 100644
--- 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 55d747f502..2854a4a746 100644
--- 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 c7fc6149ac..4ab7e3dc58 100644
--- 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 d8b396a199..4bd7464bef 100644
--- 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 5d3dac91a5..7c252a7255 100644
--- 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 aec85d3ffd..bd6ef6d0f5 100644
--- 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 0bf3cc56a9..c4c6d9273a 100644
--- 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 7217a68054..cbb51044e3 100644
--- 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 8eb5165a87..718fca4d3f 100644
--- 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 e7ae242c76..211c3c39a8 100644
--- 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 a2936313b3..81400c103f 100644
--- 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);