diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2014-02-18 16:28:26 +0400 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2014-02-18 16:28:26 +0400 |
| commit | 9ddf3c57805f0bb76a26cb31ba33e64c04d2133c (patch) | |
| tree | 15b04b41c0ebbbc4d94ae96e1929410f657817e1 /ext/standard/string.c | |
| parent | 5de7115679522dec2f4725104c6f8c6e4a7bd8e4 (diff) | |
| parent | 43b03c74b322d6ceb003a14a7561fdffc4e13072 (diff) | |
| download | php-git-9ddf3c57805f0bb76a26cb31ba33e64c04d2133c.tar.gz | |
Merge branch 'refactoring2' of github.com:zend-dev/php into refactoring2
Diffstat (limited to 'ext/standard/string.c')
| -rw-r--r-- | ext/standard/string.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/ext/standard/string.c b/ext/standard/string.c index b0100f676f..a0523851c6 100644 --- a/ext/standard/string.c +++ b/ext/standard/string.c @@ -1201,9 +1201,8 @@ PHPAPI void php_implode(zval *delim, zval *arr, zval *return_value TSRMLS_DC) } smart_str_0(&implstr); - if (implstr.len) { -//??? RETURN_STRINGL(implstr.c, implstr.len, 0); - RETURN_STRINGL(implstr.c, implstr.len); + if (implstr.s) { + RETURN_STR(implstr.s); } else { smart_str_free(&implstr); RETURN_EMPTY_STRING(); @@ -3069,10 +3068,9 @@ end_outer_loop: ; smart_str_appendl(&result, &S(text)[nextwpos], L(text) - nextwpos); - if (result.c != NULL) { + if (result.s) { smart_str_0(&result); -//??? RETVAL_STRINGL(result.c, result.len, 0); - RETVAL_STRINGL(result.c, result.len); + RETURN_STR(result.s); } else { RETURN_EMPTY_STRING(); } |