From: Timo Sirainen <timo.sirainen@open-xchange.com>
Date: Fri, 20 Aug 2021 16:09:17 +0000 (+0300)
Subject: lib-storage: Don't call mailbox_vfuncs.list_index_has_changed() in data stack frame
X-Git-Tag: 2.3.18~80
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e13768d2ee64d7e63a2448a8ee2e39424a3ed9dd;p=thirdparty%2Fdovecot%2Fcore.git

lib-storage: Don't call mailbox_vfuncs.list_index_has_changed() in data stack frame

This will be required by the next change.
---

diff --git a/src/lib-storage/list/mailbox-list-index-iter.c b/src/lib-storage/list/mailbox-list-index-iter.c
index def8f3c598..be8b265d36 100644
--- a/src/lib-storage/list/mailbox-list-index-iter.c
+++ b/src/lib-storage/list/mailbox-list-index-iter.c
@@ -215,7 +215,9 @@ mailbox_list_index_iter_next(struct mailbox_list_iterate_context *_ctx)
 
 	/* listing mailboxes from index */
 	while (ctx->next_node != NULL) {
-		mailbox_list_index_update_info(ctx);
+		T_BEGIN {
+			mailbox_list_index_update_info(ctx);
+		} T_END;
 		match = imap_match(_ctx->glob, ctx->info.vname);
 
 		follow_children = (match & (IMAP_MATCH_YES |
diff --git a/src/lib-storage/list/mailbox-list-index-status.c b/src/lib-storage/list/mailbox-list-index-status.c
index 1f798bf022..c4d6d3c85e 100644
--- a/src/lib-storage/list/mailbox-list-index-status.c
+++ b/src/lib-storage/list/mailbox-list-index-status.c
@@ -811,10 +811,10 @@ void mailbox_list_index_status_set_info_flags(struct mailbox *box, uint32_t uid,
 	if (!mail_index_lookup_seq(view, uid, &seq)) {
 		/* our in-memory tree is out of sync */
 		ret = 1;
-	} else T_BEGIN {
+	} else {
 		ret = box->v.list_index_has_changed == NULL ? 0 :
 			box->v.list_index_has_changed(box, view, seq, TRUE);
-	} T_END;
+	}
 
 	if (ret != 0) {
 		/* error / not up to date. don't waste time with it. */
diff --git a/src/lib-storage/list/mailbox-list-index.c b/src/lib-storage/list/mailbox-list-index.c
index c13d8a07a5..b5af436dd2 100644
--- a/src/lib-storage/list/mailbox-list-index.c
+++ b/src/lib-storage/list/mailbox-list-index.c
@@ -773,11 +773,11 @@ int mailbox_list_index_view_open(struct mailbox *box, bool require_refreshed,
 	} else if (!require_refreshed) {
 		/* this operation doesn't need the index to be up-to-date */
 		ret = 0;
-	} else T_BEGIN {
+	} else {
 		ret = box->v.list_index_has_changed == NULL ? 0 :
 			box->v.list_index_has_changed(box, view, seq, FALSE);
 		reason = "Mailbox has changed";
-	} T_END;
+	}
 
 	if (ret != 0) {
 		/* error / mailbox has changed. we'll need to sync it. */