nlopess Tue Dec 19 15:01:05 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/json json.c
Log:
remove NOP code in json_determine_array_type(), as we already know the zval
passed is an array (based on patch by Ron Korving)
http://cvs.php.net/viewvc.cgi/php-src/ext/json/json.c?r1=1.9.2.7&r2=1.9.2.8&diff_format=u
Index: php-src/ext/json/json.c
diff -u php-src/ext/json/json.c:1.9.2.7 php-src/ext/json/json.c:1.9.2.8
--- php-src/ext/json/json.c:1.9.2.7 Fri Nov 3 13:16:33 2006
+++ php-src/ext/json/json.c Tue Dec 19 15:01:05 2006
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: json.c,v 1.9.2.7 2006/11/03 13:16:33 iliaa Exp $ */
+/* $Id: json.c,v 1.9.2.8 2006/12/19 15:01:05 nlopess Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -91,14 +91,7 @@
static int json_determine_array_type(zval **val TSRMLS_DC) {
int i;
- HashTable *myht;
-
- if (Z_TYPE_PP(val) == IS_ARRAY) {
- myht = HASH_OF(*val);
- } else {
- myht = Z_OBJPROP_PP(val);
- return 1;
- }
+ HashTable *myht = HASH_OF(*val);
i = myht ? zend_hash_num_elements(myht) : 0;
if (i > 0) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
