dovecot-2.2: dict: Renamed struct dict_settings to dict_server_s...

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-2.2/rev/d91b43496e72
changeset: 17750:d91b43496e72
user:      Timo Sirainen <tss at iki.fi>
date:      Thu Aug 28 22:06:29 2014 +0900
description:
dict: Renamed struct dict_settings to dict_server_settings.

diffstat:

 src/dict/dict-settings.c |  10 +++++-----
 src/dict/dict-settings.h |   4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diffs (55 lines):

diff -r 9b5a197f5da2 -r d91b43496e72 src/dict/dict-settings.c
--- a/src/dict/dict-settings.c	Wed Aug 27 07:53:39 2014 +0300
+++ b/src/dict/dict-settings.c	Thu Aug 28 22:06:29 2014 +0900
@@ -46,17 +46,17 @@
 
 #undef DEF
 #define DEF(type, name) \
-	{ type, #name, offsetof(struct dict_settings, name), NULL }
+	{ type, #name, offsetof(struct dict_server_settings, name), NULL }
 
 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 },
+	{ SET_STRLIST, "dict", offsetof(struct dict_server_settings, dicts), NULL },
 
 	SETTING_DEFINE_LIST_END
 };
 
-const struct dict_settings dict_default_settings = {
+const struct dict_server_settings dict_default_settings = {
 	.base_dir = PKG_RUNDIR,
 	.dict_db_config = "",
 	.dicts = ARRAY_INIT
@@ -68,9 +68,9 @@
 	.defaults = &dict_default_settings,
 
 	.type_offset = (size_t)-1,
-	.struct_size = sizeof(struct dict_settings),
+	.struct_size = sizeof(struct dict_server_settings),
 
 	.parent_offset = (size_t)-1
 };
 
-const struct dict_settings *dict_settings;
+const struct dict_server_settings *dict_settings;
diff -r 9b5a197f5da2 -r d91b43496e72 src/dict/dict-settings.h
--- a/src/dict/dict-settings.h	Wed Aug 27 07:53:39 2014 +0300
+++ b/src/dict/dict-settings.h	Thu Aug 28 22:06:29 2014 +0900
@@ -1,13 +1,13 @@
 #ifndef DICT_SETTINGS_H
 #define DICT_SETTINGS_H
 
-struct dict_settings {
+struct dict_server_settings {
 	const char *base_dir;
 	const char *dict_db_config;
 	ARRAY(const char *) dicts;
 };
 
 extern const struct setting_parser_info dict_setting_parser_info;
-extern const struct dict_settings *dict_settings;
+extern const struct dict_server_settings *dict_settings;
 
 #endif