fix ffi_try (#331)

cf083fa6 · Wu Jiayu · Connor · 9d433ea2 · cf083fa6
Commit cf083fa6 authored Aug 06, 2019 by Wu Jiayu Committed by Connor Aug 06, 2019
Show whitespace changes
Inline Side-by-side

Showing with 11 additions and 2 deletions

lib.rs librocksdb_sys/src/lib.rs +11 -2

No files found.
--- a/librocksdb_sys/src/lib.rs
+++ b/librocksdb_sys/src/lib.rs
@@ -301,10 +301,19 @@ pub fn error_message(ptr: *mut c_char) -> String {

 #[macro_export]
 macro_rules! ffi_try {
-    ($func:ident($($arg:expr),*)) => ({
+    ($func:ident($($arg:expr),+)) => ({
        use std::ptr;
        let mut err = ptr::null_mut();
-        let res = $crate::$func($($arg),*, &mut err);
+        let res = $crate::$func($($arg),+, &mut err);
+        if !err.is_null() {
+            return Err($crate::error_message(err));
+        }
+        res
+    });
+    ($func:ident()) => ({
+        use std::ptr;
+        let mut err = ptr::null_mut();
+        let res = $crate::$func(&mut err);
        if !err.is_null() {
            return Err($crate::error_message(err));
        }