dovecot-2.2: Removed all the "enum foo;" declarations.

dovecot at dovecot.org dovecot at dovecot.org
Sun Sep 16 16:31:44 EEST 2012


details:   http://hg.dovecot.org/dovecot-2.2/rev/4b0cbecf369d
changeset: 15081:4b0cbecf369d
user:      Timo Sirainen <tss at iki.fi>
date:      Sun Sep 16 16:31:32 2012 +0300
description:
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.

diffstat:

 src/auth/passdb-cache.h                           |   2 +-
 src/config/config-request.h                       |   2 +-
 src/config/old-set-parser.h                       |   3 +-
 src/doveadm/doveadm-mail-index.c                  |   1 +
 src/doveadm/doveadm-mail-iter.h                   |   2 +
 src/doveadm/doveadm-mail.c                        |   1 +
 src/doveadm/doveadm-mail.h                        |   2 +-
 src/doveadm/doveadm-mailbox-list-iter.h           |   2 +
 src/doveadm/dsync/dsync-mailbox-tree-fill.c       |   2 +-
 src/imap/cmd-list.c                               |   2 +-
 src/imap/cmd-notify.c                             |   1 +
 src/imap/imap-notify.c                            |   1 +
 src/lib-imap/imap-util.h                          |   2 +-
 src/lib-index/mail-index-modseq.h                 |   3 +-
 src/lib-lda/mail-deliver.h                        |   4 +-
 src/lib-storage/Makefile.am                       |   1 +
 src/lib-storage/index/imapc/imapc-sync.h          |   1 -
 src/lib-storage/index/maildir/maildir-sync.h      |   2 -
 src/lib-storage/list/mailbox-list-delete.h        |   2 +-
 src/lib-storage/list/mailbox-list-index.h         |   1 -
 src/lib-storage/list/mailbox-list-subscriptions.h |   4 +-
 src/lib-storage/mailbox-list-iter.h               |  85 +++++++++++++++++++++++
 src/lib-storage/mailbox-list-private.h            |   1 +
 src/lib-storage/mailbox-list.h                    |  81 ---------------------
 src/plugins/notify/notify-plugin.h                |   3 +-
 src/plugins/quota/quota-count.c                   |   1 +
 src/plugins/virtual/virtual-config.c              |   1 +
 27 files changed, 114 insertions(+), 99 deletions(-)

diffs (truncated from 523 to 300 lines):

