diff --git a/ports/cef/string_list.rs b/ports/cef/string_list.rs index 8f2fec1d0c7..9c9994d4c16 100644 --- a/ports/cef/string_list.rs +++ b/ports/cef/string_list.rs @@ -8,6 +8,11 @@ use std::mem; use string::{cef_string_userfree_utf8_alloc,cef_string_userfree_utf8_free,cef_string_utf8_set}; use types::{cef_string_list_t,cef_string_t}; + +fn string_map_to_vec(lt: *mut cef_string_list_t) -> *mut Vec<*mut cef_string_t> { + lt as *mut Vec<*mut cef_string_t> +} + //cef_string_list #[no_mangle] @@ -19,11 +24,11 @@ pub extern "C" fn cef_string_list_alloc() -> *mut cef_string_list_t { } #[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 { if fptr_is_null(mem::transmute(lt)) { return 0; } - let v: Box> = mem::transmute(lt); - v.len() as c_int + let v = string_map_to_vec(lt); + (*v).len() as c_int } } @@ -31,10 +36,10 @@ 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) { unsafe { if fptr_is_null(mem::transmute(lt)) { return; } - let mut v: Box> = mem::transmute(lt); + let v = string_map_to_vec(lt); let cs = cef_string_userfree_utf8_alloc(); cef_string_utf8_set(mem::transmute((*value).str), (*value).length, cs, 1); - v.push(cs); + (*v).push(cs); } } @@ -42,9 +47,9 @@ 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 { unsafe { if index < 0 || fptr_is_null(mem::transmute(lt)) { return 0; } - let v: Box> = mem::transmute(lt); - if index as uint > v.len() - 1 { return 0; } - let cs = v.get(index as uint); + let v = string_map_to_vec(lt); + if index as uint > (*v).len() - 1 { return 0; } + let cs = (*v).get(index as uint); cef_string_utf8_set(mem::transmute((**cs).str), (**cs).length, value, 1) } } @@ -53,11 +58,11 @@ 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) { unsafe { if fptr_is_null(mem::transmute(lt)) { return; } - let mut v: Box> = mem::transmute(lt); - if v.len() == 0 { return; } + let v = string_map_to_vec(lt); + if (*v).len() == 0 { return; } let mut cs; - while v.len() != 0 { - cs = v.pop(); + while (*v).len() != 0 { + cs = (*v).pop(); cef_string_userfree_utf8_free(cs.unwrap()); } } @@ -67,7 +72,7 @@ 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) { unsafe { if fptr_is_null(mem::transmute(lt)) { return; } - let mut v: Box> = mem::transmute(lt); + let v: Box> = mem::transmute(lt); cef_string_list_clear(lt); drop(v); } @@ -77,9 +82,9 @@ 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 { unsafe { if fptr_is_null(mem::transmute(lt)) { return 0 as *mut cef_string_list_t; } - let v: Box> = mem::transmute(lt); + let v = string_map_to_vec(lt); let lt2 = cef_string_list_alloc(); - for cs in v.iter() { + for cs in (*v).iter() { cef_string_list_append(lt2, mem::transmute((*cs))); } lt2