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 66329a5ef3d9f9a5d40ad0425bc949ae757e77ad..df9a8e84d64f929f1c90780313a2ca14fa10a3e8 100644 (file)
--- 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 648a4f8f043c09a5e4014b2c36522ab643a07d4a..e690e75a6678ea5bddb386312c55417ea4abd772 100644 (file)
--- 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 04d4b8ffe955015ec9f04ef258d2403521a290a6..c05c615b74b03b1f635a022604bcfe4445e18b2f 100644 (file)
--- 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 9ba9d0be1db48904f439a45627b043c4567a2ba2..c2976f3d92b0690c45df7fcd790c534ae053aecb 100644 (file)
--- 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 ffd3b2a829bb557e601e3441321ef51c7ce668eb..52eb094d738be5a8de52c1751f5dd20f49812b80 100644 (file)
--- 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 65c35c5cec9e67648bb1553daabbffdd1a692713..5d42ddce459accfdd9639c0ebea9514d67259298 100644 (file)
--- 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 fe94a978a40e9f63d798e9f6cee805a2f98655c2..34e1e0c0a0bca7c33f78fef54113eb5f2857c8f5 100644 (file)
--- 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 cfcb2246a115d89ac6e11429ae97a2de3b12498b..ad9d2a3f0f1e47d91e8e084294b2ae2440979bcf 100644 (file)
--- 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 82dcf195e783714e3b7cce34b05fa33dd2d475c7..60e4b084758de95ddd9914016bc539b5490bc316 100644 (file)
--- 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 6cea97fb60921c6f756d7bf0bdcd0578ee2f21e0..31f20faf033eeeaa1b7f1718a86aea72f992c5fd 100644 (file)
--- 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;