lib-sql: Rename sql_db_vfuncs.init*() to init_legacy*()

diff --git a/src/lib-sql/driver-cassandra.c b/src/lib-sql/driver-cassandra.c
index a505f80b30a163ef022c447f31761c089c9aec1e..9de35f4b4d371d65e3f237eae85532e392b9b93f 100644 (file)
--- a/src/lib-sql/driver-cassandra.c
+++ b/src/lib-sql/driver-cassandra.c
@@ -2871,7 +2871,7 @@ const struct sql_db driver_cassandra_db = {
        .flags = SQL_DB_FLAG_PREP_STATEMENTS,
 
        .v = {
-               .init_full = driver_cassandra_init_full_v,
+               .init_legacy_full = driver_cassandra_init_full_v,
                .deinit = driver_cassandra_deinit_v,
                .connect = driver_cassandra_connect,
                .disconnect = driver_cassandra_disconnect,

diff --git a/src/lib-sql/driver-mysql.c b/src/lib-sql/driver-mysql.c
index 19bbf21c9c6b9a83c478bfb20e50f01d16982870..b226405c7593f9f91feebb5e0818b0335fce05dd 100644 (file)
--- a/src/lib-sql/driver-mysql.c
+++ b/src/lib-sql/driver-mysql.c
@@ -778,7 +778,7 @@ const struct sql_db driver_mysql_db = {
                 SQL_DB_FLAG_ON_DUPLICATE_KEY,
 
        .v = {
-               .init_full = driver_mysql_init_full_v,
+               .init_legacy_full = driver_mysql_init_full_v,
                .deinit = driver_mysql_deinit_v,
                .connect = driver_mysql_connect,
                .disconnect = driver_mysql_disconnect,

diff --git a/src/lib-sql/driver-pgsql.c b/src/lib-sql/driver-pgsql.c
index 95b5cb9a048556ed0eedaa445854f42e96e10fce..35a4bdb10d7dddee8229808390a67d9a5b8c1349 100644 (file)
--- a/src/lib-sql/driver-pgsql.c
+++ b/src/lib-sql/driver-pgsql.c
@@ -1311,7 +1311,7 @@ const struct sql_db driver_pgsql_db = {
 
        .v = {
                .get_flags = driver_pgsql_get_flags,
-               .init_full = driver_pgsql_init_full_v,
+               .init_legacy_full = driver_pgsql_init_full_v,
                .deinit = driver_pgsql_deinit_v,
                .connect = driver_pgsql_connect,
                .disconnect = driver_pgsql_disconnect,

diff --git a/src/lib-sql/driver-sqlite.c b/src/lib-sql/driver-sqlite.c
index 6a8439401e0dcb569c61e83f8a864abb1f965653..de53b977d964b03d9a757e683efa7a591718de9e 100644 (file)
--- a/src/lib-sql/driver-sqlite.c
+++ b/src/lib-sql/driver-sqlite.c
@@ -647,7 +647,7 @@ const struct sql_db driver_sqlite_db = {
                SQL_DB_FLAG_BLOCKING,
 
        .v = {
-               .init_full = driver_sqlite_init_full_v,
+               .init_legacy_full = driver_sqlite_init_full_v,
                .deinit = driver_sqlite_deinit_v,
                .connect = driver_sqlite_connect,
                .disconnect = driver_sqlite_disconnect,

diff --git a/src/lib-sql/driver-sqlpool.c b/src/lib-sql/driver-sqlpool.c
index a2451b66ab36c241c1558935478fb87e7005b317..85456b2c0b6f5cd6997ed3e38410cf0075e674da 100644 (file)
--- a/src/lib-sql/driver-sqlpool.c
+++ b/src/lib-sql/driver-sqlpool.c
@@ -282,14 +282,14 @@ sqlpool_add_connection(struct sqlpool_db *db, struct sqlpool_host *host,
 
        e_debug(db->api.event, "Creating new connection");
 
-       if (db->driver->v.init_full == NULL) {
-               conndb = db->driver->v.init(host->connect_string);
+       if (db->driver->v.init_legacy_full == NULL) {
+               conndb = db->driver->v.init_legacy(host->connect_string);
        } else {
                struct sql_settings set = {
                        .connect_string = host->connect_string,
                        .event_parent = event_get_parent(db->api.event),
                };
-               ret = db->driver->v.init_full(&set, &conndb, &error);
+               ret = db->driver->v.init_legacy_full(&set, &conndb, &error);
        }
        if (ret < 0)
                i_fatal("sqlpool: %s", error);

diff --git a/src/lib-sql/driver-test.c b/src/lib-sql/driver-test.c
index 9d4db76ae1e164599d04656d67cf40a574d7f23c..f64583a151a7fbc8f5234ea260871c0f7ec1f761 100644 (file)
--- a/src/lib-sql/driver-test.c
+++ b/src/lib-sql/driver-test.c
@@ -88,7 +88,7 @@ const struct sql_db driver_test_mysql_db = {
        .flags = SQL_DB_FLAG_BLOCKING | SQL_DB_FLAG_ON_DUPLICATE_KEY,
 
        .v = {
-               .init = driver_test_mysql_init,
+               .init_legacy = driver_test_mysql_init,
                .deinit = driver_test_deinit,
                .connect = driver_test_connect,
                .disconnect = driver_test_disconnect,
@@ -111,7 +111,7 @@ const struct sql_db driver_test_cassandra_db = {
        .name = "cassandra",
 
        .v = {
-               .init = driver_test_cassandra_init,
+               .init_legacy = driver_test_cassandra_init,
                .deinit = driver_test_deinit,
                .connect = driver_test_connect,
                .disconnect = driver_test_disconnect,
@@ -135,7 +135,7 @@ const struct sql_db driver_test_sqlite_db = {
        .flags = SQL_DB_FLAG_ON_CONFLICT_DO | SQL_DB_FLAG_BLOCKING,
 
        .v = {
-               .init = driver_test_sqlite_init,
+               .init_legacy = driver_test_sqlite_init,
                .deinit = driver_test_deinit,
                .connect = driver_test_connect,
                .disconnect = driver_test_disconnect,

diff --git a/src/lib-sql/sql-api-private.h b/src/lib-sql/sql-api-private.h
index ca6da82099ca41d928623370ff0c0179ca7a71c0..13263817750592229a49a669785397bc5cd12b03 100644 (file)
--- a/src/lib-sql/sql-api-private.h
+++ b/src/lib-sql/sql-api-private.h
@@ -65,9 +65,9 @@ struct sql_transaction_query {
 };
 
 struct sql_db_vfuncs {
-       struct sql_db *(*init)(const char *connect_string);
-       int (*init_full)(const struct sql_settings *set, struct sql_db **db_r,
-                        const char **error);
+       struct sql_db *(*init_legacy)(const char *connect_string);
+       int (*init_legacy_full)(const struct sql_settings *set,
+                               struct sql_db **db_r, const char **error);
        void (*deinit)(struct sql_db *db);
        void (*unref)(struct sql_db *db);
        void (*wait) (struct sql_db *db);

diff --git a/src/lib-sql/sql-api.c b/src/lib-sql/sql-api.c
index d87e171a2cfd3680fbcb13a836d6613814a643e5..241bf61de1b31604eb7d7d610d5a9fe7c506c053 100644 (file)
--- a/src/lib-sql/sql-api.c
+++ b/src/lib-sql/sql-api.c
@@ -106,10 +106,10 @@ int sql_init_legacy_full(const struct sql_settings *set, struct sql_db **db_r,
        }
 
        if ((driver->flags & SQL_DB_FLAG_POOLED) == 0) {
-               if (driver->v.init_full == NULL) {
-                       db = driver->v.init(set->connect_string);
+               if (driver->v.init_legacy_full == NULL) {
+                       db = driver->v.init_legacy(set->connect_string);
                } else
-                       ret = driver->v.init_full(set, &db, error_r);
+                       ret = driver->v.init_legacy_full(set, &db, error_r);
        } else
                ret = driver_sqlpool_init_full(set, driver, &db, error_r);