From 89c5101293858926063a89fd3d3ab3bccafb63b1 Mon Sep 17 00:00:00 2001 From: Aki Tuomi Date: Mon, 20 Oct 2025 09:42:08 +0300 Subject: [PATCH] lib-sql: driver-sqlite - Use sqlite3_errstr() This allows looking up error for the rc we are interested. --- src/lib-sql/driver-sqlite.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/lib-sql/driver-sqlite.c b/src/lib-sql/driver-sqlite.c index 67913eabcc..65783f839a 100644 --- a/src/lib-sql/driver-sqlite.c +++ b/src/lib-sql/driver-sqlite.c @@ -150,11 +150,11 @@ static int driver_sqlite_connect(struct sql_db *_db) break; case SQLITE_NOMEM: i_fatal_status(FATAL_OUTOFMEM, "open(%s) failed: %s", - db->set->path, sqlite3_errmsg(db->sqlite)); + db->set->path, sqlite3_errstr(db->connect_rc)); default: i_free(_db->last_connect_error); _db->last_connect_error = i_strdup_printf("open(%s) failed: %s", db->set->path, - sqlite3_errmsg(db->sqlite)); + sqlite3_errstr(db->connect_rc)); e_error(_db->event, "%s", _db->last_connect_error); break; } @@ -391,8 +391,6 @@ static void driver_sqlite_result_free(struct sql_result *_result) { struct sqlite_result *result = container_of(_result, struct sqlite_result, api); - struct sqlite_db *db = - container_of(result->api.db, struct sqlite_db, api); int rc; if (_result->callback) @@ -402,10 +400,10 @@ static void driver_sqlite_result_free(struct sql_result *_result) rc = sqlite3_finalize(result->stmt); if (rc == SQLITE_NOMEM) { i_fatal_status(FATAL_OUTOFMEM, "finalize failed: %s (%d)", - sqlite3_errmsg(db->sqlite), rc); + sqlite3_errstr(rc), rc); } else if (rc != SQLITE_OK) { e_warning(_result->event, "finalize failed: %s (%d)", - sqlite3_errmsg(db->sqlite), rc); + sqlite3_errstr(rc), rc); } i_free(result->row); } -- 2.47.3