global: Replace sql_db_cache_new with sql_db_cache_new2

diff --git a/src/lib-dict-backend/dict-sql.c b/src/lib-dict-backend/dict-sql.c
index 08c74c5a13fc9aeefef31c2db52ff5b27c4b8d47..b43773ab25b0104cd34c77fe7be73f3a71197456 100644 (file)
--- a/src/lib-dict-backend/dict-sql.c
+++ b/src/lib-dict-backend/dict-sql.c
@@ -108,7 +108,7 @@ sql_dict_init(struct dict *driver, const char *uri,
        /* currently pgsql and sqlite don't support "ON DUPLICATE KEY" */
        dict->has_on_duplicate_key = strcmp(driver->name, "mysql") == 0;
 
-       if (sql_db_cache_new2(dict_sql_db_cache, &sql_set, &dict->db, error_r) < 0) {
+       if (sql_db_cache_new(dict_sql_db_cache, &sql_set, &dict->db, error_r) < 0) {
                pool_unref(&pool);
                return -1;
        }

diff --git a/src/lib-sql/sql-db-cache.c b/src/lib-sql/sql-db-cache.c
index c0c6ad4c273263489ff4c13414c7bdaca535e9dc..c87cdfb6411206f27db556c0a36d026f64668aa1 100644 (file)
--- a/src/lib-sql/sql-db-cache.c
+++ b/src/lib-sql/sql-db-cache.c
@@ -88,8 +88,8 @@ static void sql_db_cache_drop_oldest(struct sql_db_cache *cache)
                sql_db_cache_free_tail(cache);
 }
 
-int sql_db_cache_new2(struct sql_db_cache *cache, const struct sql_settings *set,
-                     struct sql_db **db_r, const char **error_r)
+int sql_db_cache_new(struct sql_db_cache *cache, const struct sql_settings *set,
+                    struct sql_db **db_r, const char **error_r)
 {
        struct sql_db_cache_context *ctx;
        struct sql_db *db;
@@ -127,23 +127,6 @@ int sql_db_cache_new2(struct sql_db_cache *cache, const struct sql_settings *set
        return 0;
 }
 
-struct sql_db *
-sql_db_cache_new(struct sql_db_cache *cache,
-                const char *db_driver, const char *connect_string)
-{
-       const char *error;
-       struct sql_db *db;
-       struct sql_settings set = {
-               .driver = db_driver,
-               .connect_string = connect_string,
-       };
-
-       if (sql_db_cache_new2(cache, &set, &db, &error) < 0)
-               i_fatal("%s", error);
-
-       return db;
-}
-
 struct sql_db_cache *sql_db_cache_init(unsigned int max_unused_connections)
 {
        struct sql_db_cache *cache;

diff --git a/src/lib-sql/sql-db-cache.h b/src/lib-sql/sql-db-cache.h
index 94bef74b168f9ebd9e2e60f43de2ea6ae1029d9d..1517f5f5da959479c0d1e59b6f4a00e95e6ef73e 100644 (file)
--- a/src/lib-sql/sql-db-cache.h
+++ b/src/lib-sql/sql-db-cache.h
@@ -4,10 +4,7 @@
 struct sql_db_cache;
 
 /* Like sql_init(), but use a connection pool. */
-struct sql_db *
-sql_db_cache_new(struct sql_db_cache *cache,
-                const char *db_driver, const char *connect_string);
-int sql_db_cache_new2(struct sql_db_cache *cache, const struct sql_settings *set,
+int sql_db_cache_new(struct sql_db_cache *cache, const struct sql_settings *set,
                      struct sql_db **db_r, const char **error_r);
 
 struct sql_db_cache *sql_db_cache_init(unsigned int max_unused_connections);