From: Timo Sirainen Date: Thu, 21 Mar 2024 22:09:06 +0000 (+0200) Subject: dict: Rename dict_settings variables to server_settings X-Git-Tag: 2.4.1~807 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d0019f78aefcfd6cd5c154f729cd8f67c9504185;p=thirdparty%2Fdovecot%2Fcore.git dict: Rename dict_settings variables to server_settings --- diff --git a/src/dict/dict-commands.c b/src/dict/dict-commands.c index 8b851a0675..1a2cd3370e 100644 --- a/src/dict/dict-commands.c +++ b/src/dict/dict-commands.c @@ -107,7 +107,7 @@ cmd_stats_update(struct dict_connection_cmd *cmd, struct stats_dist *stats) { long long diff; - if (!dict_settings->verbose_proctitle) + if (!server_settings->verbose_proctitle) return; diff = timeval_diff_usecs(&ioloop_timeval, &cmd->start_timeval); diff --git a/src/dict/dict-connection.c b/src/dict/dict-connection.c index 574b1a6c70..95208a09cc 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->legacy_dicts)) { + if (!array_is_created(&server_settings->legacy_dicts)) { e_error(conn->conn.event, "No dictionaries configured"); return -1; } - strlist = array_get(&dict_settings->legacy_dicts, &count); + strlist = array_get(&server_settings->legacy_dicts, &count); for (i = 0; i < count; i += 2) { if (strcmp(strlist[i], conn->name) == 0) break; @@ -94,7 +94,7 @@ static int dict_connection_dict_init(struct dict_connection *conn) uri = strlist[i+1]; i_zero(&dict_set); - dict_set.base_dir = dict_settings->base_dir; + dict_set.base_dir = server_settings->base_dir; dict_set.event_parent = conn->conn.event; if (dict_init_cache_get_legacy(conn->name, uri, &dict_set, &conn->dict, &error) < 0) { diff --git a/src/dict/dict-expire.c b/src/dict/dict-expire.c index 1e3672f25a..931718484a 100644 --- a/src/dict/dict-expire.c +++ b/src/dict/dict-expire.c @@ -36,7 +36,7 @@ static void dict_expire_run(void) for (i = count; i > 0; i--) { struct expire_dict *dict = &dicts[i-1]; - if (dict_settings->verbose_proctitle) + if (server_settings->verbose_proctitle) process_title_set(t_strdup_printf("[running dict %s]", dict->name)); ret = dict_expire_scan(dict->dict, &error); if (ret < 0) @@ -46,7 +46,7 @@ static void dict_expire_run(void) array_delete(&expire_dicts, i-1, 1); } } - if (dict_settings->verbose_proctitle) + if (server_settings->verbose_proctitle) process_title_set("[idling]"); } @@ -66,14 +66,14 @@ static void client_connected(struct master_service_connection *conn ATTR_UNUSED) static void dict_expire_init(void) { struct dict_legacy_settings dict_set = { - .base_dir = dict_settings->base_dir, + .base_dir = server_settings->base_dir, }; struct dict *dict; const char *const *strlist, *error; unsigned int i, count; i_array_init(&expire_dicts, 16); - strlist = array_get(&dict_settings->legacy_dicts, &count); + strlist = array_get(&server_settings->legacy_dicts, &count); for (i = 0; i < count; i += 2) { const char *name = strlist[i]; const char *uri = strlist[i+1]; @@ -106,7 +106,7 @@ static void main_init(void) { struct module_dir_load_settings mod_set; - dict_settings = + server_settings = settings_get_or_fatal(master_service_get_event(master_service), &dict_server_setting_parser_info); @@ -139,7 +139,7 @@ static void main_deinit(void) sql_drivers_deinit(); timeout_remove(&to_expire); - settings_free(dict_settings); + settings_free(server_settings); } int main(int argc, char *argv[]) diff --git a/src/dict/dict-settings.c b/src/dict/dict-settings.c index bf69fb73be..f551cb11ac 100644 --- a/src/dict/dict-settings.c +++ b/src/dict/dict-settings.c @@ -114,4 +114,4 @@ const struct setting_parser_info dict_server_setting_parser_info = { .pool_offset1 = 1 + offsetof(struct dict_server_settings, pool), }; -const struct dict_server_settings *dict_settings; +const struct dict_server_settings *server_settings; diff --git a/src/dict/dict-settings.h b/src/dict/dict-settings.h index f8e32b6c18..8518f0c94e 100644 --- a/src/dict/dict-settings.h +++ b/src/dict/dict-settings.h @@ -9,6 +9,6 @@ struct dict_server_settings { }; extern const struct setting_parser_info dict_server_setting_parser_info; -extern const struct dict_server_settings *dict_settings; +extern const struct dict_server_settings *server_settings; #endif diff --git a/src/dict/main.c b/src/dict/main.c index c90547a6ab..9d8d992092 100644 --- a/src/dict/main.c +++ b/src/dict/main.c @@ -67,7 +67,7 @@ static void dict_proctitle_update(void *context ATTR_UNUSED) void dict_proctitle_update_later(void) { - if (!dict_settings->verbose_proctitle) + if (!server_settings->verbose_proctitle) return; if (to_proctitle == NULL) @@ -102,7 +102,7 @@ static void main_init(void) { struct module_dir_load_settings mod_set; - dict_settings = + server_settings = settings_get_or_fatal(master_service_get_event(master_service), &dict_server_setting_parser_info); @@ -119,7 +119,7 @@ static void main_init(void) dict_commands_init(); dict_connections_init(); - if (dict_settings->verbose_proctitle) + if (server_settings->verbose_proctitle) dict_proctitle_update(NULL); } @@ -138,7 +138,7 @@ static void main_deinit(void) sql_drivers_deinit(); timeout_remove(&to_proctitle); - settings_free(dict_settings); + settings_free(server_settings); } int main(int argc, char *argv[])