From ec62f222344077e7bfed5cc2bb7743e0f5563f15 Mon Sep 17 00:00:00 2001 From: Timo Sirainen Date: Fri, 22 Mar 2024 00:03:53 +0200 Subject: [PATCH] dict: Rename dict_init_cache_get() to dict_init_cache_get_legacy() --- src/dict/dict-connection.c | 3 ++- src/dict/dict-init-cache.c | 6 +++--- src/dict/dict-init-cache.h | 6 +++--- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/dict/dict-connection.c b/src/dict/dict-connection.c index 8163c2c4f8..574b1a6c70 100644 --- a/src/dict/dict-connection.c +++ b/src/dict/dict-connection.c @@ -96,7 +96,8 @@ static int dict_connection_dict_init(struct dict_connection *conn) i_zero(&dict_set); dict_set.base_dir = dict_settings->base_dir; dict_set.event_parent = conn->conn.event; - if (dict_init_cache_get(conn->name, uri, &dict_set, &conn->dict, &error) < 0) { + if (dict_init_cache_get_legacy(conn->name, uri, &dict_set, + &conn->dict, &error) < 0) { /* dictionary initialization failed */ e_error(conn->conn.event, "Failed to initialize dictionary '%s': %s", conn->name, error); diff --git a/src/dict/dict-init-cache.c b/src/dict/dict-init-cache.c index 4247320a80..779b6b3a5a 100644 --- a/src/dict/dict-init-cache.c +++ b/src/dict/dict-init-cache.c @@ -75,9 +75,9 @@ static struct dict_init_cache_list *dict_init_cache_find(const char *dict_name) return match; } -int dict_init_cache_get(const char *dict_name, const char *uri, - const struct dict_legacy_settings *set, - struct dict **dict_r, const char **error_r) +int dict_init_cache_get_legacy(const char *dict_name, const char *uri, + const struct dict_legacy_settings *set, + struct dict **dict_r, const char **error_r) { struct dict_init_cache_list *match; int ret = 0; diff --git a/src/dict/dict-init-cache.h b/src/dict/dict-init-cache.h index c501a19f55..e66f5d331d 100644 --- a/src/dict/dict-init-cache.h +++ b/src/dict/dict-init-cache.h @@ -1,9 +1,9 @@ #ifndef DICT_INIT_CACHE_H #define DICT_INIT_CACHE_H -int dict_init_cache_get(const char *dict_name, const char *uri, - const struct dict_legacy_settings *set, - struct dict **dict_r, const char **error_r); +int dict_init_cache_get_legacy(const char *dict_name, const char *uri, + const struct dict_legacy_settings *set, + struct dict **dict_r, const char **error_r); void dict_init_cache_unref(struct dict **dict); void dict_init_cache_wait_all(void); -- 2.47.3