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

Use SmallCString in most places

Browse Source
This commit is contained in:
Thom Chiovoloni
2020-04-14 02:04:19 -07:00
committed by Thom Chiovoloni
parent 552416039e
commit ac30e169ae
3 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/inner_connection.rs
View File

@@ -1,4 +1,4 @@
use std::ffi::CString;
use std::ffi::CStr;
use std::os::raw::{c_char, c_int};
#[cfg(feature = "load_extension")]
use std::path::Path;
@@ -8,7 +8,7 @@ use std::sync::atomic::{AtomicBool, Ordering};
use std::sync::{Arc, Mutex};
use super::ffi;
use super::{str_for_sqlite, str_to_cstring};
use super::str_for_sqlite;
use super::{Connection, InterruptHandle, OpenFlags, Result};
use crate::error::{error_from_handle, error_from_sqlite_code, Error};
use crate::raw_statement::RawStatement;
@@ -51,9 +51,9 @@ impl InnerConnection {
}
pub fn open_with_flags(
c_path: &CString,
c_path: &CStr,
flags: OpenFlags,
vfs: Option<&CString>,
vfs: Option<&CStr>,
) -> Result<InnerConnection> {
#[cfg(not(feature = "bundled"))]
ensure_valid_sqlite_version();
@@ -171,7 +171,8 @@ impl InnerConnection {
}
pub fn execute_batch(&mut self, sql: &str) -> Result<()> {
let c_sql = str_to_cstring(sql)?;
// use CString instead of SmallCString because it's probably big.
let c_sql = std::ffi::CString::new(sql)?;
unsafe {
let r = ffi::sqlite3_exec(
self.db(),
@@ -196,7 +197,7 @@ impl InnerConnection {
unsafe {
let mut errmsg: *mut c_char = ptr::null_mut();
let r = if let Some(entry_point) = entry_point {
let c_entry = str_to_cstring(entry_point)?;
let c_entry = crate::str_to_cstring(entry_point)?;
ffi::sqlite3_load_extension(
self.db,
dylib_str.as_ptr(),