ISAR/rusqlite
3
0
Fork 0
mirror of https://github.com/isar/rusqlite.git synced 2025-10-17 07:52:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix compilation errors

Browse Source
This commit is contained in:
gwenn
2020-02-09 12:08:25 +01:00
parent 9e17a0b28e
commit 4d58a43b38
2 changed files with 23 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/inner_connection.rs
View File

@@ -59,7 +59,11 @@ impl InnerConnection {
}
}
pub fn open_with_flags(c_path: &CString, flags: OpenFlags, vfs: Option(&CString)) -> Result<InnerConnection> {
pub fn open_with_flags(
c_path: &CString,
flags: OpenFlags,
vfs: Option<&CString>,
) -> Result<InnerConnection> {
#[cfg(not(feature = "bundled"))]
ensure_valid_sqlite_version();
ensure_safe_sqlite_threading_mode()?;
@@ -79,15 +83,14 @@ impl InnerConnection {
));
}
z_vfs = match(vfs) {
let z_vfs = match vfs {
Some(c_vfs) => c_vfs.as_ptr(),
None => ptr::null()
}
None => ptr::null(),
};
unsafe {
let mut db = MaybeUninit::uninit();
let r =
ffi::sqlite3_open_v2(c_path.as_ptr(), db.as_mut_ptr(), flags.bits(), z_vfs);
let r = ffi::sqlite3_open_v2(c_path.as_ptr(), db.as_mut_ptr(), flags.bits(), z_vfs);
let db: *mut ffi::sqlite3 = db.assume_init();
if r != ffi::SQLITE_OK {
let e = if db.is_null() {