nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-11 13:43:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

Change allocate_and_copy_string to take a &str instead of &String.

Browse Source
This commit is contained in:
Corey Farwell 2018-06-24 08:58:26 -04:00
parent eb784aa9ea
commit 7e9c37f9cb
2 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/rust/protover/ffi.rs
View File

@ -198,8 +198,7 @@ pub extern "C" fn protover_compute_vote(
) -> *mut c_char { ) -> *mut c_char {
if list.is_null() { if list.is_null() {
let empty = String::new(); return allocate_and_copy_string("");
return allocate_and_copy_string(&empty);
} }
// Dereference of raw pointer requires an unsafe block. The pointer is // Dereference of raw pointer requires an unsafe block. The pointer is

12
src/rust/tor_allocate/tor_allocate.rs
View File

@ -9,9 +9,9 @@ use libc::c_void;
// Define a no-op implementation for testing Rust modules without linking to C // Define a no-op implementation for testing Rust modules without linking to C
#[cfg(feature = "testing")] #[cfg(feature = "testing")]
pub fn allocate_and_copy_string(s: &String) -> *mut c_char { pub fn allocate_and_copy_string(s: &str) -> *mut c_char {
use std::ffi::CString; use std::ffi::CString;
CString::new(s.as_str()).unwrap().into_raw() CString::new(s).unwrap().into_raw()
} }
// Defined only for tests, used for testing purposes, so that we don't need // Defined only for tests, used for testing purposes, so that we don't need
@ -39,7 +39,7 @@ extern "C" {
/// A `*mut c_char` that should be freed by tor_free in C /// A `*mut c_char` that should be freed by tor_free in C
/// ///
#[cfg(not(feature = "testing"))] #[cfg(not(feature = "testing"))]
pub fn allocate_and_copy_string(src: &String) -> *mut c_char { pub fn allocate_and_copy_string(src: &str) -> *mut c_char {
let bytes: &[u8] = src.as_bytes(); let bytes: &[u8] = src.as_bytes();
let size = mem::size_of_val::<[u8]>(bytes); let size = mem::size_of_val::<[u8]>(bytes);
@ -77,8 +77,7 @@ mod test {
use tor_allocate::allocate_and_copy_string; use tor_allocate::allocate_and_copy_string;
let empty = String::new(); let allocated_empty = allocate_and_copy_string("");
let allocated_empty = allocate_and_copy_string(&empty);
let allocated_empty_rust = let allocated_empty_rust =
unsafe { CStr::from_ptr(allocated_empty).to_str().unwrap() }; unsafe { CStr::from_ptr(allocated_empty).to_str().unwrap() };
@ -95,8 +94,7 @@ mod test {
use tor_allocate::allocate_and_copy_string; use tor_allocate::allocate_and_copy_string;
let empty = String::from("foo bar biz"); let allocated_empty = allocate_and_copy_string("foo bar biz");
let allocated_empty = allocate_and_copy_string(&empty);
let allocated_empty_rust = let allocated_empty_rust =
unsafe { CStr::from_ptr(allocated_empty).to_str().unwrap() }; unsafe { CStr::from_ptr(allocated_empty).to_str().unwrap() };