Skip to content

Commit

Permalink
lib-storage: Rename autocreate_iter_existing to mailbox_list_iter_aut…
Browse files Browse the repository at this point in the history
…ocreate_filter

It makes next commit possible
  • Loading branch information
cmouse authored and villesavolainen committed Jun 9, 2017
1 parent 1e7f85e commit ff6e6ae
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 8 deletions.
15 changes: 7 additions & 8 deletions src/lib-storage/list/mailbox-list-iter.c
Expand Up @@ -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;
Expand Down Expand Up @@ -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 *
Expand Down
5 changes: 5 additions & 0 deletions src/lib-storage/mailbox-list-private.h
Expand Up @@ -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

0 comments on commit ff6e6ae

Please sign in to comment.