NextGraph
/
rust-rocksdb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #106 from tatsuya6502/fix-ptr-casts

Browse Source 
Replace cast `as *const i8` with `as *const c_char` to prevent compile errors in 32-bit ARM systems
master
Tyler Neely 8 years ago committed by GitHub
parent da7590e575 d4c9d647ee
commit 26c9b9bc8f
1 changed files with 13 additions and 13 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 26
      src/db.rs

26
src/db.rs
Unescape View File

@ -609,9 +609,9 @@ impl DB {
ffi_try!(ffi::rocksdb_merge_cf(self.inner, ffi_try!(ffi::rocksdb_merge_cf(self.inner,
writeopts.inner, writeopts.inner,
cf.inner, cf.inner,
key.as_ptr() as *const i8, key.as_ptr() as *const c_char,
key.len() as size_t, key.len() as size_t,
value.as_ptr() as *const i8, value.as_ptr() as *const c_char,
value.len() as size_t)); value.len() as size_t));
Ok(()) Ok(())
} }
@ -715,9 +715,9 @@ impl WriteBatch {
pub fn put(&mut self, key: &[u8], value: &[u8]) -> Result<(), Error> { pub fn put(&mut self, key: &[u8], value: &[u8]) -> Result<(), Error> {
unsafe { unsafe {
ffi::rocksdb_writebatch_put(self.inner, ffi::rocksdb_writebatch_put(self.inner,
key.as_ptr() as *const i8, key.as_ptr() as *const c_char,
key.len() as size_t, key.len() as size_t,
value.as_ptr() as *const i8, value.as_ptr() as *const c_char,
value.len() as size_t); value.len() as size_t);
Ok(()) Ok(())
} }
@ -731,9 +731,9 @@ impl WriteBatch {
unsafe { unsafe {
ffi::rocksdb_writebatch_put_cf(self.inner, ffi::rocksdb_writebatch_put_cf(self.inner,
cf.inner, cf.inner,
key.as_ptr() as *const i8, key.as_ptr() as *const c_char,
key.len() as size_t, key.len() as size_t,
value.as_ptr() as *const i8, value.as_ptr() as *const c_char,
value.len() as size_t); value.len() as size_t);
Ok(()) Ok(())
} }
@ -742,9 +742,9 @@ impl WriteBatch {
pub fn merge(&mut self, key: &[u8], value: &[u8]) -> Result<(), Error> { pub fn merge(&mut self, key: &[u8], value: &[u8]) -> Result<(), Error> {
unsafe { unsafe {
ffi::rocksdb_writebatch_merge(self.inner, ffi::rocksdb_writebatch_merge(self.inner,
key.as_ptr() as *const i8, key.as_ptr() as *const c_char,
key.len() as size_t, key.len() as size_t,
value.as_ptr() as *const i8, value.as_ptr() as *const c_char,
value.len() as size_t); value.len() as size_t);
Ok(()) Ok(())
} }
@ -758,9 +758,9 @@ impl WriteBatch {
unsafe { unsafe {
ffi::rocksdb_writebatch_merge_cf(self.inner, ffi::rocksdb_writebatch_merge_cf(self.inner,
cf.inner, cf.inner,
key.as_ptr() as *const i8, key.as_ptr() as *const c_char,
key.len() as size_t, key.len() as size_t,
value.as_ptr() as *const i8, value.as_ptr() as *const c_char,
value.len() as size_t); value.len() as size_t);
Ok(()) Ok(())
} }
@ -772,7 +772,7 @@ impl WriteBatch {
pub fn delete(&mut self, key: &[u8]) -> Result<(), Error> { pub fn delete(&mut self, key: &[u8]) -> Result<(), Error> {
unsafe { unsafe {
ffi::rocksdb_writebatch_delete(self.inner, ffi::rocksdb_writebatch_delete(self.inner,
key.as_ptr() as *const i8, key.as_ptr() as *const c_char,
key.len() as size_t); key.len() as size_t);
Ok(()) Ok(())
} }
@ -785,7 +785,7 @@ impl WriteBatch {
unsafe { unsafe {
ffi::rocksdb_writebatch_delete_cf(self.inner, ffi::rocksdb_writebatch_delete_cf(self.inner,
cf.inner, cf.inner,
key.as_ptr() as *const i8, key.as_ptr() as *const c_char,
key.len() as size_t); key.len() as size_t);
Ok(()) Ok(())
} }
@ -847,7 +847,7 @@ impl ReadOptions {
pub fn set_iterate_upper_bound(&mut self, key: &[u8]) { pub fn set_iterate_upper_bound(&mut self, key: &[u8]) {
unsafe { unsafe {
ffi::rocksdb_readoptions_set_iterate_upper_bound(self.inner, ffi::rocksdb_readoptions_set_iterate_upper_bound(self.inner,
key.as_ptr() as *const i8, key.as_ptr() as *const c_char,
key.len() as size_t); key.len() as size_t);
} }
} }

Write Preview
Loading…
Cancel
Save