From e3db62fb03fcf8b259b84d214386291fbea97c85 Mon Sep 17 00:00:00 2001 From: Tyler Neely Date: Mon, 19 Jan 2015 15:35:23 -0500 Subject: [PATCH] small cleanup --- src/rocksdb.rs | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/rocksdb.rs b/src/rocksdb.rs index a07d958..e1658fc 100644 --- a/src/rocksdb.rs +++ b/src/rocksdb.rs @@ -57,12 +57,11 @@ impl RocksDB { let err = 0 as *mut i8; let db = rocksdb_ffi::rocksdb_open(opts.inner, cpath_ptr, err); - let rocksdb_ffi::RocksDBInstance(db_ptr) = db; if !err.is_null() { let cs = from_c_str(err as *const i8); return Err(cs); } - if db_ptr.is_null() { + if db.0.is_null() { return Err("Could not initialize database."); } Ok(RocksDB{inner: db}) @@ -134,8 +133,7 @@ impl RocksDB { RocksDBResult<'a, RocksDBVector, &str> { unsafe { let readopts = rocksdb_ffi::rocksdb_readoptions_create(); - let rocksdb_ffi::RocksDBReadOptions(read_opts_ptr) = readopts; - if read_opts_ptr.is_null() { + if readopts.0.is_null() { return RocksDBResult::Error("Unable to create rocksdb read \ options. This is a fairly trivial call, and its failure \ may be indicative of a mis-compiled or mis-loaded rocksdb \