From: Timo Sirainen Date: Thu, 6 Apr 2023 19:57:13 +0000 (+0300) Subject: lib-dict, global: Rename dict_vfuncs.init() to init_legacy() X-Git-Tag: 2.4.0~2067 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9b385b208ee75cf68a2baa0e7ea402acadea0d52;p=thirdparty%2Fdovecot%2Fcore.git lib-dict, global: Rename dict_vfuncs.init() to init_legacy() --- diff --git a/src/lib-dict-backend/dict-cdb.c b/src/lib-dict-backend/dict-cdb.c index 66329a5ef3..df9a8e84d6 100644 --- a/src/lib-dict-backend/dict-cdb.c +++ b/src/lib-dict-backend/dict-cdb.c @@ -35,9 +35,9 @@ struct cdb_dict_iterate_context { static void cdb_dict_deinit(struct dict *_dict); static int -cdb_dict_init(struct dict *driver, const char *uri, - const struct dict_settings *set ATTR_UNUSED, - struct dict **dict_r, const char **error_r) +cdb_dict_init_legacy(struct dict *driver, const char *uri, + const struct dict_settings *set ATTR_UNUSED, + struct dict **dict_r, const char **error_r) { struct cdb_dict *dict; @@ -256,7 +256,7 @@ static int cdb_dict_iterate_deinit(struct dict_iterate_context *_ctx, struct dict dict_driver_cdb = { .name = "cdb", .v = { - .init = cdb_dict_init, + .init_legacy = cdb_dict_init_legacy, .deinit = cdb_dict_deinit, .lookup = cdb_dict_lookup, .iterate_init = cdb_dict_iterate_init, diff --git a/src/lib-dict-backend/dict-ldap.c b/src/lib-dict-backend/dict-ldap.c index 648a4f8f04..e690e75a66 100644 --- a/src/lib-dict-backend/dict-ldap.c +++ b/src/lib-dict-backend/dict-ldap.c @@ -233,9 +233,9 @@ ldap_dict_build_query(const struct dict_op_settings *set, } static -int ldap_dict_init(struct dict *dict_driver, const char *uri, - const struct dict_settings *set ATTR_UNUSED, - struct dict **dict_r, const char **error_r) +int ldap_dict_init_legacy(struct dict *dict_driver, const char *uri, + const struct dict_settings *set ATTR_UNUSED, + struct dict **dict_r, const char **error_r) { pool_t pool = pool_alloconly_create("ldap dict", 2048); struct ldap_dict *dict = p_new(pool, struct ldap_dict, 1); @@ -488,7 +488,7 @@ void ldap_dict_lookup_async(struct dict *dict, struct dict dict_driver_ldap = { .name = "ldap", .v = { - .init = ldap_dict_init, + .init_legacy = ldap_dict_init_legacy, .deinit = ldap_dict_deinit, .wait = ldap_dict_wait, .lookup = ldap_dict_lookup, diff --git a/src/lib-dict-backend/dict-sql.c b/src/lib-dict-backend/dict-sql.c index 04d4b8ffe9..c05c615b74 100644 --- a/src/lib-dict-backend/dict-sql.c +++ b/src/lib-dict-backend/dict-sql.c @@ -96,9 +96,9 @@ static void sql_dict_prev_inc_free(struct sql_dict_transaction_context *ctx); static void sql_dict_prev_set_free(struct sql_dict_transaction_context *ctx); static int -sql_dict_init(struct dict *driver, const char *uri, - const struct dict_settings *set, - struct dict **dict_r, const char **error_r) +sql_dict_init_legacy(struct dict *driver, const char *uri, + const struct dict_settings *set, + struct dict **dict_r, const char **error_r) { struct sql_settings sql_set; struct sql_dict *dict; @@ -1651,7 +1651,7 @@ static struct dict sql_dict = { .name = "sql", .flags = DICT_DRIVER_FLAG_SUPPORT_EXPIRE_SECS, .v = { - .init = sql_dict_init, + .init_legacy = sql_dict_init_legacy, .deinit = sql_dict_deinit, .wait = sql_dict_wait, .expire_scan = sql_dict_expire_scan, diff --git a/src/lib-dict-extra/dict-fs.c b/src/lib-dict-extra/dict-fs.c index 9ba9d0be1d..c2976f3d92 100644 --- a/src/lib-dict-extra/dict-fs.c +++ b/src/lib-dict-extra/dict-fs.c @@ -25,9 +25,9 @@ struct fs_dict_iterate_context { }; static int -fs_dict_init(struct dict *driver, const char *uri, - const struct dict_settings *set, - struct dict **dict_r, const char **error_r) +fs_dict_init_legacy(struct dict *driver, const char *uri, + const struct dict_settings *set, + struct dict **dict_r, const char **error_r) { struct fs_settings fs_set; struct fs *fs; @@ -324,7 +324,7 @@ fs_dict_transaction_commit(struct dict_transaction_context *_ctx, struct dict dict_driver_fs = { .name = "fs", .v = { - .init = fs_dict_init, + .init_legacy = fs_dict_init_legacy, .deinit = fs_dict_deinit, .lookup = fs_dict_lookup, .iterate_init = fs_dict_iterate_init, diff --git a/src/lib-dict/dict-client.c b/src/lib-dict/dict-client.c index ffd3b2a829..52eb094d73 100644 --- a/src/lib-dict/dict-client.c +++ b/src/lib-dict/dict-client.c @@ -702,9 +702,9 @@ static const struct connection_vfuncs dict_conn_vfuncs = { }; static int -client_dict_init(struct dict *driver, const char *uri, - const struct dict_settings *set, - struct dict **dict_r, const char **error_r) +client_dict_init_legacy(struct dict *driver, const char *uri, + const struct dict_settings *set, + struct dict **dict_r, const char **error_r) { struct ioloop *old_ioloop = current_ioloop; struct client_dict *dict; @@ -1513,7 +1513,7 @@ struct dict dict_driver_client = { .name = "proxy", .flags = DICT_DRIVER_FLAG_SUPPORT_EXPIRE_SECS, .v = { - .init = client_dict_init, + .init_legacy = client_dict_init_legacy, .deinit = client_dict_deinit, .wait = client_dict_wait, .lookup = client_dict_lookup, diff --git a/src/lib-dict/dict-fail.c b/src/lib-dict/dict-fail.c index 65c35c5cec..5d42ddce45 100644 --- a/src/lib-dict/dict-fail.c +++ b/src/lib-dict/dict-fail.c @@ -14,10 +14,11 @@ struct dict_transaction_context dict_transaction_unsupported = .dict = &dict_driver_fail, }; -static int dict_fail_init(struct dict *dict_driver ATTR_UNUSED, - const char *uri ATTR_UNUSED, - const struct dict_settings *set ATTR_UNUSED, - struct dict **dict_r ATTR_UNUSED, const char **error_r) +static int +dict_fail_init_legacy(struct dict *dict_driver ATTR_UNUSED, + const char *uri ATTR_UNUSED, + const struct dict_settings *set ATTR_UNUSED, + struct dict **dict_r ATTR_UNUSED, const char **error_r) { *error_r = "Unsupported operation (dict does not support this feature)"; return -1; @@ -115,7 +116,7 @@ static void dict_fail_set_timestamp(struct dict_transaction_context *ctx ATTR_UN struct dict dict_driver_fail = { .name = "fail", .v = { - .init = dict_fail_init, + .init_legacy = dict_fail_init_legacy, .deinit = dict_fail_deinit, .wait = dict_fail_wait, .lookup = dict_fail_lookup, diff --git a/src/lib-dict/dict-file.c b/src/lib-dict/dict-file.c index fe94a978a4..34e1e0c0a0 100644 --- a/src/lib-dict/dict-file.c +++ b/src/lib-dict/dict-file.c @@ -77,9 +77,9 @@ file_dict_ensure_path_home_dir(struct file_dict *dict, const char *home_dir, } static int -file_dict_init(struct dict *driver, const char *uri, - const struct dict_settings *set ATTR_UNUSED, - struct dict **dict_r, const char **error_r) +file_dict_init_legacy(struct dict *driver, const char *uri, + const struct dict_settings *set ATTR_UNUSED, + struct dict **dict_r, const char **error_r) { struct file_dict *dict; const char *p, *path; @@ -700,7 +700,7 @@ file_dict_transaction_commit(struct dict_transaction_context *_ctx, struct dict dict_driver_file = { .name = "file", .v = { - .init = file_dict_init, + .init_legacy = file_dict_init_legacy, .deinit = file_dict_deinit, .lookup = file_dict_lookup, .iterate_init = file_dict_iterate_init, diff --git a/src/lib-dict/dict-private.h b/src/lib-dict/dict-private.h index cfcb2246a1..ad9d2a3f0f 100644 --- a/src/lib-dict/dict-private.h +++ b/src/lib-dict/dict-private.h @@ -12,9 +12,9 @@ enum dict_driver_flags { }; struct dict_vfuncs { - int (*init)(struct dict *dict_driver, const char *uri, - const struct dict_settings *set, - struct dict **dict_r, const char **error_r); + int (*init_legacy)(struct dict *dict_driver, const char *uri, + const struct dict_settings *set, + struct dict **dict_r, const char **error_r); void (*deinit)(struct dict *dict); void (*wait)(struct dict *dict); int (*expire_scan)(struct dict *dict, const char **error_r); diff --git a/src/lib-dict/dict-redis.c b/src/lib-dict/dict-redis.c index 82dcf195e7..60e4b08475 100644 --- a/src/lib-dict/dict-redis.c +++ b/src/lib-dict/dict-redis.c @@ -367,9 +367,9 @@ static const char *redis_escape_username(const char *username) } static int -redis_dict_init(struct dict *driver, const char *uri, - const struct dict_settings *set, - struct dict **dict_r, const char **error_r) +redis_dict_init_legacy(struct dict *driver, const char *uri, + const struct dict_settings *set, + struct dict **dict_r, const char **error_r) { struct redis_dict *dict; struct ip_addr ip; @@ -851,7 +851,7 @@ struct dict dict_driver_redis = { .name = "redis", .flags = DICT_DRIVER_FLAG_SUPPORT_EXPIRE_SECS, .v = { - .init = redis_dict_init, + .init_legacy = redis_dict_init_legacy, .deinit = redis_dict_deinit, .wait = redis_dict_wait, .lookup = redis_dict_lookup, diff --git a/src/lib-dict/dict.c b/src/lib-dict/dict.c index 6cea97fb60..31f20faf03 100644 --- a/src/lib-dict/dict.c +++ b/src/lib-dict/dict.c @@ -113,7 +113,7 @@ int dict_init_legacy(const char *uri, const struct dict_settings *set, event_set_append_log_prefix(event, t_strdup_printf("dict(%s): ", dict->name)); set_dup.event_parent = event; - if (dict->v.init(dict, p+1, &set_dup, dict_r, &error) < 0) { + if (dict->v.init_legacy(dict, p+1, &set_dup, dict_r, &error) < 0) { *error_r = t_strdup_printf("dict %s: %s", name, error); event_unref(&event); return -1;