ISAR/rusqlite
3
0
Fork 0
mirror of https://github.com/isar/rusqlite.git synced 2024-11-26 11:31:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

Due to rust monophormisation, there is no need for double indirection

Browse Source
This commit is contained in:
gwenn 2017-04-27 18:05:12 +02:00
parent 63a444a95f
commit 3e6fffaf94
3 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/blob.rs
View File

@ -50,7 +50,6 @@
//! ``` //! ```
use std::io; use std::io;
use std::cmp::min; use std::cmp::min;
use std::mem;
use std::ptr; use std::ptr;
use super::ffi; use super::ffi;
@ -155,7 +154,7 @@ impl<'conn> io::Read for Blob<'conn> {
return Ok(0); return Ok(0);
} }
let rc = let rc =
unsafe { ffi::sqlite3_blob_read(self.blob, mem::transmute(buf.as_ptr()), n, self.pos) }; unsafe { ffi::sqlite3_blob_read(self.blob, buf.as_ptr() as *mut _, n, self.pos) };
self.conn self.conn
.decode_result(rc) .decode_result(rc)
.map(|_| { .map(|_| {
@ -184,7 +183,7 @@ impl<'conn> io::Write for Blob<'conn> {
return Ok(0); return Ok(0);
} }
let rc = unsafe { let rc = unsafe {
ffi::sqlite3_blob_write(self.blob, mem::transmute(buf.as_ptr()), n, self.pos) ffi::sqlite3_blob_write(self.blob, buf.as_ptr() as *mut _, n, self.pos)
}; };
self.conn self.conn
.decode_result(rc) .decode_result(rc)

18
src/hooks.rs
View File

@ -130,7 +130,8 @@ impl InnerConnection {
use std::ffi::CStr; use std::ffi::CStr;
use std::str; use std::str;
let boxed_hook: &mut Box<F> = mem::transmute(p_arg); let boxed_hook: *mut F = mem::transmute(p_arg);
assert!(!boxed_hook.is_null(), "Internal error - null function pointer");
let action = Action::from(action_code); let action = Action::from(action_code);
let db_name = { let db_name = {
@ -142,15 +143,15 @@ impl InnerConnection {
str::from_utf8_unchecked(c_slice) str::from_utf8_unchecked(c_slice)
}; };
boxed_hook(action, db_name, tbl_name, row_id); (*boxed_hook)(action, db_name, tbl_name, row_id);
} }
let previous_hook = { let previous_hook = {
let boxed_hook: Box<Box<FnMut(Action, &str, &str, i64)>> = Box::new(Box::new(hook)); let boxed_hook: *mut F = Box::into_raw(Box::new(hook));
unsafe { unsafe {
ffi::sqlite3_update_hook(self.db(), ffi::sqlite3_update_hook(self.db(),
Some(call_boxed_closure::<F>), Some(call_boxed_closure::<F>),
Box::into_raw(boxed_hook) as *mut _) boxed_hook as *mut _)
} }
}; };
free_boxed_update_hook(previous_hook); free_boxed_update_hook(previous_hook);
@ -164,14 +165,9 @@ impl InnerConnection {
} }
fn free_boxed_update_hook(hook: *mut c_void) { fn free_boxed_update_hook(hook: *mut c_void) {
/*
http://stackoverflow.com/questions/32270030/how-do-i-convert-a-rust-closure-to-a-c-style-callback
Double indirection (i.e. Box<Box<...>>) is necessary
because Box<Fn(..) -> ..> is a trait object and therefore a fat pointer,
incompatible with *mut c_void because of different size.
*/
if !hook.is_null() { if !hook.is_null() {
let _: Box<Box<FnMut(Action, &str, &str, i64)>> = unsafe { Box::from_raw(hook as *mut _) }; // TODO make sure that size_of::<*mut F>() is always equal to size_of::<*mut c_void>()
let _: Box<*mut c_void> = unsafe { Box::from_raw(hook as *mut _) };
} }
} }

3
src/lib.rs
View File

@ -781,6 +781,9 @@ impl InnerConnection {
} }
fn close(&mut self) -> Result<()> { fn close(&mut self) -> Result<()> {
if self.db.is_null() {
return Ok(());
}
self.remove_hooks(); self.remove_hooks();
unsafe { unsafe {
let r = ffi::sqlite3_close(self.db()); let r = ffi::sqlite3_close(self.db());