diff --git a/src/lib.rs b/src/lib.rs index c839b8f..7572908 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -364,7 +364,7 @@ impl DatabaseName<'_> { fn as_cstring(&self) -> Result { use self::DatabaseName::{Attached, Main, Temp}; match *self { - Main => str_to_cstring("main"), + Main => str_to_cstring("main"), // TODO C-string literals Temp => str_to_cstring("temp"), Attached(s) => str_to_cstring(s), } @@ -1908,7 +1908,7 @@ mod test { #[test] fn test_from_handle_owned() -> Result<()> { let mut handle: *mut ffi::sqlite3 = std::ptr::null_mut(); - let r = unsafe { ffi::sqlite3_open(":memory:\0".as_ptr() as *const c_char, &mut handle) }; + let r = unsafe { ffi::sqlite3_open(c":memory:".as_ptr(), &mut handle) }; assert_eq!(r, ffi::SQLITE_OK); let db = unsafe { Connection::from_handle_owned(handle) }?; db.execute_batch("PRAGMA VACUUM")?; diff --git a/src/vtab/array.rs b/src/vtab/array.rs index ca54b24..004d91a 100644 --- a/src/vtab/array.rs +++ b/src/vtab/array.rs @@ -40,7 +40,7 @@ use crate::{Connection, Result}; // http://sqlite.org/bindptr.html -pub(crate) const ARRAY_TYPE: *const c_char = (b"rarray\0" as *const u8).cast::(); +pub(crate) const ARRAY_TYPE: *const c_char = c"rarray".as_ptr(); pub(crate) unsafe extern "C" fn free_array(p: *mut c_void) { drop(Rc::from_raw(p as *const Vec));