cleanup

smalyshev · smalyshev · commit 2016a84cae4e · 2008-11-25T22:15:22.000Z
diff --git 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,23 +452,21 @@ 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 **);
 				if (return_null) {
 					*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";
 				}
 			}
 			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";

Original file line number	Diff line number	Diff line change
`@@ -295,7 +295,7 @@ static char zend_parse_arg_impl(int arg_num, zval arg, va_list va, char **sp`
`295`	`295`	`{`
`296`	`296`	`char spec_walk = spec;`
`297`	`297`	`char c = *spec_walk++;`
`298`		`- int return_null = 0, obj_array = 0;`
	`298`	`+ int return_null = 0;`
`299`	`299`
`300`	`300`	`/* scan through modifiers */`
`301`	`301`	`while (1) {`
`@@ -452,23 +452,21 @@ static char zend_parse_arg_impl(int arg_num, zval arg, va_list va, char **sp`
`452`	`452`	`}`
`453`	`453`	`break;`
`454`	`454`	`case 'A':`
`455`		`- obj_array = 1;`
`456`	`455`	`case 'a':`
`457`	`456`	`{`
`458`	`457`	`zval *p = va_arg(va, zval **);`
`459`	`458`	`if (return_null) {`
`460`	`459`	`*p = NULL;`
`461`	`460`	`break;`
`462`	`461`	`}`
`463`		`- if (Z_TYPE_PP(arg) == IS_ARRAY \|\| (Z_TYPE_PP(arg) == IS_OBJECT && obj_array != 0)) {`
	`462`	`+ if (Z_TYPE_PP(arg) == IS_ARRAY \|\| (c == 'A' && Z_TYPE_PP(arg) == IS_OBJECT)) {`
`464`	`463`	`p = arg;`
`465`	`464`	`} else {`
`466`	`465`	`return "array";`
`467`	`466`	`}`
`468`	`467`	`}`
`469`	`468`	`break;`
`470`	`469`	`case 'H':`
`471`		`- obj_array = 1;`
`472`	`470`	`case 'h':`
`473`	`471`	`{`
`474`	`472`	`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`
`478`	`476`	`}`
`479`	`477`	`if (Z_TYPE_PP(arg) == IS_ARRAY) {`
`480`	`478`	`*p = Z_ARRVAL_PP(arg);`
`481`		`- } else if(obj_array && Z_TYPE_PP(arg) == IS_OBJECT) {`
	`479`	`+ } else if(c == 'H' && Z_TYPE_PP(arg) == IS_OBJECT) {`
`482`	`480`	`p = HASH_OF(arg);`
`483`	`481`	`if(*p == NULL) {`
`484`	`482`	`return "array";`