Mercurial > dovecot > core-2.2
changeset 22108:f220b0d8af7a
lib-storage: Add mailbox-list-iter-private.h with autocreate context structs
Needed for the following ACL change.
| author | Timo Sirainen <timo.sirainen@dovecot.fi> |
|---|---|
| date | Mon, 29 May 2017 13:52:42 +0300 |
| parents | 164fb0b1d07d |
| children | 7e438ab023c1 |
| files | src/lib-storage/list/Makefile.am src/lib-storage/list/mailbox-list-iter-private.h src/lib-storage/list/mailbox-list-iter.c |
| diffstat | 3 files changed, 25 insertions(+), 17 deletions(-) [+] |
line wrap: on
line diff
--- a/src/lib-storage/list/Makefile.am Sat May 20 18:13:45 2017 +0300 +++ b/src/lib-storage/list/Makefile.am Mon May 29 13:52:42 2017 +0300 @@ -33,6 +33,7 @@ mailbox-list-index.h \ mailbox-list-index-storage.h \ mailbox-list-index-sync.h \ + mailbox-list-iter-private.h \ mailbox-list-maildir.h \ mailbox-list-notify-tree.h \ mailbox-list-subscriptions.h \
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/lib-storage/list/mailbox-list-iter-private.h Mon May 29 13:52:42 2017 +0300 @@ -0,0 +1,23 @@ +#ifndef MAILBOX_LIST_ITER_PRIVATE_H +#define MAILBOX_LIST_ITER_PRIVATE_H + +#include "mailbox-list-iter.h" + +struct autocreate_box { + const char *name; + const struct mailbox_settings *set; + enum mailbox_info_flags flags; + bool child_listed; +}; + +ARRAY_DEFINE_TYPE(mailbox_settings, struct mailbox_settings *); +struct mailbox_list_autocreate_iterate_context { + unsigned int idx; + struct mailbox_info new_info; + ARRAY(struct autocreate_box) boxes; + ARRAY_TYPE(mailbox_settings) box_sets; + ARRAY_TYPE(mailbox_settings) all_ns_box_sets; + bool listing_autoboxes:1; +}; + +#endif
--- a/src/lib-storage/list/mailbox-list-iter.c Sat May 20 18:13:45 2017 +0300 +++ b/src/lib-storage/list/mailbox-list-iter.c Mon May 29 13:52:42 2017 +0300 @@ -7,6 +7,7 @@ #include "mailbox-tree.h" #include "mailbox-list-subscriptions.h" #include "mailbox-list-private.h" +#include "mailbox-list-iter-private.h" enum autocreate_match_result { /* list contains the mailbox */ @@ -17,23 +18,6 @@ AUTOCREATE_MATCH_RESULT_PARENT = 0x04 }; -struct autocreate_box { - const char *name; - const struct mailbox_settings *set; - enum mailbox_info_flags flags; - bool child_listed; -}; - -ARRAY_DEFINE_TYPE(mailbox_settings, struct mailbox_settings *); -struct mailbox_list_autocreate_iterate_context { - unsigned int idx; - struct mailbox_info new_info; - ARRAY(struct autocreate_box) boxes; - ARRAY_TYPE(mailbox_settings) box_sets; - ARRAY_TYPE(mailbox_settings) all_ns_box_sets; - bool listing_autoboxes:1; -}; - struct ns_list_iterate_context { struct mailbox_list_iterate_context ctx; struct mailbox_list_iterate_context *backend_ctx;