dovecot-2.0-sslstream: Reordered struct setting_parser_info fiel...
dovecot at dovecot.org
dovecot at dovecot.org
Sat Feb 13 02:55:16 EET 2010
details: http://hg.dovecot.org/dovecot-2.0-sslstream/rev/5a25b4ec5694
changeset: 10107:5a25b4ec5694
user: Timo Sirainen <tss at iki.fi>
date: Tue Oct 20 17:15:01 2009 -0400
description:
Reordered struct setting_parser_info fields to make using them easier.
diffstat:
16 files changed, 82 insertions(+), 93 deletions(-)
src/auth/auth-settings.c | 22 +++++++----------
src/dict/dict-settings.c | 8 ++----
src/imap/imap-settings.c | 8 +++---
src/lib-lda/lda-settings.c | 8 +++---
src/lib-master/master-service-settings.c | 8 ++----
src/lib-settings/settings-parser.c | 8 ++----
src/lib-settings/settings-parser.h | 9 +++----
src/lib-storage/index/dbox-multi/mdbox-settings.c | 8 +++---
src/lib-storage/index/maildir/maildir-settings.c | 7 ++---
src/lib-storage/index/mbox/mbox-settings.c | 7 ++---
src/lib-storage/mail-storage-settings.c | 24 +++++++++---------
src/lmtp/lmtp-settings.c | 7 +----
src/login-common/login-settings.c | 8 +++---
src/master/master-settings.c | 27 +++++++++++----------
src/pop3/pop3-settings.c | 8 +++---
src/ssl-params/ssl-params-settings.c | 8 ++----
diffs (truncated from 424 to 300 lines):
diff -r 183373d83021 -r 5a25b4ec5694 src/auth/auth-settings.c
--- a/src/auth/auth-settings.c Tue Oct 20 15:40:51 2009 -0400
+++ b/src/auth/auth-settings.c Tue Oct 20 17:15:01 2009 -0400
@@ -29,12 +29,11 @@ struct setting_parser_info auth_passdb_s
MEMBER(defines) auth_passdb_setting_defines,
MEMBER(defaults) NULL,
- MEMBER(parent) &auth_setting_parser_info,
- MEMBER(dynamic_parsers) NULL,
+ MEMBER(type_offset) offsetof(struct auth_passdb_settings, driver),
+ MEMBER(struct_size) sizeof(struct auth_passdb_settings),
MEMBER(parent_offset) (size_t)-1,
- MEMBER(type_offset) offsetof(struct auth_passdb_settings, driver),
- MEMBER(struct_size) sizeof(struct auth_passdb_settings)
+ MEMBER(parent) &auth_setting_parser_info
};
#undef DEF
@@ -52,12 +51,11 @@ struct setting_parser_info auth_userdb_s
MEMBER(defines) auth_userdb_setting_defines,
MEMBER(defaults) NULL,
- MEMBER(parent) &auth_setting_parser_info,
- MEMBER(dynamic_parsers) NULL,
+ MEMBER(type_offset) offsetof(struct auth_userdb_settings, driver),
+ MEMBER(struct_size) sizeof(struct auth_userdb_settings),
MEMBER(parent_offset) (size_t)-1,
- MEMBER(type_offset) offsetof(struct auth_userdb_settings, driver),
- MEMBER(struct_size) sizeof(struct auth_userdb_settings)
+ MEMBER(parent) &auth_setting_parser_info
};
/* we're kind of kludging here to avoid "auth_" prefix in the struct fields */
@@ -134,12 +132,12 @@ struct setting_parser_info auth_setting_
MEMBER(defines) auth_setting_defines,
MEMBER(defaults) &auth_default_settings,
- MEMBER(parent) NULL,
- MEMBER(dynamic_parsers) NULL,
+ MEMBER(type_offset) (size_t)-1,
+ MEMBER(struct_size) sizeof(struct auth_settings),
MEMBER(parent_offset) (size_t)-1,
- MEMBER(type_offset) (size_t)-1,
- MEMBER(struct_size) sizeof(struct auth_settings),
+ MEMBER(parent) NULL,
+
MEMBER(check_func) auth_settings_check
};
diff -r 183373d83021 -r 5a25b4ec5694 src/dict/dict-settings.c
--- a/src/dict/dict-settings.c Tue Oct 20 15:40:51 2009 -0400
+++ b/src/dict/dict-settings.c Tue Oct 20 17:15:01 2009 -0400
@@ -26,12 +26,10 @@ struct setting_parser_info dict_setting_
MEMBER(defines) dict_setting_defines,
MEMBER(defaults) &dict_default_settings,
- MEMBER(parent) NULL,
- MEMBER(dynamic_parsers) NULL,
+ MEMBER(type_offset) (size_t)-1,
+ MEMBER(struct_size) sizeof(struct dict_settings),
- MEMBER(parent_offset) (size_t)-1,
- MEMBER(type_offset) (size_t)-1,
- MEMBER(struct_size) sizeof(struct dict_settings)
+ MEMBER(parent_offset) (size_t)-1
};
struct dict_settings *dict_settings;
diff -r 183373d83021 -r 5a25b4ec5694 src/imap/imap-settings.c
--- a/src/imap/imap-settings.c Tue Oct 20 15:40:51 2009 -0400
+++ b/src/imap/imap-settings.c Tue Oct 20 17:15:01 2009 -0400
@@ -59,12 +59,12 @@ struct setting_parser_info imap_setting_
MEMBER(defines) imap_setting_defines,
MEMBER(defaults) &imap_default_settings,
- MEMBER(parent) NULL,
- MEMBER(dynamic_parsers) NULL,
+ MEMBER(type_offset) (size_t)-1,
+ MEMBER(struct_size) sizeof(struct imap_settings),
MEMBER(parent_offset) (size_t)-1,
- MEMBER(type_offset) (size_t)-1,
- MEMBER(struct_size) sizeof(struct imap_settings),
+ MEMBER(parent) NULL,
+
MEMBER(check_func) imap_settings_verify,
MEMBER(dependencies) imap_setting_dependencies
};
diff -r 183373d83021 -r 5a25b4ec5694 src/lib-lda/lda-settings.c
--- a/src/lib-lda/lda-settings.c Tue Oct 20 15:40:51 2009 -0400
+++ b/src/lib-lda/lda-settings.c Tue Oct 20 17:15:01 2009 -0400
@@ -52,12 +52,12 @@ struct setting_parser_info lda_setting_p
MEMBER(defines) lda_setting_defines,
MEMBER(defaults) &lda_default_settings,
- MEMBER(parent) NULL,
- MEMBER(dynamic_parsers) NULL,
+ MEMBER(type_offset) (size_t)-1,
+ MEMBER(struct_size) sizeof(struct lda_settings),
MEMBER(parent_offset) (size_t)-1,
- MEMBER(type_offset) (size_t)-1,
- MEMBER(struct_size) sizeof(struct lda_settings),
+ MEMBER(parent) NULL,
+
#ifdef CONFIG_BINARY
MEMBER(check_func) NULL,
#else
diff -r 183373d83021 -r 5a25b4ec5694 src/lib-master/master-service-settings.c
--- a/src/lib-master/master-service-settings.c Tue Oct 20 15:40:51 2009 -0400
+++ b/src/lib-master/master-service-settings.c Tue Oct 20 17:15:01 2009 -0400
@@ -48,12 +48,10 @@ struct setting_parser_info master_servic
MEMBER(defines) master_service_setting_defines,
MEMBER(defaults) &master_service_default_settings,
- MEMBER(parent) NULL,
- MEMBER(dynamic_parsers) NULL,
-
- MEMBER(parent_offset) (size_t)-1,
MEMBER(type_offset) (size_t)-1,
- MEMBER(struct_size) sizeof(struct master_service_settings)
+ MEMBER(struct_size) sizeof(struct master_service_settings),
+
+ MEMBER(parent_offset) (size_t)-1
};
static void ATTR_NORETURN
diff -r 183373d83021 -r 5a25b4ec5694 src/lib-settings/settings-parser.c
--- a/src/lib-settings/settings-parser.c Tue Oct 20 15:40:51 2009 -0400
+++ b/src/lib-settings/settings-parser.c Tue Oct 20 17:15:01 2009 -0400
@@ -54,12 +54,10 @@ static const struct setting_parser_info
MEMBER(defines) NULL,
MEMBER(defaults) NULL,
- MEMBER(parent) NULL,
- MEMBER(dynamic_parsers) NULL,
-
- MEMBER(parent_offset) (size_t)-1,
MEMBER(type_offset) (size_t)-1,
- MEMBER(struct_size) 0
+ MEMBER(struct_size) 0,
+
+ MEMBER(parent_offset) (size_t)-1
};
struct setting_parser_context *
diff -r 183373d83021 -r 5a25b4ec5694 src/lib-settings/settings-parser.h
--- a/src/lib-settings/settings-parser.h Tue Oct 20 15:40:51 2009 -0400
+++ b/src/lib-settings/settings-parser.h Tue Oct 20 17:15:01 2009 -0400
@@ -53,14 +53,15 @@ struct setting_parser_info {
const struct setting_define *defines;
const void *defaults;
- struct setting_parser_info *parent;
- struct dynamic_settings_parser *dynamic_parsers;
+ size_t type_offset;
+ size_t struct_size;
size_t parent_offset;
- size_t type_offset;
- size_t struct_size;
+ struct setting_parser_info *parent;
+
bool (*check_func)(void *set, pool_t pool, const char **error_r);
struct setting_parser_info *const *dependencies;
+ struct dynamic_settings_parser *dynamic_parsers;
};
ARRAY_DEFINE_TYPE(setting_parser_info, struct setting_parser_info);
diff -r 183373d83021 -r 5a25b4ec5694 src/lib-storage/index/dbox-multi/mdbox-settings.c
--- a/src/lib-storage/index/dbox-multi/mdbox-settings.c Tue Oct 20 15:40:51 2009 -0400
+++ b/src/lib-storage/index/dbox-multi/mdbox-settings.c Tue Oct 20 17:15:01 2009 -0400
@@ -36,12 +36,12 @@ static struct setting_parser_info mdbox_
MEMBER(defines) mdbox_setting_defines,
MEMBER(defaults) &mdbox_default_settings,
- MEMBER(parent) &mail_user_setting_parser_info,
- MEMBER(dynamic_parsers) NULL,
+ MEMBER(type_offset) (size_t)-1,
+ MEMBER(struct_size) sizeof(struct mdbox_settings),
MEMBER(parent_offset) (size_t)-1,
- MEMBER(type_offset) (size_t)-1,
- MEMBER(struct_size) sizeof(struct mdbox_settings),
+ MEMBER(parent) &mail_user_setting_parser_info,
+
MEMBER(check_func) mdbox_settings_verify
};
diff -r 183373d83021 -r 5a25b4ec5694 src/lib-storage/index/maildir/maildir-settings.c
--- a/src/lib-storage/index/maildir/maildir-settings.c Tue Oct 20 15:40:51 2009 -0400
+++ b/src/lib-storage/index/maildir/maildir-settings.c Tue Oct 20 17:15:01 2009 -0400
@@ -31,12 +31,11 @@ static struct setting_parser_info maildi
MEMBER(defines) maildir_setting_defines,
MEMBER(defaults) &maildir_default_settings,
- MEMBER(parent) &mail_user_setting_parser_info,
- MEMBER(dynamic_parsers) NULL,
+ MEMBER(type_offset) (size_t)-1,
+ MEMBER(struct_size) sizeof(struct maildir_settings),
MEMBER(parent_offset) (size_t)-1,
- MEMBER(type_offset) (size_t)-1,
- MEMBER(struct_size) sizeof(struct maildir_settings)
+ MEMBER(parent) &mail_user_setting_parser_info
};
const struct setting_parser_info *maildir_get_setting_parser_info(void)
diff -r 183373d83021 -r 5a25b4ec5694 src/lib-storage/index/mbox/mbox-settings.c
--- a/src/lib-storage/index/mbox/mbox-settings.c Tue Oct 20 15:40:51 2009 -0400
+++ b/src/lib-storage/index/mbox/mbox-settings.c Tue Oct 20 17:15:01 2009 -0400
@@ -39,12 +39,11 @@ static struct setting_parser_info mbox_s
MEMBER(defines) mbox_setting_defines,
MEMBER(defaults) &mbox_default_settings,
- MEMBER(parent) &mail_user_setting_parser_info,
- MEMBER(dynamic_parsers) NULL,
+ MEMBER(type_offset) (size_t)-1,
+ MEMBER(struct_size) sizeof(struct mbox_settings),
MEMBER(parent_offset) (size_t)-1,
- MEMBER(type_offset) (size_t)-1,
- MEMBER(struct_size) sizeof(struct mbox_settings)
+ MEMBER(parent) &mail_user_setting_parser_info
};
const struct setting_parser_info *mbox_get_setting_parser_info(void)
diff -r 183373d83021 -r 5a25b4ec5694 src/lib-storage/mail-storage-settings.c
--- a/src/lib-storage/mail-storage-settings.c Tue Oct 20 15:40:51 2009 -0400
+++ b/src/lib-storage/mail-storage-settings.c Tue Oct 20 17:15:01 2009 -0400
@@ -68,12 +68,12 @@ struct setting_parser_info mail_storage_
MEMBER(defines) mail_storage_setting_defines,
MEMBER(defaults) &mail_storage_default_settings,
- MEMBER(parent) &mail_user_setting_parser_info,
- MEMBER(dynamic_parsers) NULL,
-
- MEMBER(parent_offset) (size_t)-1,
MEMBER(type_offset) (size_t)-1,
MEMBER(struct_size) sizeof(struct mail_storage_settings),
+
+ MEMBER(parent_offset) (size_t)-1,
+ MEMBER(parent) &mail_user_setting_parser_info,
+
MEMBER(check_func) mail_storage_settings_check
};
@@ -113,12 +113,12 @@ struct setting_parser_info mail_namespac
MEMBER(defines) mail_namespace_setting_defines,
MEMBER(defaults) &mail_namespace_default_settings,
- MEMBER(parent) &mail_user_setting_parser_info,
- MEMBER(dynamic_parsers) NULL,
-
- MEMBER(parent_offset) offsetof(struct mail_namespace_settings, user_set),
MEMBER(type_offset) offsetof(struct mail_namespace_settings, type),
MEMBER(struct_size) sizeof(struct mail_namespace_settings),
+
+ MEMBER(parent_offset) offsetof(struct mail_namespace_settings, user_set),
+ MEMBER(parent) &mail_user_setting_parser_info,
+
MEMBER(check_func) namespace_settings_check
};
@@ -188,12 +188,12 @@ struct setting_parser_info mail_user_set
MEMBER(defines) mail_user_setting_defines,
MEMBER(defaults) &mail_user_default_settings,
- MEMBER(parent) NULL,
- MEMBER(dynamic_parsers) NULL,
-
- MEMBER(parent_offset) (size_t)-1,
MEMBER(type_offset) (size_t)-1,
MEMBER(struct_size) sizeof(struct mail_user_settings),
+
+ MEMBER(parent_offset) (size_t)-1,
+ MEMBER(parent) NULL,
+
MEMBER(check_func) mail_user_settings_check
};
diff -r 183373d83021 -r 5a25b4ec5694 src/lmtp/lmtp-settings.c
--- a/src/lmtp/lmtp-settings.c Tue Oct 20 15:40:51 2009 -0400
+++ b/src/lmtp/lmtp-settings.c Tue Oct 20 17:15:01 2009 -0400
@@ -26,11 +26,8 @@ struct setting_parser_info lmtp_setting_
MEMBER(defines) lmtp_setting_defines,
MEMBER(defaults) &lmtp_default_settings,
- MEMBER(parent) NULL,
- MEMBER(dynamic_parsers) NULL,
-
- MEMBER(parent_offset) (size_t)-1,
MEMBER(type_offset) (size_t)-1,
MEMBER(struct_size) sizeof(struct lmtp_settings),
- MEMBER(check_func) NULL
+
+ MEMBER(parent_offset) (size_t)-1
More information about the dovecot-cvs
mailing list