From: Aki Tuomi <aki.tuomi@dovecot.fi>
Date: Tue, 4 Sep 2018 06:31:25 +0000 (+0300)
Subject: global: Replace sql_db_cache_new with sql_db_cache_new2
X-Git-Tag: 2.3.4~94
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0dc7ed074898effc13da9648e88ed57d3dbbe263;p=thirdparty%2Fdovecot%2Fcore.git

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 08c74c5a13..b43773ab25 100644
--- 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 c0c6ad4c27..c87cdfb641 100644
--- 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 94bef74b16..1517f5f5da 100644
--- 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);