From: Timo Sirainen <timo.sirainen@open-xchange.com>
Date: Fri, 26 Jan 2024 21:54:40 +0000 (+0200)
Subject: lib-sql, global: Rename sql_init*() to sql_init_legacy*()
X-Git-Tag: 2.4.0~715
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d900b7e6fc0b10078b8bda78b8b93252d55e12dd;p=thirdparty%2Fdovecot%2Fcore.git

lib-sql, global: Rename sql_init*() to sql_init_legacy*()
---

diff --git a/src/auth/db-sql.c b/src/auth/db-sql.c
index 8a79ceae5a..7b10fddb4d 100644
--- a/src/auth/db-sql.c
+++ b/src/auth/db-sql.c
@@ -110,7 +110,7 @@ struct db_sql_connection *db_sql_init(const char *config_path, bool userdb)
 	set.driver = conn->set.driver;
 	set.connect_string = conn->set.connect;
 	set.event_parent = auth_event;
-	if (sql_init_full(&set, &conn->db, &error) < 0) {
+	if (sql_init_legacy_full(&set, &conn->db, &error) < 0) {
 		i_fatal("sql: %s", error);
 	}
 
diff --git a/src/lib-sql/sql-api.c b/src/lib-sql/sql-api.c
index d0d3334861..d87e171a2c 100644
--- a/src/lib-sql/sql-api.c
+++ b/src/lib-sql/sql-api.c
@@ -75,7 +75,8 @@ void sql_driver_unregister(const struct sql_db *driver)
 	}
 }
 
-struct sql_db *sql_init(const char *db_driver, const char *connect_string)
+struct sql_db *
+sql_init_legacy(const char *db_driver, const char *connect_string)
 {
 	const char *error;
 	struct sql_db *db;
@@ -84,13 +85,13 @@ struct sql_db *sql_init(const char *db_driver, const char *connect_string)
 		.connect_string = connect_string,
 	};
 
-	if (sql_init_full(&set, &db, &error) < 0)
+	if (sql_init_legacy_full(&set, &db, &error) < 0)
 		i_fatal("%s", error);
 	return db;
 }
 
-int sql_init_full(const struct sql_settings *set, struct sql_db **db_r,
-		  const char **error_r)
+int sql_init_legacy_full(const struct sql_settings *set, struct sql_db **db_r,
+			 const char **error_r)
 {
 	const struct sql_db *driver;
 	struct sql_db *db;
diff --git a/src/lib-sql/sql-api.h b/src/lib-sql/sql-api.h
index f5636180c8..2e3b919306 100644
--- a/src/lib-sql/sql-api.h
+++ b/src/lib-sql/sql-api.h
@@ -94,9 +94,10 @@ void sql_driver_unregister(const struct sql_db *driver);
 
 /* Initialize database connections. db_driver is the database driver name,
    eg. "mysql" or "pgsql". connect_string is driver-specific. */
-struct sql_db *sql_init(const char *db_driver, const char *connect_string);
-int sql_init_full(const struct sql_settings *set, struct sql_db **db_r,
-		  const char **error_r);
+struct sql_db *
+sql_init_legacy(const char *db_driver, const char *connect_string);
+int sql_init_legacy_full(const struct sql_settings *set, struct sql_db **db_r,
+			 const char **error_r);
 
 void sql_ref(struct sql_db *db);
 void sql_unref(struct sql_db **db);
diff --git a/src/lib-sql/sql-db-cache.c b/src/lib-sql/sql-db-cache.c
index b2fb9fb461..b960c4abcd 100644
--- a/src/lib-sql/sql-db-cache.c
+++ b/src/lib-sql/sql-db-cache.c
@@ -113,7 +113,7 @@ int sql_db_cache_new(struct sql_db_cache *cache, const struct sql_settings *set,
 	} else {
 		sql_db_cache_drop_oldest(cache);
 
-		if (sql_init_full(set, &db, error_r) < 0) {
+		if (sql_init_legacy_full(set, &db, error_r) < 0) {
 			i_free(key);
 			return -1;
 		}
diff --git a/src/lib-sql/test-sql-sqlite.c b/src/lib-sql/test-sql-sqlite.c
index 2923fc7794..780a8197e7 100644
--- a/src/lib-sql/test-sql-sqlite.c
+++ b/src/lib-sql/test-sql-sqlite.c
@@ -34,7 +34,7 @@ static void test_sql_sqlite(void)
 	sql_drivers_init_without_drivers();
 	driver_sqlite_init();
 
-	test_assert(sql_init_full(&set, &sql, &error) == 0 &&
+	test_assert(sql_init_legacy_full(&set, &sql, &error) == 0 &&
 		    sql != NULL &&
 		    error == NULL);
 	setup_database(sql);
diff --git a/src/lib-sql/test-sql.c b/src/lib-sql/test-sql.c
index 04db42b44a..85ed83cac8 100644
--- a/src/lib-sql/test-sql.c
+++ b/src/lib-sql/test-sql.c
@@ -17,7 +17,7 @@ static struct sql_db *setup_sql(void)
 	sql_drivers_init_without_drivers();
 	sql_driver_test_register();
 
-	test_assert(sql_init_full(&set, &sql, &error) == 0 &&
+	test_assert(sql_init_legacy_full(&set, &sql, &error) == 0 &&
 		    sql != NULL &&
 		    error == NULL);