diff options
| author | Stanislav Malyshev <stas@php.net> | 2008-11-25 22:15:22 +0000 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2008-11-25 22:15:22 +0000 |
| commit | 2016a84cae4e5a13e2996dbec0cea7100b08e079 (patch) | |
| tree | bd3de929ff1ceb2d45d9b2897dbf5c72ff1f01fb | |
| parent | b2cd1a717a13a963633c58c4bd451197b2c8426d (diff) | |
| download | php-git-2016a84cae4e5a13e2996dbec0cea7100b08e079.tar.gz | |
cleanup
| -rw-r--r-- | Zend/zend_API.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/Zend/zend_API.c b/Zend/zend_API.c index 0b505d933a..324902d0fb 100644 --- a/Zend/zend_API.c +++ b/Zend/zend_API.c @@ -295,7 +295,7 @@ static char *zend_parse_arg_impl(int arg_num, zval **arg, va_list *va, char **sp { char *spec_walk = *spec; char c = *spec_walk++; - int return_null = 0, obj_array = 0; + int return_null = 0; /* scan through modifiers */ while (1) { @@ -452,7 +452,6 @@ static char *zend_parse_arg_impl(int arg_num, zval **arg, va_list *va, char **sp } break; case 'A': - obj_array = 1; case 'a': { zval **p = va_arg(*va, zval **); @@ -460,7 +459,7 @@ static char *zend_parse_arg_impl(int arg_num, zval **arg, va_list *va, char **sp *p = NULL; break; } - if (Z_TYPE_PP(arg) == IS_ARRAY || (Z_TYPE_PP(arg) == IS_OBJECT && obj_array != 0)) { + if (Z_TYPE_PP(arg) == IS_ARRAY || (c == 'A' && Z_TYPE_PP(arg) == IS_OBJECT)) { *p = *arg; } else { return "array"; @@ -468,7 +467,6 @@ static char *zend_parse_arg_impl(int arg_num, zval **arg, va_list *va, char **sp } break; case 'H': - obj_array = 1; case 'h': { HashTable **p = va_arg(*va, HashTable **); @@ -478,7 +476,7 @@ static char *zend_parse_arg_impl(int arg_num, zval **arg, va_list *va, char **sp } if (Z_TYPE_PP(arg) == IS_ARRAY) { *p = Z_ARRVAL_PP(arg); - } else if(obj_array && Z_TYPE_PP(arg) == IS_OBJECT) { + } else if(c == 'H' && Z_TYPE_PP(arg) == IS_OBJECT) { *p = HASH_OF(*arg); if(*p == NULL) { return "array"; |