Merge pull request #100 from jgallagher/bindgen-update

Update bindings with bindgen 0.15.0/sqlite3 3.8.10

libsqlite3-sys/src/lib.rs

@@ -1,3 +1,5 @@
+// bindgen.rs was created with bindgen 0.15.0 against sqlite3 3.8.10
+
 #![allow(non_snake_case)]
 
 extern crate libc;

src/functions.rs

@@ -407,26 +407,24 @@ impl InnerConnection {
         where F: FnMut(&Context) -> Result<T>,
               T: ToResult
     {
-        extern "C" fn call_boxed_closure<F, T>(ctx: *mut sqlite3_context,
+        unsafe extern "C" fn call_boxed_closure<F, T>(ctx: *mut sqlite3_context,
-                                               argc: c_int,
+                                                      argc: c_int,
-                                               argv: *mut *mut sqlite3_value)
+                                                      argv: *mut *mut sqlite3_value)
             where F: FnMut(&Context) -> Result<T>,
                   T: ToResult
         {
-            unsafe {
+            let ctx = Context {
-                let ctx = Context {
+                ctx: ctx,
-                    ctx: ctx,
+                args: slice::from_raw_parts(argv, argc as usize),
-                    args: slice::from_raw_parts(argv, argc as usize),
+            };
-                };
+            let boxed_f: *mut F = mem::transmute(ffi::sqlite3_user_data(ctx.ctx));
-                let boxed_f: *mut F = mem::transmute(ffi::sqlite3_user_data(ctx.ctx));
+            assert!(!boxed_f.is_null(), "Internal error - null function pointer");
-                assert!(!boxed_f.is_null(), "Internal error - null function pointer");
+            match (*boxed_f)(&ctx) {
-                match (*boxed_f)(&ctx) {
+                Ok(r) => r.set_result(ctx.ctx),
-                    Ok(r) => r.set_result(ctx.ctx),
+                Err(e) => {
-                    Err(e) => {
+                    ffi::sqlite3_result_error_code(ctx.ctx, e.code);
-                        ffi::sqlite3_result_error_code(ctx.ctx, e.code);
+                    if let Ok(cstr) = str_to_cstring(&e.message) {
-                        if let Ok(cstr) = str_to_cstring(&e.message) {
+                        ffi::sqlite3_result_error(ctx.ctx, cstr.as_ptr(), -1);
-                            ffi::sqlite3_result_error(ctx.ctx, cstr.as_ptr(), -1);
-                        }
                     }
                 }
             }

src/lib.rs

@@ -70,7 +70,7 @@ use std::cell::{RefCell, Cell};
 use std::ffi::{CStr, CString};
 use std::result;
 use std::str;
-use libc::{c_int, c_void, c_char};
+use libc::{c_int, c_char};
 
 use types::{ToSql, FromSql};
 
@@ -631,22 +631,6 @@ impl InnerConnection {
         }
     }
 
-    unsafe fn decode_result_with_errmsg(&self,
-                                        code: c_int,
-                                        errmsg: *mut c_char)
-        -> Result<()> {
-            if code == ffi::SQLITE_OK {
-                Ok(())
-            } else {
-                let message = errmsg_to_string(&*errmsg);
-                ffi::sqlite3_free(errmsg as *mut c_void);
-                Err(Error {
-                    code: code,
-                    message: message,
-                })
-            }
-        }
-
     fn close(&mut self) -> Result<()> {
         unsafe {
             let r = ffi::sqlite3_close(self.db());
@@ -687,7 +671,16 @@ impl InnerConnection {
             } else {
                 ffi::sqlite3_load_extension(self.db, dylib_str.as_ptr(), ptr::null(), &mut errmsg)
             };
-            self.decode_result_with_errmsg(r, errmsg)
+            if r == ffi::SQLITE_OK {
+                Ok(())
+            } else {
+                let message = errmsg_to_string(&*errmsg);
+                ffi::sqlite3_free(errmsg as *mut libc::c_void);
+                Err(Error {
+                    code: r,
+                    message: message,
+                })
+            }
         }
     }
 

src/trace.rs

@@ -67,9 +67,9 @@ impl Connection {
     /// There can only be a single tracer defined for each database connection.
     /// Setting a new tracer clears the old one.
     pub fn trace(&mut self, trace_fn: Option<fn(&str)>) {
-        extern "C" fn trace_callback(p_arg: *mut c_void, z_sql: *const c_char) {
+        unsafe extern "C" fn trace_callback(p_arg: *mut c_void, z_sql: *const c_char) {
-            let trace_fn: fn(&str) = unsafe { mem::transmute(p_arg) };
+            let trace_fn: fn(&str) = mem::transmute(p_arg);
-            let c_slice = unsafe { CStr::from_ptr(z_sql).to_bytes() };
+            let c_slice = CStr::from_ptr(z_sql).to_bytes();
             if let Ok(s) = str::from_utf8(c_slice) {
                 trace_fn(s);
             }
@@ -91,11 +91,11 @@ impl Connection {
     /// There can only be a single profiler defined for each database connection.
     /// Setting a new profiler clears the old one.
     pub fn profile(&mut self, profile_fn: Option<fn(&str, Duration)>) {
-        extern "C" fn profile_callback(p_arg: *mut c_void,
+        unsafe extern "C" fn profile_callback(p_arg: *mut c_void,
-                                       z_sql: *const c_char,
+                                              z_sql: *const c_char,
-                                       nanoseconds: u64) {
+                                              nanoseconds: u64) {
-            let profile_fn: fn(&str, Duration) = unsafe { mem::transmute(p_arg) };
+            let profile_fn: fn(&str, Duration) = mem::transmute(p_arg);
-            let c_slice = unsafe { CStr::from_ptr(z_sql).to_bytes() };
+            let c_slice = CStr::from_ptr(z_sql).to_bytes();
             if let Ok(s) = str::from_utf8(c_slice) {
                 const NANOS_PER_SEC: u64 = 1_000_000_000;