Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-09 15:35:34 +01:00
Code Issues Projects Releases Packages Wiki Activity

Remove no-op string_list_to_vec function.

Browse source
This commit is contained in:
Ms2ger 2015-06-20 13:39:05 +02:00
parent 2248e1710a
commit 4a7c5c8042
1 changed files with 6 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

21
ports/cef/string_list.rs
View file

@ -11,10 +11,6 @@ use types::{cef_string_list_t,cef_string_t};
use rustc_unicode::str::Utf16Encoder; use rustc_unicode::str::Utf16Encoder;
fn string_list_to_vec(lt: *mut cef_string_list_t) -> *mut Vec<String> {
lt as *mut Vec<String>
}
//cef_string_list //cef_string_list
#[no_mangle] #[no_mangle]
@ -26,8 +22,7 @@ pub extern "C" fn cef_string_list_alloc() -> *mut cef_string_list_t {
pub extern "C" fn cef_string_list_size(lt: *mut cef_string_list_t) -> c_int { pub extern "C" fn cef_string_list_size(lt: *mut cef_string_list_t) -> c_int {
unsafe { unsafe {
if lt.is_null() { return 0; } if lt.is_null() { return 0; }
let v = string_list_to_vec(lt); (*lt).len() as c_int
(*v).len() as c_int
} }
} }
@ -35,8 +30,7 @@ pub extern "C" fn cef_string_list_size(lt: *mut cef_string_list_t) -> c_int {
pub extern "C" fn cef_string_list_append(lt: *mut cef_string_list_t, value: *const cef_string_t) { pub extern "C" fn cef_string_list_append(lt: *mut cef_string_list_t, value: *const cef_string_t) {
unsafe { unsafe {
if lt.is_null() { return; } if lt.is_null() { return; }
let v = string_list_to_vec(lt); (*lt).push(String::from_utf16(slice::from_raw_parts((*value).str, (*value).length as usize)).unwrap());
(*v).push(String::from_utf16(slice::from_raw_parts((*value).str, (*value).length as usize)).unwrap());
} }
} }
@ -44,9 +38,8 @@ pub extern "C" fn cef_string_list_append(lt: *mut cef_string_list_t, value: *con
pub extern "C" fn cef_string_list_value(lt: *mut cef_string_list_t, index: c_int, value: *mut cef_string_t) -> c_int { pub extern "C" fn cef_string_list_value(lt: *mut cef_string_list_t, index: c_int, value: *mut cef_string_t) -> c_int {
unsafe { unsafe {
if index < 0 || lt.is_null() { return 0; } if index < 0 || lt.is_null() { return 0; }
let v = string_list_to_vec(lt); if index as usize > (*lt).len() - 1 { return 0; }
if index as usize > (*v).len() - 1 { return 0; } let ref string = (*lt)[index as usize];
let ref string = (*v)[index as usize];
let utf16_chars: Vec<u16> = Utf16Encoder::new(string.chars()).collect(); let utf16_chars: Vec<u16> = Utf16Encoder::new(string.chars()).collect();
cef_string_utf16_set(mem::transmute(utf16_chars.as_ptr()), utf16_chars.len() as u64, value, 1) cef_string_utf16_set(mem::transmute(utf16_chars.as_ptr()), utf16_chars.len() as u64, value, 1)
} }
@ -56,8 +49,7 @@ pub extern "C" fn cef_string_list_value(lt: *mut cef_string_list_t, index: c_int
pub extern "C" fn cef_string_list_clear(lt: *mut cef_string_list_t) { pub extern "C" fn cef_string_list_clear(lt: *mut cef_string_list_t) {
unsafe { unsafe {
if lt.is_null() { return; } if lt.is_null() { return; }
let v = string_list_to_vec(lt); (*lt).clear();
(*v).clear();
} }
} }
@ -74,8 +66,7 @@ pub extern "C" fn cef_string_list_free(lt: *mut cef_string_list_t) {
pub extern "C" fn cef_string_list_copy(lt: *mut cef_string_list_t) -> *mut cef_string_list_t { pub extern "C" fn cef_string_list_copy(lt: *mut cef_string_list_t) -> *mut cef_string_list_t {
unsafe { unsafe {
if lt.is_null() { return 0 as *mut cef_string_list_t; } if lt.is_null() { return 0 as *mut cef_string_list_t; }
let v = string_list_to_vec(lt); let copy = (*lt).clone();
let copy = (*v).clone();
boxed::into_raw(box copy) boxed::into_raw(box copy)
} }
} }