diff options
| author | Pierre Joye <pierre.php@gmail.com> | 2014-05-13 08:08:25 +0200 |
|---|---|---|
| committer | Pierre Joye <pierre.php@gmail.com> | 2014-05-13 08:08:25 +0200 |
| commit | 1b89df4925d34b883013d3d857a6131457d39225 (patch) | |
| tree | c4d81ed18861d14b47a554b70539c73b36e28130 /Zend/zend_API.c | |
| parent | 11caa1d7b49a1fb13afef0967dee926b7db40837 (diff) | |
| parent | 075a6ced0a3cd91014ab28272a120eca660e31fa (diff) | |
| download | php-git-1b89df4925d34b883013d3d857a6131457d39225.tar.gz | |
Merge branch 'phpng' of git.php.net:php-src into phpng
# By Xinchen Hui
# Via Xinchen Hui
* 'phpng' of git.php.net:php-src:
Save one type checking if the type is already string
This should be removed too
Remove zval **
Diffstat (limited to 'Zend/zend_API.c')
| -rw-r--r-- | Zend/zend_API.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Zend/zend_API.c b/Zend/zend_API.c index 6ef4c0b467..f1e9614a22 100644 --- a/Zend/zend_API.c +++ b/Zend/zend_API.c @@ -480,12 +480,12 @@ static const char *zend_parse_arg_impl(int arg_num, zval *arg, va_list *va, cons } /* break omitted intentionally */ - case IS_STRING: case IS_LONG: case IS_DOUBLE: case IS_FALSE: case IS_TRUE: convert_to_string_ex(arg); + case IS_STRING: if (UNEXPECTED(Z_ISREF_P(arg))) { /* it's dangerous to return pointers to string buffer of referenced variable, because it can @@ -527,12 +527,12 @@ static const char *zend_parse_arg_impl(int arg_num, zval *arg, va_list *va, cons } /* break omitted intentionally */ - case IS_STRING: case IS_LONG: case IS_DOUBLE: case IS_FALSE: case IS_TRUE: convert_to_string_ex(arg); + case IS_STRING: if (UNEXPECTED(Z_ISREF_P(arg))) { /* it's dangerous to return pointers to string buffer of referenced variable, because it can |