Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-03 20:50:07 +01:00
Code Issues Projects Releases Packages Wiki Activity

embedding: address various review nitpicks for string_map

Browse source
This commit is contained in:
Mike Blumenkrantz 2014-11-13 14:37:56 -05:00
parent 0a82eebaa2
commit c813df777e
1 changed files with 4 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

10
ports/cef/string_map.rs
View file

@ -10,7 +10,7 @@ use std::slice;
use std::str; use std::str;
use std::string::String; use std::string::String;
use string::{cef_string_userfree_utf8_alloc,cef_string_userfree_utf8_free,cef_string_utf8_set}; use string::{cef_string_userfree_utf8_alloc,cef_string_userfree_utf8_free,cef_string_utf8_set};
use types::{cef_string_map_t,cef_string_t}; use types::{cef_string_map_t, cef_string_t};
fn string_map_to_treemap(sm: *mut cef_string_map_t) -> *mut TreeMap<String, *mut cef_string_t> { fn string_map_to_treemap(sm: *mut cef_string_map_t) -> *mut TreeMap<String, *mut cef_string_t> {
sm as *mut TreeMap<String, *mut cef_string_t> sm as *mut TreeMap<String, *mut cef_string_t>
@ -103,7 +103,7 @@ pub extern "C" fn cef_string_map_value(sm: *mut cef_string_map_t, index: c_int,
for (i, val) in (*v).values().enumerate() { for (i, val) in (*v).values().enumerate() {
if i == index as uint { if i == index as uint {
cef_string_utf8_set(mem::transmute((**val).str), (**val).length, value, 1); cef_string_utf8_set((**val).str as *const u8, (**val).length, value, 1);
return 1; return 1;
} }
} }
@ -116,9 +116,8 @@ pub extern "C" fn cef_string_map_clear(sm: *mut cef_string_map_t) {
unsafe { unsafe {
if fptr_is_null(mem::transmute(sm)) { return; } if fptr_is_null(mem::transmute(sm)) { return; }
let v = string_map_to_treemap(sm); let v = string_map_to_treemap(sm);
if (*v).len() == 0 { return; }
for val in (*v).values() { for val in (*v).values() {
cef_string_userfree_utf8_free((*val)); cef_string_userfree_utf8_free(*val);
} }
(*v).clear(); (*v).clear();
} }
@ -128,8 +127,7 @@ pub extern "C" fn cef_string_map_clear(sm: *mut cef_string_map_t) {
pub extern "C" fn cef_string_map_free(sm: *mut cef_string_map_t) { pub extern "C" fn cef_string_map_free(sm: *mut cef_string_map_t) {
unsafe { unsafe {
if fptr_is_null(mem::transmute(sm)) { return; } if fptr_is_null(mem::transmute(sm)) { return; }
let v: Box<TreeMap<String, *mut cef_string_t>> = mem::transmute(sm); let _v: Box<TreeMap<String, *mut cef_string_t>> = mem::transmute(sm);
cef_string_map_clear(sm); cef_string_map_clear(sm);
drop(v);
} }
} }