doveadm_mail_iter_init(): Removed unnecessarily returning transaction.

If it's needed in future just add a new doveadm_mail_iter_get_transaction().

diff --git a/src/doveadm/doveadm-mail-altmove.c b/src/doveadm/doveadm-mail-altmove.c
index f9fc5055a77c660ab93442aef5b28392ca74b05b..a7d9843907d32bb7482035a7642db128f13a05b0 100644 (file)
--- a/src/doveadm/doveadm-mail-altmove.c
+++ b/src/doveadm/doveadm-mail-altmove.c
@@ -20,13 +20,12 @@ cmd_altmove_box(struct doveadm_mail_cmd_context *ctx,
                struct mail_search_args *search_args, bool reverse)
 {
        struct doveadm_mail_iter *iter;
-       struct mailbox_transaction_context *trans;
        struct mail *mail;
        enum modify_type modify_type =
                !reverse ? MODIFY_ADD : MODIFY_REMOVE;
 
        if (doveadm_mail_iter_init(ctx, info, search_args, 0, NULL,
-                                  &trans, &iter) < 0)
+                                  &iter) < 0)
                return -1;
 
        while (doveadm_mail_iter_next(iter, &mail)) {

diff --git a/src/doveadm/doveadm-mail-copymove.c b/src/doveadm/doveadm-mail-copymove.c
index 3eb16cc35fe0db9f6204104c3f0d3bf6a4734802..3be9904c2da3ecefd8f2517b6caa3faa09f1853d 100644 (file)
--- a/src/doveadm/doveadm-mail-copymove.c
+++ b/src/doveadm/doveadm-mail-copymove.c
@@ -25,14 +25,13 @@ cmd_copy_box(struct copy_cmd_context *ctx, struct mailbox *destbox,
             const struct mailbox_info *info)
 {
        struct doveadm_mail_iter *iter;
-       struct mailbox_transaction_context *trans;
        struct mailbox_transaction_context *desttrans;
        struct mail_save_context *save_ctx;
        struct mail *mail;
        int ret = 0;
 
        if (doveadm_mail_iter_init(&ctx->ctx, info, ctx->ctx.search_args, 0,
-                                  NULL, &trans, &iter) < 0)
+                                  NULL, &iter) < 0)
                return -1;
 
        /* use a separately committed transaction for each mailbox.

diff --git a/src/doveadm/doveadm-mail-expunge.c b/src/doveadm/doveadm-mail-expunge.c
index 452d3deb18d6097366bc07dade4fe9c5ad11ff78..8aca907473f4e4809dc751a22c9370aa6f08d024 100644 (file)
--- a/src/doveadm/doveadm-mail-expunge.c
+++ b/src/doveadm/doveadm-mail-expunge.c
@@ -22,13 +22,12 @@ cmd_expunge_box(struct doveadm_mail_cmd_context *_ctx,
        struct expunge_cmd_context *ctx = (struct expunge_cmd_context *)_ctx;
        struct doveadm_mail_iter *iter;
        struct mailbox *box;
-       struct mailbox_transaction_context *trans;
        struct mail *mail;
        enum mail_error error;
        int ret = 0;
 
        if (doveadm_mail_iter_init(_ctx, info, search_args, 0, NULL,
-                                  &trans, &iter) < 0)
+                                  &iter) < 0)
                return -1;
 
        while (doveadm_mail_iter_next(iter, &mail)) {

diff --git a/src/doveadm/doveadm-mail-fetch.c b/src/doveadm/doveadm-mail-fetch.c
index c918e39932aaf49e5611e56e4b13419eba9b3eab..3ade84dcdba04070f67b4f4615fe7790be433b49 100644 (file)
--- a/src/doveadm/doveadm-mail-fetch.c
+++ b/src/doveadm/doveadm-mail-fetch.c
@@ -507,13 +507,12 @@ static int
 cmd_fetch_box(struct fetch_cmd_context *ctx, const struct mailbox_info *info)
 {
        struct doveadm_mail_iter *iter;
-       struct mailbox_transaction_context *trans;
        int ret = 0;
 
        if (doveadm_mail_iter_init(&ctx->ctx, info, ctx->ctx.search_args,
                                   ctx->wanted_fields,
                                   array_idx(&ctx->header_fields, 0),
-                                  &trans, &iter) < 0)
+                                  &iter) < 0)
                return -1;
 
        while (doveadm_mail_iter_next(iter, &ctx->mail)) {

diff --git a/src/doveadm/doveadm-mail-import.c b/src/doveadm/doveadm-mail-import.c
index a7727a20d1cbf7a1a4b85b4bed88c98d33b93157..59c79d8645b9a0ed6dc31225002e2de185a5ae26 100644 (file)
--- a/src/doveadm/doveadm-mail-import.c
+++ b/src/doveadm/doveadm-mail-import.c
@@ -103,13 +103,12 @@ cmd_import_box(struct import_cmd_context *ctx, struct mail_user *dest_user,
               struct mail_search_args *search_args)
 {
        struct doveadm_mail_iter *iter;
-       struct mailbox_transaction_context *trans;
        struct mailbox *box;
        struct mail *mail;
        int ret = 0;
 
        if (doveadm_mail_iter_init(&ctx->ctx, info, search_args, 0, NULL,
-                                  &trans, &iter) < 0)
+                                  &iter) < 0)
                return -1;
 
        if (doveadm_mail_iter_next(iter, &mail)) {

diff --git a/src/doveadm/doveadm-mail-iter.c b/src/doveadm/doveadm-mail-iter.c
index e97c8a8e7a9a6c7ffc2befe1705da745a05dc545..52470b43a0170ccd6e1176964691b866f2c2daf1 100644 (file)
--- a/src/doveadm/doveadm-mail-iter.c
+++ b/src/doveadm/doveadm-mail-iter.c
@@ -21,7 +21,6 @@ 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,
-                          struct mailbox_transaction_context **trans_r,
                           struct doveadm_mail_iter **iter_r)
 {
        struct doveadm_mail_iter *iter;
@@ -49,8 +48,6 @@ int doveadm_mail_iter_init(struct doveadm_mail_cmd_context *ctx,
        iter->t = mailbox_transaction_begin(iter->box, 0);
        iter->search_ctx = mailbox_search_init(iter->t, search_args, NULL,
                                               wanted_fields, headers_ctx);
-
-       *trans_r = iter->t;
        *iter_r = iter;
        return 0;
 }
@@ -128,3 +125,8 @@ bool doveadm_mail_iter_next(struct doveadm_mail_iter *iter,
 {
        return mailbox_search_next(iter->search_ctx, mail_r);
 }
+
+struct mailbox *doveadm_mail_iter_get_mailbox(struct doveadm_mail_iter *iter)
+{
+       return iter->box;
+}

diff --git a/src/doveadm/doveadm-mail-iter.h b/src/doveadm/doveadm-mail-iter.h
index f311fa86f9d8b405ae2b3c2442b6dd06179820a9..fa3378222ad1b8911b696551fdba35d99912bb6e 100644 (file)
--- a/src/doveadm/doveadm-mail-iter.h
+++ b/src/doveadm/doveadm-mail-iter.h
@@ -11,13 +11,13 @@ 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,
-                          struct mailbox_transaction_context **trans_r,
                           struct doveadm_mail_iter **iter_r) ATTR_NULL(5);
 int doveadm_mail_iter_deinit(struct doveadm_mail_iter **iter);
 int doveadm_mail_iter_deinit_sync(struct doveadm_mail_iter **iter);
 int doveadm_mail_iter_deinit_keep_box(struct doveadm_mail_iter **iter,
                                      struct mailbox **box_r);
 void doveadm_mail_iter_deinit_rollback(struct doveadm_mail_iter **iter);
+struct mailbox *doveadm_mail_iter_get_mailbox(struct doveadm_mail_iter *iter);
 
 bool doveadm_mail_iter_next(struct doveadm_mail_iter *iter,
                            struct mail **mail_r);

diff --git a/src/doveadm/doveadm-mail-search.c b/src/doveadm/doveadm-mail-search.c
index b6d733100e409e94fa39b1e06c672d3d03253697..97a6933013a0bc181710bcd62042054535751481 100644 (file)
--- a/src/doveadm/doveadm-mail-search.c
+++ b/src/doveadm/doveadm-mail-search.c
@@ -15,16 +15,15 @@ cmd_search_box(struct doveadm_mail_cmd_context *ctx,
 {
        struct doveadm_mail_iter *iter;
        struct mailbox *box;
-       struct mailbox_transaction_context *trans;
        struct mail *mail;
        struct mailbox_metadata metadata;
        const char *guid_str;
        int ret = 0;
 
        if (doveadm_mail_iter_init(ctx, info, ctx->search_args, 0, NULL,
-                                  &trans, &iter) < 0)
+                                  &iter) < 0)
                return -1;
-       box = mailbox_transaction_get_mailbox(trans);
+       box = doveadm_mail_iter_get_mailbox(iter);
 
        if (mailbox_get_metadata(box, MAILBOX_METADATA_GUID, &metadata) < 0) {
                ret = -1;