Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-07-21 14:23:41 +01:00
Code Issues Projects Releases Packages Wiki Activity

embedding: fix string_list compile errors?

Browse source
This commit is contained in:
Mike Blumenkrantz 2014-10-23 12:22:26 -04:00
parent 021937bca0
commit 43cc865629
1 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

16
ports/cef/string_list.rs
View file

@ -19,10 +19,10 @@ pub extern "C" fn cef_string_list_alloc() -> *mut cef_string_list_t {
} }
#[no_mangle] #[no_mangle]
pub extern "C" fn cef_string_list_size(lt: *const 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 fptr_is_null(mem::transmute(lt)) { return 0; } if fptr_is_null(mem::transmute(lt)) { return 0; }
let v: *const Vec<*mut cef_string_t> = mem::transmute(lt); let v: *mut Vec<*mut cef_string_t> = mem::transmute(lt);
(*v).len() as c_int (*v).len() as c_int
} }
} }
@ -31,7 +31,7 @@ pub extern "C" fn cef_string_list_size(lt: *const 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 fptr_is_null(mem::transmute(lt)) { return; } if fptr_is_null(mem::transmute(lt)) { return; }
let v: *const Vec<*mut cef_string_t> = mem::transmute(lt); let v: *mut Vec<*mut cef_string_t> = mem::transmute(lt);
let cs = cef_string_userfree_utf8_alloc(); let cs = cef_string_userfree_utf8_alloc();
cef_string_utf8_set(mem::transmute((*value).str), (*value).length, cs, 1); cef_string_utf8_set(mem::transmute((*value).str), (*value).length, cs, 1);
(*v).push(cs); (*v).push(cs);
@ -42,7 +42,7 @@ 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 || fptr_is_null(mem::transmute(lt)) { return 0; } if index < 0 || fptr_is_null(mem::transmute(lt)) { return 0; }
let v: Box<Vec<*mut cef_string_t>> = mem::transmute(lt); let v: *mut Vec<*mut cef_string_t> = mem::transmute(lt);
if index as uint > (*v).len() - 1 { return 0; } if index as uint > (*v).len() - 1 { return 0; }
let cs = (*v).get(index as uint); let cs = (*v).get(index as uint);
cef_string_utf8_set(mem::transmute((**cs).str), (**cs).length, value, 1) cef_string_utf8_set(mem::transmute((**cs).str), (**cs).length, value, 1)
@ -53,7 +53,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 fptr_is_null(mem::transmute(lt)) { return; } if fptr_is_null(mem::transmute(lt)) { return; }
let v: *const Vec<*mut cef_string_t> = mem::transmute(lt); let v: *mut Vec<*mut cef_string_t> = mem::transmute(lt);
if (*v).len() == 0 { return; } if (*v).len() == 0 { return; }
let mut cs; let mut cs;
while (*v).len() != 0 { while (*v).len() != 0 {
@ -67,9 +67,9 @@ pub extern "C" fn cef_string_list_clear(lt: *mut cef_string_list_t) {
pub extern "C" fn cef_string_list_free(lt: *mut cef_string_list_t) { pub extern "C" fn cef_string_list_free(lt: *mut cef_string_list_t) {
unsafe { unsafe {
if fptr_is_null(mem::transmute(lt)) { return; } if fptr_is_null(mem::transmute(lt)) { return; }
let v: *const Vec<*mut cef_string_t> = mem::transmute(lt); let v: Box<Vec<*mut cef_string_t>> = mem::transmute(lt);
cef_string_list_clear(lt); cef_string_list_clear(lt);
drop((*v)); drop(v);
} }
} }
@ -77,7 +77,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 fptr_is_null(mem::transmute(lt)) { return 0 as *mut cef_string_list_t; } if fptr_is_null(mem::transmute(lt)) { return 0 as *mut cef_string_list_t; }
let v: Box<Vec<*mut cef_string_t>> = mem::transmute(lt); let v: *mut Vec<*mut cef_string_t> = mem::transmute(lt);
let lt2 = cef_string_list_alloc(); let lt2 = cef_string_list_alloc();
for cs in (*v).iter() { for cs in (*v).iter() {
cef_string_list_append(lt2, mem::transmute((*cs))); cef_string_list_append(lt2, mem::transmute((*cs)));