diff options
| author | Nikita Popov <nikic@php.net> | 2014-09-16 00:23:58 +0200 |
|---|---|---|
| committer | Nikita Popov <nikic@php.net> | 2014-09-16 00:31:27 +0200 |
| commit | 079409bbc232f16fd446935a2103ece9d12082ed (patch) | |
| tree | be7eb6a3115cbf6b279ea67652697eb62fe792b0 /Zend/zend_builtin_functions.c | |
| parent | 69917807939170c5a5e0ec6da1c7f9dd9633c6ae (diff) | |
| download | php-git-079409bbc232f16fd446935a2103ece9d12082ed.tar.gz | |
Switch (un)mangle property name to size_t and zend_string
Also use the _ex variants where possible.
Diffstat (limited to 'Zend/zend_builtin_functions.c')
| -rw-r--r-- | Zend/zend_builtin_functions.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Zend/zend_builtin_functions.c b/Zend/zend_builtin_functions.c index 0977b648d7..1bb02ef2eb 100644 --- a/Zend/zend_builtin_functions.c +++ b/Zend/zend_builtin_functions.c @@ -1036,8 +1036,6 @@ ZEND_FUNCTION(get_object_vars) zval *value; HashTable *properties; zend_string *key; - const char *prop_name, *class_name; - uint prop_len; zend_object *zobj; #ifndef FAST_ZPP @@ -1070,7 +1068,9 @@ ZEND_FUNCTION(get_object_vars) /* Not separating references */ if (Z_REFCOUNTED_P(value)) Z_ADDREF_P(value); if (key->val[0] == 0) { - zend_unmangle_property_name_ex(key->val, key->len, &class_name, &prop_name, (int*) &prop_len); + const char *prop_name, *class_name; + size_t prop_len; + zend_unmangle_property_name_ex(key, &class_name, &prop_name, &prop_len); zend_hash_str_add_new(Z_ARRVAL_P(return_value), prop_name, prop_len, value); } else { zend_hash_add_new(Z_ARRVAL_P(return_value), key, value); |