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

Remove unnecessary transmutes from CEF strings.

Browse source
This commit is contained in:
Ms2ger 2015-06-20 13:57:48 +02:00
parent 2c032edc16
commit 893fc18c71
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
ports/cef/string.rs
View file

@ -99,7 +99,7 @@ pub extern "C" fn cef_string_utf8_set(src: *const u8, src_len: size_t, output: *
(*output).dtor = Some(string_utf8_dtor as extern "C" fn(*mut u8)); (*output).dtor = Some(string_utf8_dtor as extern "C" fn(*mut u8));
} }
} else { } else {
(*output).str = mem::transmute(src); (*output).str = src as *mut _;
(*output).length = src_len; (*output).length = src_len;
(*output).dtor = None; (*output).dtor = None;
} }
@ -180,7 +180,7 @@ pub extern "C" fn cef_string_utf16_set(src: *const c_ushort, src_len: size_t, ou
(*output).dtor = Some(string_utf16_dtor as extern "C" fn(*mut c_ushort)); (*output).dtor = Some(string_utf16_dtor as extern "C" fn(*mut c_ushort));
} }
} else { } else {
(*output).str = mem::transmute(src); (*output).str = src as *mut _;
(*output).length = src_len; (*output).length = src_len;
(*output).dtor = None; (*output).dtor = None;
} }
@ -238,7 +238,7 @@ pub extern "C" fn cef_string_wide_set(src: *const wchar_t, src_len: size_t, outp
(*output).dtor = Some(string_wide_dtor as extern "C" fn(*mut wchar_t)); (*output).dtor = Some(string_wide_dtor as extern "C" fn(*mut wchar_t));
} }
} else { } else {
(*output).str = mem::transmute(src); (*output).str = src as *mut _;
(*output).length = src_len; (*output).length = src_len;
(*output).dtor = None; (*output).dtor = None;
} }
@ -311,8 +311,8 @@ pub fn empty_utf16_string() -> cef_string_utf16_t {
pub fn string_to_userfree_string(string: cef_string_utf16_t) -> cef_string_userfree_utf16_t { pub fn string_to_userfree_string(string: cef_string_utf16_t) -> cef_string_userfree_utf16_t {
unsafe { unsafe {
let allocation: cef_string_userfree_utf16_t = let allocation = libc::malloc(mem::size_of::<cef_string_utf16_t>() as size_t)
mem::transmute(libc::malloc(mem::size_of::<cef_string_utf16_t>() as size_t)); as cef_string_userfree_utf16_t;
ptr::write(allocation, string); ptr::write(allocation, string);
allocation allocation
} }