From 6901b7bcd6f16c10e038311396cd8b8df36c7151 Mon Sep 17 00:00:00 2001 From: Pekka Enberg Date: Mon, 16 Jun 2025 09:15:40 +0300 Subject: [PATCH] sqlite3: Clean up sqlite3_errmsg() function --- sqlite3/src/lib.rs | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/sqlite3/src/lib.rs b/sqlite3/src/lib.rs index b209a74a0..2529e306c 100644 --- a/sqlite3/src/lib.rs +++ b/sqlite3/src/lib.rs @@ -942,32 +942,31 @@ pub unsafe extern "C" fn sqlite3_create_window_function( stub!(); } +/// Returns the error message for the most recent failed API call to connection. #[no_mangle] -pub unsafe extern "C" fn sqlite3_errmsg(_db: *mut sqlite3) -> *const ffi::c_char { - if _db.is_null() { +pub unsafe extern "C" fn sqlite3_errmsg(db: *mut sqlite3) -> *const ffi::c_char { + if db.is_null() { return sqlite3_errstr(SQLITE_NOMEM); } - if !sqlite3_safety_check_sick_or_ok(&*_db) { + let db: &mut sqlite3 = &mut *db; + if !sqlite3_safety_check_sick_or_ok(db) { return sqlite3_errstr(SQLITE_MISUSE); } - if (*_db).malloc_failed { + if db.malloc_failed { return sqlite3_errstr(SQLITE_NOMEM); } - - let err_msg = if (*_db).err_code != SQLITE_OK { - if !(*_db).p_err.is_null() { - (*_db).p_err as *const ffi::c_char + let err_msg = if db.err_code != SQLITE_OK { + if !db.p_err.is_null() { + db.p_err as *const ffi::c_char } else { std::ptr::null() } } else { std::ptr::null() }; - if err_msg.is_null() { - return sqlite3_errstr((*_db).err_code); + return sqlite3_errstr(db.err_code); } - err_msg }