diff options
| author | Nikita Popov <nikic@php.net> | 2014-09-21 20:47:07 +0200 |
|---|---|---|
| committer | Nikita Popov <nikic@php.net> | 2014-09-21 20:58:31 +0200 |
| commit | a770d29df74515197c76efdf1a64d9794c27b4af (patch) | |
| tree | d57e1d6237eace03ca05d459ec8aecbca2b89457 /ext/standard/var.c | |
| parent | 2a7de9fdbba28152fadcdddc2b731d319405e106 (diff) | |
| download | php-git-a770d29df74515197c76efdf1a64d9794c27b4af.tar.gz | |
Add smart_str_append for appending zend_strings
Also replaces usages in Zend/ and ext/standard
Diffstat (limited to 'ext/standard/var.c')
| -rw-r--r-- | ext/standard/var.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/ext/standard/var.c b/ext/standard/var.c index 88a8f9ebe0..f9d897a4ec 100644 --- a/ext/standard/var.c +++ b/ext/standard/var.c @@ -413,7 +413,7 @@ static void php_array_element_export(zval *zv, zend_ulong index, zend_string *ke buffer_append_spaces(buf, level + 1); smart_str_appendc(buf, '\''); - smart_str_appendl(buf, tmp_str->val, tmp_str->len); + smart_str_append(buf, tmp_str); smart_str_appendl(buf, "' => ", 5); zend_string_free(ckey); @@ -438,7 +438,7 @@ static void php_object_element_export(zval *zv, zend_ulong index, zend_string *k pname_esc = php_addcslashes(prop_name, prop_name_len, 0, "'\\", 2 TSRMLS_CC); smart_str_appendc(buf, '\''); - smart_str_appendl(buf, pname_esc->val, pname_esc->len); + smart_str_append(buf, pname_esc); smart_str_appendc(buf, '\''); zend_string_release(pname_esc); } else { @@ -486,7 +486,7 @@ again: ztmp2 = php_str_to_str_ex(ztmp->val, ztmp->len, "\0", 1, "' . \"\\0\" . '", 12, 0, NULL); smart_str_appendc(buf, '\''); - smart_str_appendl(buf, ztmp2->val, ztmp2->len); + smart_str_append(buf, ztmp2); smart_str_appendc(buf, '\''); zend_string_free(ztmp); @@ -535,7 +535,7 @@ again: } class_name = Z_OBJ_HANDLER_P(struc, get_class_name)(Z_OBJ_P(struc), 0 TSRMLS_CC); - smart_str_appendl(buf, class_name->val, class_name->len); + smart_str_append(buf, class_name); smart_str_appendl(buf, "::__set_state(array(\n", 21); zend_string_release(class_name); @@ -675,7 +675,7 @@ static inline zend_bool php_var_serialize_class_name(smart_str *buf, zval *struc smart_str_appendl(buf, "O:", 2); smart_str_append_unsigned(buf, class_name->len); smart_str_appendl(buf, ":\"", 2); - smart_str_appendl(buf, class_name->val, class_name->len); + smart_str_append(buf, class_name); smart_str_appendl(buf, "\":", 2); PHP_CLEANUP_CLASS_ATTRIBUTES(); return incomplete_class; @@ -859,7 +859,7 @@ again: smart_str_appendl(buf, "C:", 2); smart_str_append_unsigned(buf, Z_OBJCE_P(struc)->name->len); smart_str_appendl(buf, ":\"", 2); - smart_str_appendl(buf, Z_OBJCE_P(struc)->name->val, Z_OBJCE_P(struc)->name->len); + smart_str_append(buf, Z_OBJCE_P(struc)->name); smart_str_appendl(buf, "\":", 2); smart_str_append_unsigned(buf, serialized_length); |