dovecot-2.0-sslstream: Changed all settings related structs to c...
dovecot at dovecot.org
dovecot at dovecot.org
Sat Feb 13 02:55:38 EET 2010
details: http://hg.dovecot.org/dovecot-2.0-sslstream/rev/d589d568a19d
changeset: 10178:d589d568a19d
user: Timo Sirainen <tss at iki.fi>
date: Fri Oct 23 20:10:17 2009 -0400
description:
Changed all settings related structs to const and changed APIs to make it work.
diffstat:
33 files changed, 116 insertions(+), 112 deletions(-)
src/auth/auth-settings.c | 18 +++++++-------
src/config/config-request.c | 2 -
src/config/settings-get.pl | 10 ++++----
src/dict/dict-settings.c | 8 +++---
src/dict/dict-settings.h | 4 +--
src/imap-login/imap-login-settings.c | 8 +++---
src/imap/imap-settings.c | 12 ++++-----
src/imap/imap-settings.h | 2 -
src/lib-dict/dict-sql-settings.c | 2 -
src/lib-lda/lda-settings.c | 8 +++---
src/lib-lda/lda-settings.h | 2 -
src/lib-master/master-service-settings.c | 7 +++--
src/lib-master/master-service-settings.h | 3 +-
src/lib-settings/settings-parser.c | 9 +++----
src/lib-settings/settings-parser.h | 5 ++--
src/lib-settings/settings.c | 4 +--
src/lib-settings/settings.h | 2 -
src/lib-storage/index/dbox-multi/mdbox-settings.c | 6 ++--
src/lib-storage/index/maildir/maildir-settings.c | 6 ++--
src/lib-storage/index/mbox/mbox-settings.c | 6 ++--
src/lib-storage/mail-storage-service.c | 6 +++-
src/lib-storage/mail-storage-settings.c | 18 +++++++-------
src/lib-storage/mail-storage-settings.h | 8 +++---
src/lmtp/lmtp-settings.c | 8 +++---
src/lmtp/lmtp-settings.h | 2 -
src/login-common/login-settings.c | 6 ++--
src/login-common/login-settings.h | 2 -
src/master/master-settings.c | 26 ++++++++++-----------
src/master/master-settings.h | 2 -
src/pop3-login/pop3-login-settings.c | 6 ++--
src/pop3/pop3-settings.c | 12 ++++-----
src/pop3/pop3-settings.h | 2 -
src/ssl-params/ssl-params-settings.c | 6 ++--
diffs (truncated from 1008 to 300 lines):
diff -r 9e0123366fc5 -r d589d568a19d src/auth/auth-settings.c
--- a/src/auth/auth-settings.c Fri Oct 23 19:11:19 2009 -0400
+++ b/src/auth/auth-settings.c Fri Oct 23 20:10:17 2009 -0400
@@ -8,8 +8,8 @@
#include <stddef.h>
-extern struct setting_parser_info auth_setting_parser_info;
-extern struct setting_parser_info auth_root_setting_parser_info;
+extern const struct setting_parser_info auth_setting_parser_info;
+extern const struct setting_parser_info auth_root_setting_parser_info;
static bool auth_settings_check(void *_set, pool_t pool, const char **error_r);
@@ -17,7 +17,7 @@ static bool auth_settings_check(void *_s
#define DEF(type, name) \
{ type, #name, offsetof(struct auth_passdb_settings, name), NULL }
-static struct setting_define auth_passdb_setting_defines[] = {
+static const struct setting_define auth_passdb_setting_defines[] = {
DEF(SET_STR, driver),
DEF(SET_STR, args),
DEF(SET_BOOL, deny),
@@ -25,7 +25,7 @@ static struct setting_define auth_passdb
SETTING_DEFINE_LIST_END
};
-struct setting_parser_info auth_passdb_setting_parser_info = {
+const struct setting_parser_info auth_passdb_setting_parser_info = {
MEMBER(module_name) NULL,
MEMBER(defines) auth_passdb_setting_defines,
MEMBER(defaults) NULL,
@@ -41,14 +41,14 @@ struct setting_parser_info auth_passdb_s
#define DEF(type, name) \
{ type, #name, offsetof(struct auth_userdb_settings, name), NULL }
-static struct setting_define auth_userdb_setting_defines[] = {
+static const struct setting_define auth_userdb_setting_defines[] = {
DEF(SET_STR, driver),
DEF(SET_STR, args),
SETTING_DEFINE_LIST_END
};
-struct setting_parser_info auth_userdb_setting_parser_info = {
+const struct setting_parser_info auth_userdb_setting_parser_info = {
MEMBER(module_name) NULL,
MEMBER(defines) auth_userdb_setting_defines,
MEMBER(defaults) NULL,
@@ -68,7 +68,7 @@ struct setting_parser_info auth_userdb_s
#define DEFLIST(field, name, defines) \
{ SET_DEFLIST, name, offsetof(struct auth_settings, field), defines }
-static struct setting_define auth_setting_defines[] = {
+static const struct setting_define auth_setting_defines[] = {
DEF(SET_STR, mechanisms),
DEF(SET_STR, realms),
DEF(SET_STR, default_realm),
@@ -100,7 +100,7 @@ static struct setting_define auth_settin
SETTING_DEFINE_LIST_END
};
-static struct auth_settings auth_default_settings = {
+static const struct auth_settings auth_default_settings = {
MEMBER(mechanisms) "plain",
MEMBER(realms) "",
MEMBER(default_realm) "",
@@ -130,7 +130,7 @@ static struct auth_settings auth_default
MEMBER(userdbs) ARRAY_INIT
};
-struct setting_parser_info auth_setting_parser_info = {
+const struct setting_parser_info auth_setting_parser_info = {
MEMBER(module_name) "auth",
MEMBER(defines) auth_setting_defines,
MEMBER(defaults) &auth_default_settings,
diff -r 9e0123366fc5 -r d589d568a19d src/config/config-request.c
--- a/src/config/config-request.c Fri Oct 23 19:11:19 2009 -0400
+++ b/src/config/config-request.c Fri Oct 23 20:10:17 2009 -0400
@@ -26,7 +26,7 @@ static bool parsers_are_connected(const
const struct setting_parser_info *info)
{
const struct setting_parser_info *p;
- struct setting_parser_info *const *dep;
+ const struct setting_parser_info *const *dep;
/* we're trying to find info or its parents from root's dependencies. */
diff -r 9e0123366fc5 -r d589d568a19d src/config/settings-get.pl
--- a/src/config/settings-get.pl Fri Oct 23 19:11:19 2009 -0400
+++ b/src/config/settings-get.pl Fri Oct 23 20:10:17 2009 -0400
@@ -31,11 +31,11 @@ foreach my $file (@ARGV) {
/struct setting_define.*{/ ||
/struct .*_default_settings = {/) {
$state++;
- } elsif (/^(static )?struct setting_parser_info (.*) = {/) {
- $state++;
+ } elsif (/^(static )?const struct setting_parser_info (.*) = {/) {
$cur_name = $2;
- } elsif (/^extern struct setting_parser_info (.*);/) {
- $externs .= "extern struct setting_parser_info $1;\n";
+ $state++ if ($cur_name !~ /^\*default_/);
+ } elsif (/^extern const struct setting_parser_info (.*);/) {
+ $externs .= "extern const struct setting_parser_info $1;\n";
} elsif (/\/\* <settings checks> \*\//) {
$state = 4;
$code .= $_;
@@ -62,7 +62,7 @@ foreach my $file (@ARGV) {
my $value = $1;
if ($value =~ /.*&(.*)\)/) {
$parsers{$1} = 0;
- $externs .= "extern struct setting_parser_info $1;\n";
+ $externs .= "extern const struct setting_parser_info $1;\n";
} else {
$state = 3;
}
diff -r 9e0123366fc5 -r d589d568a19d src/dict/dict-settings.c
--- a/src/dict/dict-settings.c Fri Oct 23 19:11:19 2009 -0400
+++ b/src/dict/dict-settings.c Fri Oct 23 20:10:17 2009 -0400
@@ -8,7 +8,7 @@
#define DEF(type, name) \
{ type, #name, offsetof(struct dict_settings, name), NULL }
-static struct setting_define dict_setting_defines[] = {
+static const struct setting_define dict_setting_defines[] = {
DEF(SET_STR, base_dir),
DEF(SET_STR, dict_db_config),
{ SET_STRLIST, "dict", offsetof(struct dict_settings, dicts), NULL },
@@ -16,13 +16,13 @@ static struct setting_define dict_settin
SETTING_DEFINE_LIST_END
};
-struct dict_settings dict_default_settings = {
+const struct dict_settings dict_default_settings = {
MEMBER(base_dir) PKG_RUNDIR,
MEMBER(dict_db_config) "",
MEMBER(dicts) ARRAY_INIT
};
-struct setting_parser_info dict_setting_parser_info = {
+const struct setting_parser_info dict_setting_parser_info = {
MEMBER(module_name) "dict",
MEMBER(defines) dict_setting_defines,
MEMBER(defaults) &dict_default_settings,
@@ -33,4 +33,4 @@ struct setting_parser_info dict_setting_
MEMBER(parent_offset) (size_t)-1
};
-struct dict_settings *dict_settings;
+const struct dict_settings *dict_settings;
diff -r 9e0123366fc5 -r d589d568a19d src/dict/dict-settings.h
--- a/src/dict/dict-settings.h Fri Oct 23 19:11:19 2009 -0400
+++ b/src/dict/dict-settings.h Fri Oct 23 20:10:17 2009 -0400
@@ -7,7 +7,7 @@ struct dict_settings {
ARRAY_DEFINE(dicts, const char *);
};
-extern struct setting_parser_info dict_setting_parser_info;
-extern struct dict_settings *dict_settings;
+extern const struct setting_parser_info dict_setting_parser_info;
+extern const struct dict_settings *dict_settings;
#endif
diff -r 9e0123366fc5 -r d589d568a19d src/imap-login/imap-login-settings.c
--- a/src/imap-login/imap-login-settings.c Fri Oct 23 19:11:19 2009 -0400
+++ b/src/imap-login/imap-login-settings.c Fri Oct 23 20:10:17 2009 -0400
@@ -11,22 +11,22 @@
#define DEF(type, name) \
{ type, #name, offsetof(struct imap_login_settings, name), NULL }
-static struct setting_define imap_login_setting_defines[] = {
+static const struct setting_define imap_login_setting_defines[] = {
DEF(SET_STR, imap_capability),
SETTING_DEFINE_LIST_END
};
-static struct imap_login_settings imap_login_default_settings = {
+static const struct imap_login_settings imap_login_default_settings = {
MEMBER(imap_capability) ""
};
-static struct setting_parser_info *imap_login_setting_dependencies[] = {
+static const struct setting_parser_info *imap_login_setting_dependencies[] = {
&login_setting_parser_info,
NULL
};
-static struct setting_parser_info imap_login_setting_parser_info = {
+static const struct setting_parser_info imap_login_setting_parser_info = {
MEMBER(module_name) "imap-login",
MEMBER(defines) imap_login_setting_defines,
MEMBER(defaults) &imap_login_default_settings,
diff -r 9e0123366fc5 -r d589d568a19d src/imap/imap-settings.c
--- a/src/imap/imap-settings.c Fri Oct 23 19:11:19 2009 -0400
+++ b/src/imap/imap-settings.c Fri Oct 23 20:10:17 2009 -0400
@@ -19,7 +19,7 @@ static bool imap_settings_verify(void *_
#define DEFLIST(field, name, defines) \
{ SET_DEFLIST, name, offsetof(struct imap_settings, field), defines }
-static struct setting_define imap_setting_defines[] = {
+static const struct setting_define imap_setting_defines[] = {
DEF(SET_BOOL, mail_debug),
DEF(SET_UINT, imap_max_line_length),
@@ -33,7 +33,7 @@ static struct setting_define imap_settin
SETTING_DEFINE_LIST_END
};
-static struct imap_settings imap_default_settings = {
+static const struct imap_settings imap_default_settings = {
MEMBER(mail_debug) FALSE,
/* RFC-2683 recommends at least 8000 bytes. Some clients however don't
@@ -48,12 +48,12 @@ static struct imap_settings imap_default
MEMBER(imap_id_log) ""
};
-static struct setting_parser_info *imap_setting_dependencies[] = {
+static const struct setting_parser_info *imap_setting_dependencies[] = {
&mail_user_setting_parser_info,
NULL
};
-struct setting_parser_info imap_setting_parser_info = {
+const struct setting_parser_info imap_setting_parser_info = {
MEMBER(module_name) "imap",
MEMBER(defines) imap_setting_defines,
MEMBER(defaults) &imap_default_settings,
@@ -74,7 +74,7 @@ struct imap_client_workaround_list {
enum imap_client_workarounds num;
};
-static struct imap_client_workaround_list imap_client_workaround_list[] = {
+static const struct imap_client_workaround_list imap_client_workaround_list[] = {
{ "delay-newmail", WORKAROUND_DELAY_NEWMAIL },
{ "outlook-idle", 0 }, /* only for backwards compatibility */
{ "netscape-eoh", WORKAROUND_NETSCAPE_EOH },
@@ -87,7 +87,7 @@ imap_settings_parse_workarounds(struct i
const char **error_r)
{
enum imap_client_workarounds client_workarounds = 0;
- struct imap_client_workaround_list *list;
+ const struct imap_client_workaround_list *list;
const char *const *str;
str = t_strsplit_spaces(set->imap_client_workarounds, " ,");
diff -r 9e0123366fc5 -r d589d568a19d src/imap/imap-settings.h
--- a/src/imap/imap-settings.h Fri Oct 23 19:11:19 2009 -0400
+++ b/src/imap/imap-settings.h Fri Oct 23 20:10:17 2009 -0400
@@ -26,6 +26,6 @@ struct imap_settings {
enum imap_client_workarounds parsed_workarounds;
};
-extern struct setting_parser_info imap_setting_parser_info;
+extern const struct setting_parser_info imap_setting_parser_info;
#endif
diff -r 9e0123366fc5 -r d589d568a19d src/lib-dict/dict-sql-settings.c
--- a/src/lib-dict/dict-sql-settings.c Fri Oct 23 19:11:19 2009 -0400
+++ b/src/lib-dict/dict-sql-settings.c Fri Oct 23 20:10:17 2009 -0400
@@ -29,7 +29,7 @@ struct setting_parser_ctx {
#define DEF_STR(name) DEF_STRUCT_STR(name, dict_sql_map)
-static struct setting_def dict_sql_map_setting_defs[] = {
+static const struct setting_def dict_sql_map_setting_defs[] = {
DEF_STR(pattern),
DEF_STR(table),
DEF_STR(username_field),
diff -r 9e0123366fc5 -r d589d568a19d src/lib-lda/lda-settings.c
--- a/src/lib-lda/lda-settings.c Fri Oct 23 19:11:19 2009 -0400
+++ b/src/lib-lda/lda-settings.c Fri Oct 23 20:10:17 2009 -0400
@@ -16,7 +16,7 @@ static bool lda_settings_check(void *_se
#define DEFLIST(field, name, defines) \
{ SET_DEFLIST, name, offsetof(struct lda_settings, field), defines }
-static struct setting_define lda_setting_defines[] = {
+static const struct setting_define lda_setting_defines[] = {
DEF(SET_STR, postmaster_address),
DEF(SET_STR, hostname),
DEF(SET_STR, sendmail_path),
@@ -30,7 +30,7 @@ static struct setting_define lda_setting
SETTING_DEFINE_LIST_END
};
-static struct lda_settings lda_default_settings = {
+static const struct lda_settings lda_default_settings = {
MEMBER(postmaster_address) "",
MEMBER(hostname) "",
MEMBER(sendmail_path) "/usr/lib/sendmail",
@@ -43,12 +43,12 @@ static struct lda_settings lda_default_s
MEMBER(lda_mailbox_autosubscribe) FALSE
};
-static struct setting_parser_info *lda_setting_dependencies[] = {
+static const struct setting_parser_info *lda_setting_dependencies[] = {
&mail_user_setting_parser_info,
NULL
};
More information about the dovecot-cvs
mailing list