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

Store a slice in ConstantSpec, rather than a raw pointer.

Browse source
This commit is contained in:
Ms2ger 2014-06-06 14:23:09 +02:00
parent ba68203ebf
commit d882bb7cc0
2 changed files with 5 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/components/script/dom/bindings/utils.rs
View file

@ -192,7 +192,7 @@ pub enum ConstantVal {
#[deriving(Clone)]
pub struct ConstantSpec {
pub name: *libc::c_char,
pub name: &'static [u8],
pub value: ConstantVal
}
@ -313,7 +313,6 @@ fn CreateInterfaceObject(cx: *mut JSContext, global: *mut JSObject, receiver: *m
fn DefineConstants(cx: *mut JSContext, obj: *mut JSObject, constants: &'static [ConstantSpec]) -> bool {
constants.iter().all(|spec| {
assert!(spec.name.is_not_null());
let jsval = match spec.value {
NullVal => NullValue(),
IntVal(i) => Int32Value(i),
@ -323,7 +322,8 @@ fn DefineConstants(cx: *mut JSContext, obj: *mut JSObject, constants: &'static [
VoidVal => UndefinedValue(),
};
unsafe {
JS_DefineProperty(cx, obj, spec.name, jsval, None, None,
JS_DefineProperty(cx, obj, spec.name.as_ptr() as *libc::c_char,
jsval, None, None,
JSPROP_ENUMERATE | JSPROP_READONLY |
JSPROP_PERMANENT) != 0
}