From 3a37f25819046ed3e27bccb13b76205b46a4f33e Mon Sep 17 00:00:00 2001 From: Timo Sirainen Date: Fri, 26 Jan 2024 23:58:15 +0200 Subject: [PATCH] lib-sql, global: Rename struct sql_settings to sql_legacy_settings --- src/auth/db-sql.c | 2 +- src/lib-dict-backend/dict-sql.c | 2 +- src/lib-sql/driver-cassandra.c | 2 +- src/lib-sql/driver-mysql.c | 2 +- src/lib-sql/driver-pgsql.c | 2 +- src/lib-sql/driver-sqlite.c | 4 ++-- src/lib-sql/driver-sqlpool.c | 5 +++-- src/lib-sql/sql-api-private.h | 5 +++-- src/lib-sql/sql-api.c | 5 +++-- src/lib-sql/sql-api.h | 6 +++--- src/lib-sql/sql-db-cache.c | 3 ++- src/lib-sql/sql-db-cache.h | 3 ++- src/lib-sql/test-sql-sqlite.c | 2 +- src/lib-sql/test-sql.c | 2 +- 14 files changed, 25 insertions(+), 20 deletions(-) diff --git a/src/auth/db-sql.c b/src/auth/db-sql.c index 7b10fddb4d..e8c9205015 100644 --- a/src/auth/db-sql.c +++ b/src/auth/db-sql.c @@ -62,7 +62,7 @@ static const char *parse_setting(const char *key, const char *value, struct db_sql_connection *db_sql_init(const char *config_path, bool userdb) { struct db_sql_connection *conn; - struct sql_settings set; + struct sql_legacy_settings set; const char *error; pool_t pool; diff --git a/src/lib-dict-backend/dict-sql.c b/src/lib-dict-backend/dict-sql.c index 7d3d5c4145..fc6b3b5853 100644 --- a/src/lib-dict-backend/dict-sql.c +++ b/src/lib-dict-backend/dict-sql.c @@ -100,7 +100,7 @@ sql_dict_init_legacy(struct dict *driver, const char *uri, const struct dict_legacy_settings *set, struct dict **dict_r, const char **error_r) { - struct sql_settings sql_set; + struct sql_legacy_settings sql_set; struct sql_dict *dict; pool_t pool; diff --git a/src/lib-sql/driver-cassandra.c b/src/lib-sql/driver-cassandra.c index 9de35f4b4d..259d23eec1 100644 --- a/src/lib-sql/driver-cassandra.c +++ b/src/lib-sql/driver-cassandra.c @@ -1045,7 +1045,7 @@ static int driver_cassandra_init_ssl(struct cassandra_db *db, const char **error return 0; } -static int driver_cassandra_init_full_v(const struct sql_settings *set, +static int driver_cassandra_init_full_v(const struct sql_legacy_settings *set, struct sql_db **db_r, const char **error_r) { diff --git a/src/lib-sql/driver-mysql.c b/src/lib-sql/driver-mysql.c index b226405c75..9aff15fabd 100644 --- a/src/lib-sql/driver-mysql.c +++ b/src/lib-sql/driver-mysql.c @@ -281,7 +281,7 @@ static int driver_mysql_parse_connect_string(struct mysql_db *db, return 0; } -static int driver_mysql_init_full_v(const struct sql_settings *set, +static int driver_mysql_init_full_v(const struct sql_legacy_settings *set, struct sql_db **db_r, const char **error_r) { struct mysql_db *db; diff --git a/src/lib-sql/driver-pgsql.c b/src/lib-sql/driver-pgsql.c index 35a4bdb10d..dd6beeca10 100644 --- a/src/lib-sql/driver-pgsql.c +++ b/src/lib-sql/driver-pgsql.c @@ -331,7 +331,7 @@ static enum sql_db_flags driver_pgsql_get_flags(struct sql_db *db) return db->flags; } -static int driver_pgsql_init_full_v(const struct sql_settings *set, +static int driver_pgsql_init_full_v(const struct sql_legacy_settings *set, struct sql_db **db_r, const char **error_r ATTR_UNUSED) { struct pgsql_db *db; diff --git a/src/lib-sql/driver-sqlite.c b/src/lib-sql/driver-sqlite.c index de53b977d9..54ee5f1bc2 100644 --- a/src/lib-sql/driver-sqlite.c +++ b/src/lib-sql/driver-sqlite.c @@ -156,8 +156,8 @@ static int driver_sqlite_parse_connect_string(struct sqlite_db *db, return 0; } -static int driver_sqlite_init_full_v(const struct sql_settings *set, struct sql_db **db_r, - const char **error_r) +static int driver_sqlite_init_full_v(const struct sql_legacy_settings *set, + struct sql_db **db_r, const char **error_r) { struct sqlite_db *db; pool_t pool; diff --git a/src/lib-sql/driver-sqlpool.c b/src/lib-sql/driver-sqlpool.c index 85456b2c0b..65f23b4dbc 100644 --- a/src/lib-sql/driver-sqlpool.c +++ b/src/lib-sql/driver-sqlpool.c @@ -285,7 +285,7 @@ sqlpool_add_connection(struct sqlpool_db *db, struct sqlpool_host *host, if (db->driver->v.init_legacy_full == NULL) { conndb = db->driver->v.init_legacy(host->connect_string); } else { - struct sql_settings set = { + struct sql_legacy_settings set = { .connect_string = host->connect_string, .event_parent = event_get_parent(db->api.event), }; @@ -524,7 +524,8 @@ static void sqlpool_add_all_once(struct sqlpool_db *db) } } -int driver_sqlpool_init_full(const struct sql_settings *set, const struct sql_db *driver, +int driver_sqlpool_init_full(const struct sql_legacy_settings *set, + const struct sql_db *driver, struct sql_db **db_r, const char **error_r) { struct sqlpool_db *db; diff --git a/src/lib-sql/sql-api-private.h b/src/lib-sql/sql-api-private.h index 1326381775..b93727fcd9 100644 --- a/src/lib-sql/sql-api-private.h +++ b/src/lib-sql/sql-api-private.h @@ -66,7 +66,7 @@ struct sql_transaction_query { struct sql_db_vfuncs { struct sql_db *(*init_legacy)(const char *connect_string); - int (*init_legacy_full)(const struct sql_settings *set, + int (*init_legacy_full)(const struct sql_legacy_settings *set, struct sql_db **db_r, const char **error); void (*deinit)(struct sql_db *db); void (*unref)(struct sql_db *db); @@ -251,7 +251,8 @@ extern struct sql_result sql_not_connected_result; void sql_init_common(struct sql_db *db); struct sql_db * driver_sqlpool_init(const char *connect_string, const struct sql_db *driver); -int driver_sqlpool_init_full(const struct sql_settings *set, const struct sql_db *driver, +int driver_sqlpool_init_full(const struct sql_legacy_settings *set, + const struct sql_db *driver, struct sql_db **db_r, const char **error_r); void sql_db_set_state(struct sql_db *db, enum sql_db_state state); diff --git a/src/lib-sql/sql-api.c b/src/lib-sql/sql-api.c index 241bf61de1..acc3186b43 100644 --- a/src/lib-sql/sql-api.c +++ b/src/lib-sql/sql-api.c @@ -80,7 +80,7 @@ sql_init_legacy(const char *db_driver, const char *connect_string) { const char *error; struct sql_db *db; - struct sql_settings set = { + struct sql_legacy_settings set = { .driver = db_driver, .connect_string = connect_string, }; @@ -90,7 +90,8 @@ sql_init_legacy(const char *db_driver, const char *connect_string) return db; } -int sql_init_legacy_full(const struct sql_settings *set, struct sql_db **db_r, +int sql_init_legacy_full(const struct sql_legacy_settings *set, + struct sql_db **db_r, const char **error_r) { const struct sql_db *driver; diff --git a/src/lib-sql/sql-api.h b/src/lib-sql/sql-api.h index 2e3b919306..6ec6d0fb59 100644 --- a/src/lib-sql/sql-api.h +++ b/src/lib-sql/sql-api.h @@ -77,7 +77,7 @@ struct sql_commit_result { enum sql_result_error_type error_type; }; -struct sql_settings { +struct sql_legacy_settings { const char *driver; const char *connect_string; struct event *event_parent; @@ -96,8 +96,8 @@ void sql_driver_unregister(const struct sql_db *driver); eg. "mysql" or "pgsql". connect_string is driver-specific. */ 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); +int sql_init_legacy_full(const struct sql_legacy_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 b960c4abcd..b1351cf5e7 100644 --- a/src/lib-sql/sql-db-cache.c +++ b/src/lib-sql/sql-db-cache.c @@ -94,7 +94,8 @@ static void sql_db_cache_drop_oldest(struct sql_db_cache *cache) sql_db_cache_free_tail(cache); } -int sql_db_cache_new(struct sql_db_cache *cache, const struct sql_settings *set, +int sql_db_cache_new(struct sql_db_cache *cache, + const struct sql_legacy_settings *set, struct sql_db **db_r, const char **error_r) { struct sql_db_cache_context *ctx; diff --git a/src/lib-sql/sql-db-cache.h b/src/lib-sql/sql-db-cache.h index 1517f5f5da..9cdea73911 100644 --- a/src/lib-sql/sql-db-cache.h +++ b/src/lib-sql/sql-db-cache.h @@ -4,7 +4,8 @@ struct sql_db_cache; /* Like sql_init(), but use a connection pool. */ -int sql_db_cache_new(struct sql_db_cache *cache, const struct sql_settings *set, +int sql_db_cache_new(struct sql_db_cache *cache, + const struct sql_legacy_settings *set, struct sql_db **db_r, const char **error_r); struct sql_db_cache *sql_db_cache_init(unsigned int max_unused_connections); diff --git a/src/lib-sql/test-sql-sqlite.c b/src/lib-sql/test-sql-sqlite.c index 780a8197e7..c47180c144 100644 --- a/src/lib-sql/test-sql-sqlite.c +++ b/src/lib-sql/test-sql-sqlite.c @@ -24,7 +24,7 @@ static void test_sql_sqlite(void) { test_begin("test sql api"); - const struct sql_settings set = { + const struct sql_legacy_settings set = { .driver = "sqlite", .connect_string = "test-database.db journal_mode=wal", }; diff --git a/src/lib-sql/test-sql.c b/src/lib-sql/test-sql.c index 85ed83cac8..cbb4d3893a 100644 --- a/src/lib-sql/test-sql.c +++ b/src/lib-sql/test-sql.c @@ -7,7 +7,7 @@ static struct sql_db *setup_sql(void) { - const struct sql_settings set = { + const struct sql_legacy_settings set = { .driver = "sqlite", .connect_string = "", }; -- 2.47.3