ISAR/rusqlite
3
0
Fork 0
mirror of https://github.com/isar/rusqlite.git synced 2025-10-23 09:18:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

Use decode_result_raw instead of check

Browse Source
This commit is contained in:
gwenn
2024-11-10 19:28:01 +01:00
parent 79723ef343
commit cd0fc4e4f3
3 changed files with 27 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/inner_connection.rs
View File

@@ -9,7 +9,9 @@ use std::sync::{Arc, Mutex};
use super::ffi;
use super::str_for_sqlite;
use super::{Connection, InterruptHandle, OpenFlags, PrepFlags, Result};
use crate::error::{error_from_handle, error_from_sqlite_code, error_with_offset, Error};
use crate::error::{
decode_result_raw, error_from_handle, error_from_sqlite_code, error_with_offset, Error,
};
use crate::raw_statement::RawStatement;
use crate::statement::Statement;
use crate::version_number;
@@ -134,16 +136,7 @@ impl InnerConnection {
#[inline]
pub fn decode_result(&self, code: c_int) -> Result<()> {
unsafe { Self::decode_result_raw(self.db(), code) }
}
#[inline]
unsafe fn decode_result_raw(db: *mut ffi::sqlite3, code: c_int) -> Result<()> {
if code == ffi::SQLITE_OK {
Ok(())
} else {
Err(error_from_handle(db, code))
}
unsafe { decode_result_raw(self.db(), code) }
}
pub fn close(&mut self) -> Result<()> {
@@ -165,7 +158,7 @@ impl InnerConnection {
let r = ffi::sqlite3_close(self.db);
// Need to use _raw because _guard has a reference out, and
// decode_result takes &mut self.
let r = Self::decode_result_raw(self.db, r);
let r = decode_result_raw(self.db, r);
if r.is_ok() {
*shared_handle = ptr::null_mut();
self.db = ptr::null_mut();