lib-dict: Remove dict_init_legacy()

diff --git a/src/lib-dict/dict-private.h b/src/lib-dict/dict-private.h
index 211b724888179a022f1dcee5d8a0361cb13dc5eb..f827ccde0b1b22c5cda1aded334ce130a4cacc1b 100644 (file)
--- a/src/lib-dict/dict-private.h
+++ b/src/lib-dict/dict-private.h
@@ -12,9 +12,6 @@ enum dict_driver_flags {
 };
 
 struct dict_vfuncs {
-       int (*init_legacy)(struct dict *dict_driver, const char *uri,
-                          const struct dict_legacy_settings *set,
-                          struct dict **dict_r, const char **error_r);
        int (*init)(const struct dict *dict_driver, struct event *event,
                    struct dict **dict_r, const char **error_r);
        void (*deinit)(struct dict *dict);

diff --git a/src/lib-dict/dict.c b/src/lib-dict/dict.c
index 38a6ecd23f0eb4a553081a2412b7f58b6f0a5eb7..503dbc243f6808bd008fb3eb45c7e0a7ff0e2ead 100644 (file)
--- a/src/lib-dict/dict.c
+++ b/src/lib-dict/dict.c
@@ -113,51 +113,6 @@ void dict_driver_unregister(struct dict *driver)
                array_free(&dict_drivers);
 }
 
-int dict_init_legacy(const char *uri, const struct dict_legacy_settings *set,
-                    struct dict **dict_r, const char **error_r)
-{
-       struct dict_legacy_settings set_dup = *set;
-       struct dict *dict;
-       const char *p, *name, *error;
-
-       p = strchr(uri, ':');
-       if (p == NULL) {
-               *error_r = t_strdup_printf("Dictionary URI is missing ':': %s",
-                                          uri);
-               return -1;
-       }
-
-       name = t_strdup_until(uri, p);
-       dict = dict_driver_lookup(name);
-       if (dict == NULL) {
-               *error_r = t_strdup_printf("Unknown dict module: %s", name);
-               return -1;
-       }
-       if (dict->v.init_legacy == NULL) {
-               *error_r = t_strdup_printf(
-                       "dict %s doesn't support legacy_init()", name);
-               return -1;
-       }
-       struct event *event = event_create(set->event_parent);
-       event_add_category(event, &event_category_dict);
-       event_add_str(event, "dict_driver", dict->name);
-       event_set_append_log_prefix(event, t_strdup_printf("dict(%s): ",
-                                   dict->name));
-       set_dup.event_parent = event;
-       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;
-       }
-       i_assert(*dict_r != NULL);
-       (*dict_r)->refcount++;
-       (*dict_r)->event = event;
-       e_debug(event_create_passthrough(event)->set_name("dict_created")->event(),
-               "dict created (uri=%s, base_dir=%s)", uri, set->base_dir);
-
-       return 0;
-}
-
 static bool dict_settings_check(void *_set, pool_t pool ATTR_UNUSED,
                                const char **error_r ATTR_UNUSED)
 {

diff --git a/src/lib-dict/dict.h b/src/lib-dict/dict.h
index 53a89f2f52f0d735a8fb812ac89a55eb1ae014c8..08da8c465800fcf56283151489f7c07ae1bb0158 100644 (file)
--- a/src/lib-dict/dict.h
+++ b/src/lib-dict/dict.h
@@ -31,12 +31,6 @@ enum dict_data_type {
        DICT_DATA_TYPE_LAST
 };
 
-struct dict_legacy_settings {
-       const char *base_dir;
-       /* set to parent event, if exists */
-       struct event *event_parent;
-};
-
 struct dict_settings {
        pool_t pool;
        const char *dict_name;
@@ -105,10 +99,6 @@ void dict_drivers_unregister_builtin(void);
 void dict_drivers_register_all(void);
 void dict_drivers_unregister_all(void);
 
-/* Open dictionary with given URI (type:data).
-   Returns 0 if ok, -1 if URI is invalid. */
-int dict_init_legacy(const char *uri, const struct dict_legacy_settings *set,
-                    struct dict **dict_r, const char **error_r);
 /* Initialize the dict by pulling settings automatically using the event.
    The event parameter is used as the parent event. Returns 1 if ok, 0 if
    dict_driver setting is empty (error_r is also set), -1 if settings lookup or