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/string.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/string.c')
| -rw-r--r-- | ext/standard/string.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/ext/standard/string.c b/ext/standard/string.c index b49192b1b7..dcd6f09a9c 100644 --- a/ext/standard/string.c +++ b/ext/standard/string.c @@ -1150,7 +1150,7 @@ PHPAPI void php_implode(zval *delim, zval *arr, zval *return_value TSRMLS_DC) again: switch (Z_TYPE_P(tmp)) { case IS_STRING: - smart_str_appendl(&implstr, Z_STRVAL_P(tmp), Z_STRLEN_P(tmp)); + smart_str_append(&implstr, Z_STR_P(tmp)); break; case IS_LONG: @@ -1179,14 +1179,14 @@ again: default: str = zval_get_string(tmp); - smart_str_appendl(&implstr, str->val, str->len); + smart_str_append(&implstr, str); zend_string_release(str); break; } if (++i != numelems) { - smart_str_appendl(&implstr, Z_STRVAL_P(delim), Z_STRLEN_P(delim)); + smart_str_append(&implstr, Z_STR_P(delim)); } } ZEND_HASH_FOREACH_END(); @@ -2907,7 +2907,7 @@ static void php_strtr_array(zval *return_value, char *str, size_t slen, HashTabl entry = zend_hash_str_find(pats, key, len); if (entry != NULL) { zend_string *str = zval_get_string(entry); - smart_str_appendl(&result, str->val, str->len); + smart_str_append(&result, str); pos += len; found = 1; zend_string_release(str); @@ -2932,7 +2932,7 @@ static void php_strtr_array(zval *return_value, char *str, size_t slen, HashTabl entry = zend_hash_str_find(pats, key, len); if (entry != NULL) { zend_string *str = zval_get_string(entry); - smart_str_appendl(&result, str->val, str->len); + smart_str_append(&result, str); pos += len; found = 1; zend_string_release(str); |