From: Timo Sirainen Date: Sun, 16 Sep 2012 13:31:32 +0000 (+0300) Subject: Removed all the "enum foo;" declarations. X-Git-Tag: 2.2.alpha1~177 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a8fe899601735459641edae975c0fa08be8482e2;p=thirdparty%2Fdovecot%2Fcore.git Removed all the "enum foo;" declarations. They didn't seem to be very standard. Old gcc versions warn about them and C++ code doesn't like them. --- diff --git a/src/auth/passdb-cache.h b/src/auth/passdb-cache.h index 5b8bbd38a5..718d89b84a 100644 --- a/src/auth/passdb-cache.h +++ b/src/auth/passdb-cache.h @@ -2,8 +2,8 @@ #define PASSDB_CACHE_H #include "auth-cache.h" +#include "passdb.h" -enum passdb_result; extern struct auth_cache *passdb_cache; bool passdb_cache_verify_plain(struct auth_request *request, const char *key, diff --git a/src/config/config-request.h b/src/config/config-request.h index e07f55e3c0..d4f2c6779c 100644 --- a/src/config/config-request.h +++ b/src/config/config-request.h @@ -1,9 +1,9 @@ #ifndef CONFIG_REQUEST_H #define CONFIG_REQUEST_H +#include "settings-parser.h" #include "config-filter.h" -enum setting_type; struct master_service_settings_output; enum config_dump_scope { diff --git a/src/config/old-set-parser.h b/src/config/old-set-parser.h index 2fc307f169..9cb25135c3 100644 --- a/src/config/old-set-parser.h +++ b/src/config/old-set-parser.h @@ -1,7 +1,8 @@ #ifndef OLD_SET_PARSER_H #define OLD_SET_PARSER_H -enum config_line_type; +#include "config-parser-private.h" + struct config_parser_context; bool old_settings_handle(struct config_parser_context *ctx, diff --git a/src/doveadm/doveadm-mail-index.c b/src/doveadm/doveadm-mail-index.c index cf3764d616..63c62e60f4 100644 --- a/src/doveadm/doveadm-mail-index.c +++ b/src/doveadm/doveadm-mail-index.c @@ -8,6 +8,7 @@ #include "mail-namespace.h" #include "mail-storage.h" #include "mail-search-build.h" +#include "mailbox-list-iter.h" #include "doveadm-settings.h" #include "doveadm-mail.h" diff --git a/src/doveadm/doveadm-mail-iter.h b/src/doveadm/doveadm-mail-iter.h index d95235f825..f311fa86f9 100644 --- a/src/doveadm/doveadm-mail-iter.h +++ b/src/doveadm/doveadm-mail-iter.h @@ -1,6 +1,8 @@ #ifndef DOVEADM_MAIL_ITER_H #define DOVEADM_MAIL_ITER_H +#include "mailbox-list-iter.h" + struct doveadm_mail_iter; struct doveadm_mail_cmd_context; diff --git a/src/doveadm/doveadm-mail.c b/src/doveadm/doveadm-mail.c index 0ceafaf542..ec631ede5a 100644 --- a/src/doveadm/doveadm-mail.c +++ b/src/doveadm/doveadm-mail.c @@ -16,6 +16,7 @@ #include "mail-storage-service.h" #include "mail-search-build.h" #include "mail-search-parser.h" +#include "mailbox-list-iter.h" #include "doveadm.h" #include "doveadm-settings.h" #include "doveadm-print.h" diff --git a/src/doveadm/doveadm-mail.h b/src/doveadm/doveadm-mail.h index 41e0230689..20dfd3e5c1 100644 --- a/src/doveadm/doveadm-mail.h +++ b/src/doveadm/doveadm-mail.h @@ -5,9 +5,9 @@ #include "doveadm.h" #include "doveadm-util.h" #include "module-context.h" +#include "mail-error.h" #include "mail-storage-service.h" -enum mail_error; struct mailbox; struct mail_storage; struct mail_user; diff --git a/src/doveadm/doveadm-mailbox-list-iter.h b/src/doveadm/doveadm-mailbox-list-iter.h index 068a20dddd..9b205e2676 100644 --- a/src/doveadm/doveadm-mailbox-list-iter.h +++ b/src/doveadm/doveadm-mailbox-list-iter.h @@ -1,6 +1,8 @@ #ifndef DOVEADM_MAILBOX_LIST_ITER_H #define DOVEADM_MAILBOX_LIST_ITER_H +#include "mailbox-list-iter.h" + struct doveadm_mail_cmd_context; /* List only selectable mailboxes */ diff --git a/src/doveadm/dsync/dsync-mailbox-tree-fill.c b/src/doveadm/dsync/dsync-mailbox-tree-fill.c index e4dc03d2d0..3e4b372bce 100644 --- a/src/doveadm/dsync/dsync-mailbox-tree-fill.c +++ b/src/doveadm/dsync/dsync-mailbox-tree-fill.c @@ -8,7 +8,7 @@ #include "mailbox-log.h" #include "mail-namespace.h" #include "mail-storage.h" -#include "mailbox-list.h" +#include "mailbox-list-iter.h" #include "dsync-mailbox-tree-private.h" static int diff --git a/src/imap/cmd-list.c b/src/imap/cmd-list.c index 4bcfd39379..ab05bc9c2d 100644 --- a/src/imap/cmd-list.c +++ b/src/imap/cmd-list.c @@ -4,13 +4,13 @@ #include "array.h" #include "str.h" #include "strescape.h" +#include "mailbox-list-iter.h" #include "imap-utf7.h" #include "imap-quote.h" #include "imap-match.h" #include "imap-status.h" #include "imap-commands.h" #include "imap-list.h" -#include "mail-namespace.h" struct cmd_list_context { struct client_command_context *cmd; diff --git a/src/imap/cmd-notify.c b/src/imap/cmd-notify.c index d79d1c1807..5d10b31ba8 100644 --- a/src/imap/cmd-notify.c +++ b/src/imap/cmd-notify.c @@ -2,6 +2,7 @@ #include "imap-common.h" #include "str.h" +#include "mailbox-list-iter.h" #include "imap-quote.h" #include "imap-commands.h" #include "imap-fetch.h" diff --git a/src/imap/imap-notify.c b/src/imap/imap-notify.c index e80b7d72cf..69f790f5be 100644 --- a/src/imap/imap-notify.c +++ b/src/imap/imap-notify.c @@ -4,6 +4,7 @@ #include "str.h" #include "ostream.h" #include "imap-quote.h" +#include "mailbox-list-iter.h" #include "mailbox-list-notify.h" #include "mail-search.h" #include "mail-search-build.h" diff --git a/src/lib-imap/imap-util.h b/src/lib-imap/imap-util.h index 6908a4ec2d..2813dbce93 100644 --- a/src/lib-imap/imap-util.h +++ b/src/lib-imap/imap-util.h @@ -2,8 +2,8 @@ #define IMAP_UTIL_H #include "seq-range-array.h" +#include "mail-types.h" -enum mail_flags; struct imap_arg; /* Write flags as a space separated string. */ diff --git a/src/lib-index/mail-index-modseq.h b/src/lib-index/mail-index-modseq.h index 9250e2a568..1ee2cbc532 100644 --- a/src/lib-index/mail-index-modseq.h +++ b/src/lib-index/mail-index-modseq.h @@ -1,9 +1,10 @@ #ifndef MAIL_INDEX_MODSEQ_H #define MAIL_INDEX_MODSEQ_H +#include "mail-types.h" + #define MAIL_INDEX_MODSEQ_EXT_NAME "modseq" -enum mail_flags; struct mail_keywords; struct mail_index; struct mail_index_map; diff --git a/src/lib-lda/mail-deliver.h b/src/lib-lda/mail-deliver.h index abd7f79dd3..fbc2941820 100644 --- a/src/lib-lda/mail-deliver.h +++ b/src/lib-lda/mail-deliver.h @@ -2,9 +2,9 @@ #define MAIL_DELIVER_H #include "guid.h" +#include "mail-types.h" +#include "mail-error.h" -enum mail_flags; -enum mail_error; struct mail_storage; struct mail_save_context; struct mailbox; diff --git a/src/lib-storage/Makefile.am b/src/lib-storage/Makefile.am index 0ca27c3ff2..a276d743db 100644 --- a/src/lib-storage/Makefile.am +++ b/src/lib-storage/Makefile.am @@ -69,6 +69,7 @@ headers = \ mail-user.h \ mailbox-guid-cache.h \ mailbox-list.h \ + mailbox-list-iter.h \ mailbox-list-private.h \ mailbox-list-notify.h \ mailbox-search-result-private.h \ diff --git a/src/lib-storage/index/imapc/imapc-sync.h b/src/lib-storage/index/imapc/imapc-sync.h index 327171cec9..72e9790bff 100644 --- a/src/lib-storage/index/imapc/imapc-sync.h +++ b/src/lib-storage/index/imapc/imapc-sync.h @@ -1,7 +1,6 @@ #ifndef CYDIR_SYNC_H #define CYDIR_SYNC_H -enum mailbox_sync_flags; struct mailbox; struct mailbox_sync_status; diff --git a/src/lib-storage/index/maildir/maildir-sync.h b/src/lib-storage/index/maildir/maildir-sync.h index 39e72a4e39..c5d39e0dd4 100644 --- a/src/lib-storage/index/maildir/maildir-sync.h +++ b/src/lib-storage/index/maildir/maildir-sync.h @@ -14,8 +14,6 @@ /* If syncing takes longer than this, log a warning. */ #define MAILDIR_SYNC_TIME_WARN_SECS 60 -enum maildir_uidlist_rec_flag; - struct maildir_mailbox; struct maildir_sync_context; struct maildir_keywords_sync_ctx; diff --git a/src/lib-storage/list/mailbox-list-delete.h b/src/lib-storage/list/mailbox-list-delete.h index daa48755f2..9bb3d6017e 100644 --- a/src/lib-storage/list/mailbox-list-delete.h +++ b/src/lib-storage/list/mailbox-list-delete.h @@ -1,7 +1,7 @@ #ifndef MAILBOX_LIST_DELETE_H #define MAILBOX_LIST_DELETE_H -enum mailbox_list_path_type; +#include "mailbox-list.h" int mailbox_list_delete_maildir_via_trash(struct mailbox_list *list, const char *name, diff --git a/src/lib-storage/list/mailbox-list-index.h b/src/lib-storage/list/mailbox-list-index.h index 20bfa885b6..4d2a7dfd4d 100644 --- a/src/lib-storage/list/mailbox-list-index.h +++ b/src/lib-storage/list/mailbox-list-index.h @@ -31,7 +31,6 @@ #define INDEX_LIST_CONTEXT(obj) \ MODULE_CONTEXT(obj, mailbox_list_index_module) -enum mailbox_status_items; struct mail_index_view; struct mailbox; struct mailbox_status; diff --git a/src/lib-storage/list/mailbox-list-subscriptions.h b/src/lib-storage/list/mailbox-list-subscriptions.h index c80a17d21f..283012d80f 100644 --- a/src/lib-storage/list/mailbox-list-subscriptions.h +++ b/src/lib-storage/list/mailbox-list-subscriptions.h @@ -1,8 +1,8 @@ #ifndef MAILBOX_LIST_SUBSCRIPTIONS_H #define MAILBOX_LIST_SUBSCRIPTIONS_H -enum mailbox_info_flags; -enum mailbox_list_iter_flags; +#include "mailbox-list-iter.h" + struct mailbox_tree_context; struct mailbox_list_iterate_context; diff --git a/src/lib-storage/mailbox-list-iter.h b/src/lib-storage/mailbox-list-iter.h new file mode 100644 index 0000000000..8df0bc77b0 --- /dev/null +++ b/src/lib-storage/mailbox-list-iter.h @@ -0,0 +1,85 @@ +#ifndef MAILBOX_LIST_ITER_H +#define MAILBOX_LIST_ITER_H + +#include "mail-namespace.h" +#include "mailbox-list.h" + +enum mailbox_list_iter_flags { + /* Ignore index file and ACLs (used by ACL plugin internally) */ + MAILBOX_LIST_ITER_RAW_LIST = 0x000001, + /* Don't list autocreated mailboxes (e.g. INBOX) unless they + physically exist */ + MAILBOX_LIST_ITER_NO_AUTO_BOXES = 0x000004, + + /* For mailbox_list_iter_init_namespaces(): Skip namespaces that + have alias_for set. */ + MAILBOX_LIST_ITER_SKIP_ALIASES = 0x000008, + /* For mailbox_list_iter_init_namespaces(): '*' in a pattern doesn't + match beyond namespace boundary (e.g. "foo*" or "*o" doesn't match + "foo." namespace's mailboxes, but "*.*" does). also '%' can't match + namespace prefixes, if there exists a parent namespace whose children + it matches. */ + MAILBOX_LIST_ITER_STAR_WITHIN_NS = 0x000010, + + /* List only subscribed mailboxes */ + MAILBOX_LIST_ITER_SELECT_SUBSCRIBED = 0x000100, + /* Return MAILBOX_CHILD_* if mailbox's children match selection + criteria, even if the mailbox itself wouldn't match. */ + MAILBOX_LIST_ITER_SELECT_RECURSIVEMATCH = 0x000200, + /* Return only mailboxes that have special use flags */ + MAILBOX_LIST_ITER_SELECT_SPECIALUSE = 0x000400, + + /* Don't return any flags unless it can be done without cost */ + MAILBOX_LIST_ITER_RETURN_NO_FLAGS = 0x001000, + /* Return MAILBOX_SUBSCRIBED flag */ + MAILBOX_LIST_ITER_RETURN_SUBSCRIBED = 0x002000, + /* Return children flags */ + MAILBOX_LIST_ITER_RETURN_CHILDREN = 0x004000, + /* Return IMAP special use flags */ + MAILBOX_LIST_ITER_RETURN_SPECIALUSE = 0x008000 +}; + +struct mailbox_info { + const char *vname; + const char *special_use; + enum mailbox_info_flags flags; + + struct mail_namespace *ns; +}; + +/* Returns a single pattern from given reference and pattern. */ +const char *mailbox_list_join_refpattern(struct mailbox_list *list, + const char *ref, const char *pattern); + +/* Initialize new mailbox list request. Pattern may contain '%' and '*' + wildcards as defined by RFC-3501. */ +struct mailbox_list_iterate_context * +mailbox_list_iter_init(struct mailbox_list *list, const char *pattern, + enum mailbox_list_iter_flags flags); +/* Like mailbox_list_iter_init(), but support multiple patterns. Patterns is + a NULL-terminated list of strings. It must contain at least one pattern. */ +struct mailbox_list_iterate_context * +mailbox_list_iter_init_multiple(struct mailbox_list *list, + const char *const *patterns, + enum mailbox_list_iter_flags flags); +/* List mailbox_list_iter_init_multiple(), but list mailboxes from all the + specified namespaces. */ +struct mailbox_list_iterate_context * +mailbox_list_iter_init_namespaces(struct mail_namespace *namespaces, + const char *const *patterns, + enum mail_namespace_type type_mask, + enum mailbox_list_iter_flags flags); +/* Get next mailbox. Returns the mailbox name */ +const struct mailbox_info * +mailbox_list_iter_next(struct mailbox_list_iterate_context *ctx); +/* Deinitialize mailbox list request. Returns -1 if some error + occurred while listing. */ +int mailbox_list_iter_deinit(struct mailbox_list_iterate_context **ctx); +/* List one mailbox. Returns 1 if info returned, 0 if mailbox doesn't exist, + -1 if error. */ +int mailbox_list_mailbox(struct mailbox_list *list, const char *name, + enum mailbox_info_flags *flags_r); +/* Returns 1 if mailbox has children, 0 if not, -1 if error. */ +int mailbox_has_children(struct mailbox_list *list, const char *name); + +#endif diff --git a/src/lib-storage/mailbox-list-private.h b/src/lib-storage/mailbox-list-private.h index f54de9d549..c44cfee141 100644 --- a/src/lib-storage/mailbox-list-private.h +++ b/src/lib-storage/mailbox-list-private.h @@ -5,6 +5,7 @@ #include "mailbox-list-notify.h" #include "mail-namespace.h" #include "mailbox-list.h" +#include "mailbox-list-iter.h" #include "mail-storage-settings.h" #define MAILBOX_LIST_NAME_MAILDIRPLUSPLUS "maildir++" diff --git a/src/lib-storage/mailbox-list.h b/src/lib-storage/mailbox-list.h index 5b7c81e798..a7a708cbdb 100644 --- a/src/lib-storage/mailbox-list.h +++ b/src/lib-storage/mailbox-list.h @@ -1,7 +1,6 @@ #ifndef MAILBOX_LIST_H #define MAILBOX_LIST_H -#include "guid.h" #include "mail-error.h" #ifdef PATH_MAX @@ -10,11 +9,9 @@ # define MAILBOX_LIST_NAME_MAX_LENGTH 4096 #endif -enum mail_namespace_type; struct mail_namespace; struct mail_storage; struct mailbox_list; -struct mailbox_list_iterate_context; enum mailbox_list_properties { /* maildir_name must always be empty */ @@ -54,41 +51,6 @@ enum mailbox_info_flags { MAILBOX_MATCHED = 0x40000000 }; -enum mailbox_list_iter_flags { - /* Ignore index file and ACLs (used by ACL plugin internally) */ - MAILBOX_LIST_ITER_RAW_LIST = 0x000001, - /* Don't list autocreated mailboxes (e.g. INBOX) unless they - physically exist */ - MAILBOX_LIST_ITER_NO_AUTO_BOXES = 0x000004, - - /* For mailbox_list_iter_init_namespaces(): Skip namespaces that - have alias_for set. */ - MAILBOX_LIST_ITER_SKIP_ALIASES = 0x000008, - /* For mailbox_list_iter_init_namespaces(): '*' in a pattern doesn't - match beyond namespace boundary (e.g. "foo*" or "*o" doesn't match - "foo." namespace's mailboxes, but "*.*" does). also '%' can't match - namespace prefixes, if there exists a parent namespace whose children - it matches. */ - MAILBOX_LIST_ITER_STAR_WITHIN_NS = 0x000010, - - /* List only subscribed mailboxes */ - MAILBOX_LIST_ITER_SELECT_SUBSCRIBED = 0x000100, - /* Return MAILBOX_CHILD_* if mailbox's children match selection - criteria, even if the mailbox itself wouldn't match. */ - MAILBOX_LIST_ITER_SELECT_RECURSIVEMATCH = 0x000200, - /* Return only mailboxes that have special use flags */ - MAILBOX_LIST_ITER_SELECT_SPECIALUSE = 0x000400, - - /* Don't return any flags unless it can be done without cost */ - MAILBOX_LIST_ITER_RETURN_NO_FLAGS = 0x001000, - /* Return MAILBOX_SUBSCRIBED flag */ - MAILBOX_LIST_ITER_RETURN_SUBSCRIBED = 0x002000, - /* Return children flags */ - MAILBOX_LIST_ITER_RETURN_CHILDREN = 0x004000, - /* Return IMAP special use flags */ - MAILBOX_LIST_ITER_RETURN_SPECIALUSE = 0x008000 -}; - enum mailbox_list_path_type { /* Return directory's path (eg. ~/dbox/INBOX) */ MAILBOX_LIST_PATH_TYPE_DIR, @@ -145,14 +107,6 @@ struct mailbox_list_settings { bool utf8; }; -struct mailbox_info { - const char *vname; - const char *special_use; - enum mailbox_info_flags flags; - - struct mail_namespace *ns; -}; - struct mailbox_permissions { /* The actual uid/gid of the mailbox */ uid_t file_uid; @@ -257,41 +211,6 @@ const char *mailbox_list_get_temp_prefix(struct mailbox_list *list); Typically this returns either "temp." or ".temp.". */ const char *mailbox_list_get_global_temp_prefix(struct mailbox_list *list); -/* Returns a single pattern from given reference and pattern. */ -const char *mailbox_list_join_refpattern(struct mailbox_list *list, - const char *ref, const char *pattern); - -/* Initialize new mailbox list request. Pattern may contain '%' and '*' - wildcards as defined by RFC-3501. */ -struct mailbox_list_iterate_context * -mailbox_list_iter_init(struct mailbox_list *list, const char *pattern, - enum mailbox_list_iter_flags flags); -/* Like mailbox_list_iter_init(), but support multiple patterns. Patterns is - a NULL-terminated list of strings. It must contain at least one pattern. */ -struct mailbox_list_iterate_context * -mailbox_list_iter_init_multiple(struct mailbox_list *list, - const char *const *patterns, - enum mailbox_list_iter_flags flags); -/* List mailbox_list_iter_init_multiple(), but list mailboxes from all the - specified namespaces. */ -struct mailbox_list_iterate_context * -mailbox_list_iter_init_namespaces(struct mail_namespace *namespaces, - const char *const *patterns, - enum mail_namespace_type type_mask, - enum mailbox_list_iter_flags flags); -/* Get next mailbox. Returns the mailbox name */ -const struct mailbox_info * -mailbox_list_iter_next(struct mailbox_list_iterate_context *ctx); -/* Deinitialize mailbox list request. Returns -1 if some error - occurred while listing. */ -int mailbox_list_iter_deinit(struct mailbox_list_iterate_context **ctx); -/* List one mailbox. Returns 1 if info returned, 0 if mailbox doesn't exist, - -1 if error. */ -int mailbox_list_mailbox(struct mailbox_list *list, const char *name, - enum mailbox_info_flags *flags_r); -/* Returns 1 if mailbox has children, 0 if not, -1 if error. */ -int mailbox_has_children(struct mailbox_list *list, const char *name); - /* Subscribe/unsubscribe mailbox. There should be no error when subscribing to already subscribed mailbox. Subscribing to unexisting mailboxes is optional. */ diff --git a/src/plugins/notify/notify-plugin.h b/src/plugins/notify/notify-plugin.h index b47cdb55a4..3c95071f6b 100644 --- a/src/plugins/notify/notify-plugin.h +++ b/src/plugins/notify/notify-plugin.h @@ -1,7 +1,8 @@ #ifndef NOTIFY_PLUGIN_H #define NOTIFY_PLUGIN_H -enum mail_flags; +#include "mail-types.h" + struct mail; struct mail_transaction_commit_changes; struct mail_storage; diff --git a/src/plugins/quota/quota-count.c b/src/plugins/quota/quota-count.c index b245b6af5e..c9a3c3513e 100644 --- a/src/plugins/quota/quota-count.c +++ b/src/plugins/quota/quota-count.c @@ -5,6 +5,7 @@ #include "mail-search-build.h" #include "mail-storage.h" #include "mail-namespace.h" +#include "mailbox-list-iter.h" #include "quota-private.h" static int diff --git a/src/plugins/virtual/virtual-config.c b/src/plugins/virtual/virtual-config.c index 71ee2cee5e..dd5259ac94 100644 --- a/src/plugins/virtual/virtual-config.c +++ b/src/plugins/virtual/virtual-config.c @@ -11,6 +11,7 @@ #include "mail-namespace.h" #include "mail-search-build.h" #include "mail-search-parser.h" +#include "mailbox-list-iter.h" #include "virtual-storage.h" #include "virtual-plugin.h"