From aafd90a808bdfca8c61f709728c48cbe712dd97d Mon Sep 17 00:00:00 2001 From: Aki Tuomi Date: Thu, 16 Sep 2021 10:35:57 +0300 Subject: [PATCH] lib-sql: driver-sqlite - Move connect_string parsing to a function Simplifies next change --- src/lib-sql/driver-sqlite.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/src/lib-sql/driver-sqlite.c b/src/lib-sql/driver-sqlite.c index e05ed1843d..4249a53058 100644 --- a/src/lib-sql/driver-sqlite.c +++ b/src/lib-sql/driver-sqlite.c @@ -74,8 +74,16 @@ static void driver_sqlite_disconnect(struct sql_db *_db) db->sqlite = NULL; } +static int driver_sqlite_parse_connect_string(struct sqlite_db *db, + const char *connect_string, + const char **error_r ATTR_UNUSED) +{ + db->dbfile = p_strdup(db->pool, connect_string); + return 0; +} + static int driver_sqlite_init_full_v(const struct sql_settings *set, struct sql_db **db_r, - const char **error_r ATTR_UNUSED) + const char **error_r) { struct sqlite_db *db; pool_t pool; @@ -84,7 +92,10 @@ static int driver_sqlite_init_full_v(const struct sql_settings *set, struct sql_ db = p_new(pool, struct sqlite_db, 1); db->pool = pool; db->api = driver_sqlite_db; - db->dbfile = p_strdup(db->pool, set->connect_string); + if (driver_sqlite_parse_connect_string(db, set->connect_string, error_r) < 0) { + pool_unref(&db->pool); + return -1; + } db->connected = FALSE; db->api.event = event_create(set->event_parent); event_add_category(db->api.event, &event_category_sqlite); -- 2.47.3