From ff6e6aedec2896f183605474e5435f602b62180c Mon Sep 17 00:00:00 2001 From: Aki Tuomi Date: Wed, 17 May 2017 15:19:44 +0300 Subject: [PATCH] lib-storage: Rename autocreate_iter_existing to mailbox_list_iter_autocreate_filter It makes next commit possible --- src/lib-storage/list/mailbox-list-iter.c | 15 +++++++-------- src/lib-storage/mailbox-list-private.h | 5 +++++ 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/src/lib-storage/list/mailbox-list-iter.c b/src/lib-storage/list/mailbox-list-iter.c index f53446f2ac..353411c2c9 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 85fad85c60..edfb7f9ab4 100644 --- a/src/lib-storage/mailbox-list-private.h +++ b/src/lib-storage/mailbox-list-private.h @@ -235,4 +235,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