From: Aki Tuomi <aki.tuomi@dovecot.fi>
Date: Wed, 17 May 2017 12:19:44 +0000 (+0300)
Subject: lib-storage: Rename autocreate_iter_existing to mailbox_list_iter_autocreate_filter
X-Git-Tag: 2.3.0.rc1~1616
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b5c6ce2ab8dc1a5817e8adc989d21a9f603a6673;p=thirdparty%2Fdovecot%2Fcore.git

lib-storage: Rename autocreate_iter_existing to mailbox_list_iter_autocreate_filter

It makes next commit possible
---

diff --git a/src/lib-storage/list/mailbox-list-iter.c b/src/lib-storage/list/mailbox-list-iter.c
index 63e9d0f024..e2258d6983 100644
--- a/src/lib-storage/list/mailbox-list-iter.c
+++ b/src/lib-storage/list/mailbox-list-iter.c
@@ -817,11 +817,15 @@ autocreate_box_match(const ARRAY_TYPE(mailbox_settings) *boxes,
 	return result;
 }
 
-static const struct mailbox_info *
-autocreate_iter_existing(struct mailbox_list_iterate_context *ctx)
+const struct mailbox_info *
+mailbox_list_iter_autocreate_filter(struct mailbox_list_iterate_context *ctx,
+				    const struct mailbox_info *_info)
 {
 	struct mailbox_list_autocreate_iterate_context *actx =
 		ctx->autocreate_ctx;
+	if (actx == NULL || _info == NULL)
+		return _info;
+	actx->new_info = *_info;
 	struct mailbox_info *info = &actx->new_info;
 	enum autocreate_match_result match, match2;
 	unsigned int idx;
@@ -976,12 +980,7 @@ mailbox_list_iter_next_call(struct mailbox_list_iterate_context *ctx)
 		}
 	}
 
-	if (info != NULL && ctx->autocreate_ctx != NULL) {
-	        ctx->autocreate_ctx->new_info = *info;
-	        return autocreate_iter_existing(ctx);
-	}
-
-	return info;
+	return mailbox_list_iter_autocreate_filter(ctx, info);
 }
 
 const struct mailbox_info *
diff --git a/src/lib-storage/mailbox-list-private.h b/src/lib-storage/mailbox-list-private.h
index 21261af23f..a957b0b24e 100644
--- a/src/lib-storage/mailbox-list-private.h
+++ b/src/lib-storage/mailbox-list-private.h
@@ -234,4 +234,9 @@ void mailbox_list_set_critical(struct mailbox_list *list, const char *fmt, ...)
 void mailbox_list_set_internal_error(struct mailbox_list *list);
 bool mailbox_list_set_error_from_errno(struct mailbox_list *list);
 
+const struct mailbox_info *
+mailbox_list_iter_autocreate_filter(struct mailbox_list_iterate_context *ctx,
+				    const struct mailbox_info *_info);
+
+
 #endif