From 29602f6a0eddedfcc56cdc62d1fe48ca44b93c8d Mon Sep 17 00:00:00 2001 From: Timo Sirainen Date: Wed, 13 Mar 2024 21:40:36 +0200 Subject: [PATCH] lib-dict-backend: Rename dict-sql-settings to dict-sql-legacy-settings --- src/lib-dict-backend/Makefile.am | 2 +- ...-settings.c => dict-sql-legacy-settings.c} | 38 +++++++++---------- src/lib-dict-backend/dict-sql-private.h | 2 +- src/lib-dict-backend/dict-sql-settings.h | 8 ++-- src/lib-dict-backend/dict-sql.c | 4 +- 5 files changed, 27 insertions(+), 27 deletions(-) rename src/lib-dict-backend/{dict-sql-settings.c => dict-sql-legacy-settings.c} (88%) diff --git a/src/lib-dict-backend/Makefile.am b/src/lib-dict-backend/Makefile.am index e607a2de34..770f597afc 100644 --- a/src/lib-dict-backend/Makefile.am +++ b/src/lib-dict-backend/Makefile.am @@ -21,7 +21,7 @@ ldap_sources = \ libdict_backend_la_SOURCES = \ dict-cdb.c \ dict-sql.c \ - dict-sql-settings.c \ + dict-sql-legacy-settings.c \ $(ldap_sources) libdict_backend_la_LIBADD = diff --git a/src/lib-dict-backend/dict-sql-settings.c b/src/lib-dict-backend/dict-sql-legacy-settings.c similarity index 88% rename from src/lib-dict-backend/dict-sql-settings.c rename to src/lib-dict-backend/dict-sql-legacy-settings.c index 5d0ed59b76..8e11038ece 100644 --- a/src/lib-dict-backend/dict-sql-settings.c +++ b/src/lib-dict-backend/dict-sql-legacy-settings.c @@ -22,7 +22,7 @@ struct dict_sql_map_field { struct setting_parser_ctx { pool_t pool; - struct dict_sql_settings *set; + struct dict_sql_legacy_settings *set; enum section_type type; struct dict_sql_map cur_map; @@ -43,13 +43,13 @@ static const struct setting_def dict_sql_map_setting_defs[] = { { 0, NULL, 0 } }; -struct dict_sql_settings_cache { +struct dict_sql_legacy_settings_cache { pool_t pool; const char *path; - struct dict_sql_settings *set; + struct dict_sql_legacy_settings *set; }; -static HASH_TABLE(const char *, struct dict_sql_settings_cache *) dict_sql_settings_cache; +static HASH_TABLE(const char *, struct dict_sql_legacy_settings_cache *) dict_sql_legacy_settings_cache; static const char *dict_sql_type_names[] = { "string", @@ -291,26 +291,26 @@ parse_section(const char *type, const char *name ATTR_UNUSED, return FALSE; } -struct dict_sql_settings * -dict_sql_settings_read(const char *path, const char **error_r) +struct dict_sql_legacy_settings * +dict_sql_legacy_settings_read(const char *path, const char **error_r) { struct setting_parser_ctx ctx; - struct dict_sql_settings_cache *cache; + struct dict_sql_legacy_settings_cache *cache; pool_t pool; - if (!hash_table_is_created(dict_sql_settings_cache)) { - hash_table_create(&dict_sql_settings_cache, default_pool, 0, + if (!hash_table_is_created(dict_sql_legacy_settings_cache)) { + hash_table_create(&dict_sql_legacy_settings_cache, default_pool, 0, str_hash, strcmp); } - cache = hash_table_lookup(dict_sql_settings_cache, path); + cache = hash_table_lookup(dict_sql_legacy_settings_cache, path); if (cache != NULL) return cache->set; i_zero(&ctx); pool = pool_alloconly_create("dict sql settings", 1024); ctx.pool = pool; - ctx.set = p_new(pool, struct dict_sql_settings, 1); + ctx.set = p_new(pool, struct dict_sql_legacy_settings, 1); t_array_init(&ctx.cur_fields, 16); p_array_init(&ctx.set->maps, pool, 8); @@ -327,27 +327,27 @@ dict_sql_settings_read(const char *path, const char **error_r) return NULL; } - cache = p_new(pool, struct dict_sql_settings_cache, 1); + cache = p_new(pool, struct dict_sql_legacy_settings_cache, 1); cache->pool = pool; cache->path = p_strdup(pool, path); cache->set = ctx.set; - hash_table_insert(dict_sql_settings_cache, cache->path, cache); + hash_table_insert(dict_sql_legacy_settings_cache, cache->path, cache); return ctx.set; } -void dict_sql_settings_deinit(void) +void dict_sql_legacy_settings_deinit(void) { struct hash_iterate_context *iter; - struct dict_sql_settings_cache *cache; + struct dict_sql_legacy_settings_cache *cache; const char *key; - if (!hash_table_is_created(dict_sql_settings_cache)) + if (!hash_table_is_created(dict_sql_legacy_settings_cache)) return; - iter = hash_table_iterate_init(dict_sql_settings_cache); - while (hash_table_iterate(iter, dict_sql_settings_cache, &key, &cache)) + iter = hash_table_iterate_init(dict_sql_legacy_settings_cache); + while (hash_table_iterate(iter, dict_sql_legacy_settings_cache, &key, &cache)) pool_unref(&cache->pool); hash_table_iterate_deinit(&iter); - hash_table_destroy(&dict_sql_settings_cache); + hash_table_destroy(&dict_sql_legacy_settings_cache); } diff --git a/src/lib-dict-backend/dict-sql-private.h b/src/lib-dict-backend/dict-sql-private.h index 11e9dfc995..54089c9fcc 100644 --- a/src/lib-dict-backend/dict-sql-private.h +++ b/src/lib-dict-backend/dict-sql-private.h @@ -6,7 +6,7 @@ struct sql_dict { pool_t pool; struct sql_db *db; - const struct dict_sql_settings *set; + const struct dict_sql_legacy_settings *set; }; #endif diff --git a/src/lib-dict-backend/dict-sql-settings.h b/src/lib-dict-backend/dict-sql-settings.h index 5c0a0723ac..68758f2c62 100644 --- a/src/lib-dict-backend/dict-sql-settings.h +++ b/src/lib-dict-backend/dict-sql-settings.h @@ -34,16 +34,16 @@ struct dict_sql_map { const enum dict_sql_type *value_types; }; -struct dict_sql_settings { +struct dict_sql_legacy_settings { const char *connect; unsigned int max_pattern_fields_count; ARRAY(struct dict_sql_map) maps; }; -struct dict_sql_settings * -dict_sql_settings_read(const char *path, const char **error_r); +struct dict_sql_legacy_settings * +dict_sql_legacy_settings_read(const char *path, const char **error_r); -void dict_sql_settings_deinit(void); +void dict_sql_legacy_settings_deinit(void); #endif diff --git a/src/lib-dict-backend/dict-sql.c b/src/lib-dict-backend/dict-sql.c index 3c5427297e..1c337840cb 100644 --- a/src/lib-dict-backend/dict-sql.c +++ b/src/lib-dict-backend/dict-sql.c @@ -108,7 +108,7 @@ sql_dict_init_legacy(struct dict *driver, const char *uri, dict = p_new(pool, struct sql_dict, 1); dict->pool = pool; dict->dict = *driver; - dict->set = dict_sql_settings_read(uri, error_r); + dict->set = dict_sql_legacy_settings_read(uri, error_r); if (dict->set == NULL) { pool_unref(&pool); return -1; @@ -1699,5 +1699,5 @@ void dict_sql_unregister(void) dict_driver_unregister(&dict_sql_drivers[i]); i_free(dict_sql_drivers); sql_db_cache_deinit_legacy(&dict_sql_db_cache); - dict_sql_settings_deinit(); + dict_sql_legacy_settings_deinit(); } -- 2.47.3