diff -r e708a1d691d3 -r 4b0cbecf369d src/auth/passdb-cache.h
--- a/src/auth/passdb-cache.h	Sun Sep 16 16:12:03 2012 +0300
+++ b/src/auth/passdb-cache.h	Sun Sep 16 16:31:32 2012 +0300
@@ -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 -r e708a1d691d3 -r 4b0cbecf369d src/config/config-request.h
--- a/src/config/config-request.h	Sun Sep 16 16:12:03 2012 +0300
+++ b/src/config/config-request.h	Sun Sep 16 16:31:32 2012 +0300
@@ -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 -r e708a1d691d3 -r 4b0cbecf369d src/config/old-set-parser.h
--- a/src/config/old-set-parser.h	Sun Sep 16 16:12:03 2012 +0300
+++ b/src/config/old-set-parser.h	Sun Sep 16 16:31:32 2012 +0300
@@ -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 -r e708a1d691d3 -r 4b0cbecf369d src/doveadm/doveadm-mail-index.c
--- a/src/doveadm/doveadm-mail-index.c	Sun Sep 16 16:12:03 2012 +0300
+++ b/src/doveadm/doveadm-mail-index.c	Sun Sep 16 16:31:32 2012 +0300
@@ -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 -r e708a1d691d3 -r 4b0cbecf369d src/doveadm/doveadm-mail-iter.h
--- a/src/doveadm/doveadm-mail-iter.h	Sun Sep 16 16:12:03 2012 +0300
+++ b/src/doveadm/doveadm-mail-iter.h	Sun Sep 16 16:31:32 2012 +0300
@@ -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 -r e708a1d691d3 -r 4b0cbecf369d src/doveadm/doveadm-mail.c
--- a/src/doveadm/doveadm-mail.c	Sun Sep 16 16:12:03 2012 +0300
+++ b/src/doveadm/doveadm-mail.c	Sun Sep 16 16:31:32 2012 +0300
@@ -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 -r e708a1d691d3 -r 4b0cbecf369d src/doveadm/doveadm-mail.h
--- a/src/doveadm/doveadm-mail.h	Sun Sep 16 16:12:03 2012 +0300
+++ b/src/doveadm/doveadm-mail.h	Sun Sep 16 16:31:32 2012 +0300
@@ -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 -r e708a1d691d3 -r 4b0cbecf369d src/doveadm/doveadm-mailbox-list-iter.h
--- a/src/doveadm/doveadm-mailbox-list-iter.h	Sun Sep 16 16:12:03 2012 +0300
+++ b/src/doveadm/doveadm-mailbox-list-iter.h	Sun Sep 16 16:31:32 2012 +0300
@@ -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 -r e708a1d691d3 -r 4b0cbecf369d src/doveadm/dsync/dsync-mailbox-tree-fill.c
--- a/src/doveadm/dsync/dsync-mailbox-tree-fill.c	Sun Sep 16 16:12:03 2012 +0300
+++ b/src/doveadm/dsync/dsync-mailbox-tree-fill.c	Sun Sep 16 16:31:32 2012 +0300
@@ -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 -r e708a1d691d3 -r 4b0cbecf369d src/imap/cmd-list.c
--- a/src/imap/cmd-list.c	Sun Sep 16 16:12:03 2012 +0300
+++ b/src/imap/cmd-list.c	Sun Sep 16 16:31:32 2012 +0300
@@ -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 -r e708a1d691d3 -r 4b0cbecf369d src/imap/cmd-notify.c
--- a/src/imap/cmd-notify.c	Sun Sep 16 16:12:03 2012 +0300
+++ b/src/imap/cmd-notify.c	Sun Sep 16 16:31:32 2012 +0300
@@ -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 -r e708a1d691d3 -r 4b0cbecf369d src/imap/imap-notify.c
--- a/src/imap/imap-notify.c	Sun Sep 16 16:12:03 2012 +0300
+++ b/src/imap/imap-notify.c	Sun Sep 16 16:31:32 2012 +0300
@@ -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 -r e708a1d691d3 -r 4b0cbecf369d src/lib-imap/imap-util.h
--- a/src/lib-imap/imap-util.h	Sun Sep 16 16:12:03 2012 +0300
+++ b/src/lib-imap/imap-util.h	Sun Sep 16 16:31:32 2012 +0300
@@ -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 -r e708a1d691d3 -r 4b0cbecf369d src/lib-index/mail-index-modseq.h
--- a/src/lib-index/mail-index-modseq.h	Sun Sep 16 16:12:03 2012 +0300
+++ b/src/lib-index/mail-index-modseq.h	Sun Sep 16 16:31:32 2012 +0300
@@ -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 -r e708a1d691d3 -r 4b0cbecf369d src/lib-lda/mail-deliver.h
--- a/src/lib-lda/mail-deliver.h	Sun Sep 16 16:12:03 2012 +0300
+++ b/src/lib-lda/mail-deliver.h	Sun Sep 16 16:31:32 2012 +0300
@@ -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 -r e708a1d691d3 -r 4b0cbecf369d src/lib-storage/Makefile.am
--- a/src/lib-storage/Makefile.am	Sun Sep 16 16:12:03 2012 +0300
+++ b/src/lib-storage/Makefile.am	Sun Sep 16 16:31:32 2012 +0300
@@ -69,6 +69,7 @@
 	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 -r e708a1d691d3 -r 4b0cbecf369d src/lib-storage/index/imapc/imapc-sync.h
--- a/src/lib-storage/index/imapc/imapc-sync.h	Sun Sep 16 16:12:03 2012 +0300
+++ b/src/lib-storage/index/imapc/imapc-sync.h	Sun Sep 16 16:31:32 2012 +0300
@@ -1,7 +1,6 @@
 #ifndef CYDIR_SYNC_H
 #define CYDIR_SYNC_H
 
-enum mailbox_sync_flags;
 struct mailbox;
 struct mailbox_sync_status;
 
diff -r e708a1d691d3 -r 4b0cbecf369d src/lib-storage/index/maildir/maildir-sync.h
--- a/src/lib-storage/index/maildir/maildir-sync.h	Sun Sep 16 16:12:03 2012 +0300
+++ b/src/lib-storage/index/maildir/maildir-sync.h	Sun Sep 16 16:31:32 2012 +0300
@@ -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 -r e708a1d691d3 -r 4b0cbecf369d src/lib-storage/list/mailbox-list-delete.h
--- a/src/lib-storage/list/mailbox-list-delete.h	Sun Sep 16 16:12:03 2012 +0300
+++ b/src/lib-storage/list/mailbox-list-delete.h	Sun Sep 16 16:31:32 2012 +0300
@@ -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 -r e708a1d691d3 -r 4b0cbecf369d src/lib-storage/list/mailbox-list-index.h
--- a/src/lib-storage/list/mailbox-list-index.h	Sun Sep 16 16:12:03 2012 +0300
+++ b/src/lib-storage/list/mailbox-list-index.h	Sun Sep 16 16:31:32 2012 +0300
@@ -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 -r e708a1d691d3 -r 4b0cbecf369d src/lib-storage/list/mailbox-list-subscriptions.h
--- a/src/lib-storage/list/mailbox-list-subscriptions.h	Sun Sep 16 16:12:03 2012 +0300
+++ b/src/lib-storage/list/mailbox-list-subscriptions.h	Sun Sep 16 16:31:32 2012 +0300
@@ -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 -r e708a1d691d3 -r 4b0cbecf369d src/lib-storage/mailbox-list-iter.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/lib-storage/mailbox-list-iter.h	Sun Sep 16 16:31:32 2012 +0300
@@ -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,


More information about the dovecot-cvs mailing list