com php-src: Make all code paths in json_determine_array_ type() return constants.: ext/json/json.c
| From: | Adam Harvey | Date: | Sat, 09 Nov 2013 17:15:37 +0000 |
| Subject: | com php-src: Make all code paths in json_determine_array_ type() return constants.: ext/json/json.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-73914@lists.php.net to get a copy of this message | ||
Commit: 90d4ae4da8f5a81e136cad26d9612a8f78d14f2d
Author: Adam Harvey <aharvey@php.net> Sat, 9 Nov 2013 12:15:37 -0500
Parents: 43cb6ba7639aacf08f5e6a46428b12f5df303f6f
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=90d4ae4da8f5a81e136cad26d9612a8f78d14f2d
Log:
Make all code paths in json_determine_array_type() return constants.
This is a purely cosmetic change, but the current behaviour of returning
PHP_JSON_OUTPUT_ARRAY and 1 looks weird.
Changed paths:
M ext/json/json.c
Diff:
diff --git a/ext/json/json.c b/ext/json/json.c
index 782375e..90ca50d 100644
--- a/ext/json/json.c
+++ b/ext/json/json.c
@@ -190,10 +190,10 @@ static int json_determine_array_type(zval **val TSRMLS_DC) /* {{{ */
}
if (i == HASH_KEY_IS_STRING) {
- return 1;
+ return PHP_JSON_OUTPUT_OBJECT;
} else {
if (index != idx) {
- return 1;
+ return PHP_JSON_OUTPUT_OBJECT;
}
}
idx++;