From: Timo Sirainen Date: Tue, 10 Sep 2024 14:27:59 +0000 (+0300) Subject: global: Use settings_defaults_dup() where possible X-Git-Tag: 2.4.0~437 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a37bbc8141136ad1c33a16314ed8c45f75992be6;p=thirdparty%2Fdovecot%2Fcore.git global: Use settings_defaults_dup() where possible --- diff --git a/src/lib-dict-extra/dict-client.c b/src/lib-dict-extra/dict-client.c index 86d98017d2..481688158c 100644 --- a/src/lib-dict-extra/dict-client.c +++ b/src/lib-dict-extra/dict-client.c @@ -744,9 +744,7 @@ client_dict_init_legacy(struct dict *dict_driver, const char *uri, const char *error; pool_t pool = pool_alloconly_create("dict_proxy_settings", 128); - set = p_new(pool, struct dict_proxy_settings, 1); - *set = dict_proxy_default_settings; - set->pool = pool; + set = settings_defaults_dup(pool, &dict_proxy_setting_parser_info); /* uri = [idle_timeout=:] [slow_warn=:] [] ":" */ for (;;) { diff --git a/src/lib-dict/dict-redis.c b/src/lib-dict/dict-redis.c index 110ead9f35..f2c623e994 100644 --- a/src/lib-dict/dict-redis.c +++ b/src/lib-dict/dict-redis.c @@ -483,9 +483,7 @@ redis_dict_init_legacy(struct dict *dict_driver, const char *uri, { pool_t pool = pool_alloconly_create("redis_settings", 128); struct dict_redis_settings *set = - p_new(pool, struct dict_redis_settings, 1); - *set = redis_default_settings; - set->pool = pool; + settings_defaults_dup(pool, &redis_setting_parser_info); if (net_addr2ip(set->redis_host, &set->redis_ip) < 0) i_unreached(); diff --git a/src/lib-fs/fs-posix.c b/src/lib-fs/fs-posix.c index 6548c9cbdc..e39f8ed47c 100644 --- a/src/lib-fs/fs-posix.c +++ b/src/lib-fs/fs-posix.c @@ -167,9 +167,7 @@ fs_posix_legacy_init(struct fs *_fs, const char *args, pool_t pool = pool_alloconly_create("fs_posix_settings", 128); struct fs_posix_settings *set = - p_new(pool, struct fs_posix_settings, 1); - *set = fs_posix_default_settings; - set->pool = pool; + settings_defaults_dup(pool, &fs_posix_setting_parser_info); set->parsed_lock_method = FS_POSIX_LOCK_METHOD_FLOCK; fs->set = set; diff --git a/src/lib-sql/driver-cassandra.c b/src/lib-sql/driver-cassandra.c index 2ab46ea7a4..04a8230349 100644 --- a/src/lib-sql/driver-cassandra.c +++ b/src/lib-sql/driver-cassandra.c @@ -857,9 +857,7 @@ driver_cassandra_parse_connect_string(pool_t pool, const char *connect_string, bool read_fallback_set = FALSE, write_fallback_set = FALSE; bool delete_fallback_set = FALSE; - set = p_new(pool, struct cassandra_settings, 1); - *set = cassandra_default_settings; - set->pool = pool; + set = settings_defaults_dup(pool, &cassandra_setting_parser_info); struct ssl_settings *ssl_set = p_new(pool, struct ssl_settings, 1); *ssl_set = ssl_default_settings; diff --git a/src/lib-sql/driver-mysql.c b/src/lib-sql/driver-mysql.c index afc90e682a..88c2f44409 100644 --- a/src/lib-sql/driver-mysql.c +++ b/src/lib-sql/driver-mysql.c @@ -298,13 +298,8 @@ driver_mysql_parse_connect_string(pool_t pool, const char *connect_string, const char *const *args, *name, *value; const char **field; - set = p_new(pool, struct mysql_settings, 1); - *set = mysql_default_settings; - set->pool = pool; - - ssl_set = p_new(pool, struct ssl_settings, 1); - *ssl_set = ssl_default_settings; - ssl_set->pool = pool; + set = settings_defaults_dup(pool, &mysql_setting_parser_info); + ssl_set = settings_defaults_dup(pool, &ssl_setting_parser_info); ssl_set->ssl_cipher_list = "HIGH"; diff --git a/src/lib-sql/driver-pgsql.c b/src/lib-sql/driver-pgsql.c index 39153cd6e0..300c9e5df2 100644 --- a/src/lib-sql/driver-pgsql.c +++ b/src/lib-sql/driver-pgsql.c @@ -500,9 +500,8 @@ driver_pgsql_init_full_v(const struct sql_legacy_settings *legacy_set, const char *value; pool_t pool = pool_alloconly_create("pgsql settings", 128); - struct pgsql_settings *set = p_new(pool, struct pgsql_settings, 1); - *set = pgsql_default_settings; - set->pool = pool; + struct pgsql_settings *set = + settings_defaults_dup(pool, &pgsql_setting_parser_info); /* NOTE: Connection string will be parsed by pgsql itself We only pick the host part here */ diff --git a/src/lib-sql/driver-sqlite.c b/src/lib-sql/driver-sqlite.c index 9a65f901d6..ef4fc1eccc 100644 --- a/src/lib-sql/driver-sqlite.c +++ b/src/lib-sql/driver-sqlite.c @@ -218,9 +218,8 @@ driver_sqlite_parse_connect_string(pool_t pool, return -1; } - struct sqlite_settings *set = p_new(pool, struct sqlite_settings, 1); - *set = sqlite_default_settings; - set->pool = pool; + struct sqlite_settings *set = + settings_defaults_dup(pool, &sqlite_setting_parser_info); for (; *params != NULL; params++) { if (str_begins(*params, "journal_mode=", &arg)) { diff --git a/src/stats/client-reader.c b/src/stats/client-reader.c index d313e067a0..e04dbb2a72 100644 --- a/src/stats/client-reader.c +++ b/src/stats/client-reader.c @@ -169,9 +169,7 @@ reader_client_input_metrics_add(struct reader_client *client, pool_t pool = pool_alloconly_create("dynamic stats metrics", 128); struct stats_metric_settings *set = - p_new(pool, struct stats_metric_settings, 1); - *set = stats_metric_default_settings; - set->pool = pool; + settings_defaults_dup(pool, &stats_metric_setting_parser_info); set->name = p_strdup(pool, args[0]); set->description = p_strdup(pool, args[1]); set->filter = p_strdup(pool, args[4]);