diff options
| author | Xinchen Hui <laruence@php.net> | 2015-01-20 10:59:28 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@php.net> | 2015-01-20 10:59:28 +0800 |
| commit | c369a034074bf8eed9b48a233a1aed145673a94a (patch) | |
| tree | 3d66782f03559c57219eeef30f341f27ca0ec62f /ext/standard/var.c | |
| parent | 020610ee40fcabacf0330243dd4af1a2b599ce6b (diff) | |
| download | php-git-c369a034074bf8eed9b48a233a1aed145673a94a.tar.gz | |
Use zend_string in case we will optimize them
Diffstat (limited to 'ext/standard/var.c')
| -rw-r--r-- | ext/standard/var.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ext/standard/var.c b/ext/standard/var.c index 80572f82a5..5e986d451d 100644 --- a/ext/standard/var.c +++ b/ext/standard/var.c @@ -404,7 +404,7 @@ static void php_array_element_export(zval *zv, zend_ulong index, zend_string *ke } else { /* string key */ zend_string *tmp_str; - zend_string *ckey = php_addcslashes(key->val, key->len, 0, "'\\", 2); + zend_string *ckey = php_addcslashes(key, 0, "'\\", 2); tmp_str = php_str_to_str(ckey->val, ckey->len, "\0", 1, "' . \"\\0\" . '", 12); buffer_append_spaces(buf, level + 1); @@ -432,7 +432,7 @@ static void php_object_element_export(zval *zv, zend_ulong index, zend_string *k zend_string *pname_esc; zend_unmangle_property_name_ex(key, &class_name, &prop_name, &prop_name_len); - pname_esc = php_addcslashes(prop_name, prop_name_len, 0, "'\\", 2); + pname_esc = php_addcslashes(zend_string_init(prop_name, prop_name_len, 0), 1, "'\\", 2); smart_str_appendc(buf, '\''); smart_str_append(buf, pname_esc); @@ -478,7 +478,7 @@ again: efree(tmp_str); break; case IS_STRING: - ztmp = php_addcslashes(Z_STRVAL_P(struc), Z_STRLEN_P(struc), 0, "'\\", 2); + ztmp = php_addcslashes(Z_STR_P(struc), 0, "'\\", 2); ztmp2 = php_str_to_str(ztmp->val, ztmp->len, "\0", 1, "' . \"\\0\" . '", 12); smart_str_appendc(buf, '\''); |