From: Timo Sirainen <timo.sirainen@open-xchange.com>
Date: Thu, 21 Mar 2024 22:01:35 +0000 (+0200)
Subject: dict: Rename dict_server_settings.dicts to legacy_dicts
X-Git-Tag: 2.4.0~534
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3fcfe3278d38b6e589470426cfc96208212d9fb1;p=thirdparty%2Fdovecot%2Fcore.git

dict: Rename dict_server_settings.dicts to legacy_dicts
---

diff --git a/src/dict/dict-connection.c b/src/dict/dict-connection.c
index 7784def462..8163c2c4f8 100644
--- a/src/dict/dict-connection.c
+++ b/src/dict/dict-connection.c
@@ -73,11 +73,11 @@ static int dict_connection_dict_init(struct dict_connection *conn)
 	unsigned int i, count;
 	const char *uri, *error;
 
-	if (!array_is_created(&dict_settings->dicts)) {
+	if (!array_is_created(&dict_settings->legacy_dicts)) {
 		e_error(conn->conn.event, "No dictionaries configured");
 		return -1;
 	}
-	strlist = array_get(&dict_settings->dicts, &count);
+	strlist = array_get(&dict_settings->legacy_dicts, &count);
 	for (i = 0; i < count; i += 2) {
 		if (strcmp(strlist[i], conn->name) == 0)
 			break;
diff --git a/src/dict/dict-expire.c b/src/dict/dict-expire.c
index 0bd8b60d52..1e3672f25a 100644
--- a/src/dict/dict-expire.c
+++ b/src/dict/dict-expire.c
@@ -73,7 +73,7 @@ static void dict_expire_init(void)
 	unsigned int i, count;
 
 	i_array_init(&expire_dicts, 16);
-	strlist = array_get(&dict_settings->dicts, &count);
+	strlist = array_get(&dict_settings->legacy_dicts, &count);
 	for (i = 0; i < count; i += 2) {
 		const char *name = strlist[i];
 		const char *uri = strlist[i+1];
diff --git a/src/dict/dict-settings.c b/src/dict/dict-settings.c
index c91f0ba925..bf69fb73be 100644
--- a/src/dict/dict-settings.c
+++ b/src/dict/dict-settings.c
@@ -93,7 +93,7 @@ static const struct setting_define dict_setting_defines[] = {
 	DEF(STR_HIDDEN, base_dir),
 	DEF(BOOL, verbose_proctitle),
 	{ .type = SET_STRLIST, .key = "dict_legacy",
-	  .offset = offsetof(struct dict_server_settings, dicts) },
+	  .offset = offsetof(struct dict_server_settings, legacy_dicts) },
 
 	SETTING_DEFINE_LIST_END
 };
@@ -101,7 +101,7 @@ static const struct setting_define dict_setting_defines[] = {
 const struct dict_server_settings dict_default_settings = {
 	.base_dir = PKG_RUNDIR,
 	.verbose_proctitle = FALSE,
-	.dicts = ARRAY_INIT
+	.legacy_dicts = ARRAY_INIT
 };
 
 const struct setting_parser_info dict_server_setting_parser_info = {
diff --git a/src/dict/dict-settings.h b/src/dict/dict-settings.h
index 74f9870b2a..f8e32b6c18 100644
--- a/src/dict/dict-settings.h
+++ b/src/dict/dict-settings.h
@@ -5,7 +5,7 @@ struct dict_server_settings {
 	pool_t pool;
 	const char *base_dir;
 	bool verbose_proctitle;
-	ARRAY(const char *) dicts;
+	ARRAY(const char *) legacy_dicts;
 };
 
 extern const struct setting_parser_info dict_server_setting_parser_info;