svn: /php/php-src/trunk/ext/json/ JSON_parser.h php_json.h

pollita Fri, 21 May 2010 23:29:34 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=299606 Log: Ooops, return values... Changed paths: U php/php-src/trunk/ext/json/JSON_parser.h U php/php-src/trunk/ext/json/php_json.h Modified: php/php-src/trunk/ext/json/JSON_parser.h =================================================================== --- php/php-src/trunk/ext/json/JSON_parser.h 2010-05-21 22:59:58 UTC (rev 299605) +++ php/php-src/trunk/ext/json/JSON_parser.h 2010-05-21 23:29:34 UTC (rev 299606) @@ -34,7 +34,7 @@ static inline int parse_JSON(JSON_parser jp, zval *z, unsigned short utf16_json[], int length, int assoc TSRMLS_DC) { - parse_JSON_ex(jp, z, utf16_json, length, assoc ? PHP_JSON_OBJECT_AS_ARRAY : 0 TSRMLS_CC); + return parse_JSON_ex(jp, z, utf16_json, length, assoc ? PHP_JSON_OBJECT_AS_ARRAY : 0 TSRMLS_CC); } #endif Modified: php/php-src/trunk/ext/json/php_json.h =================================================================== --- php/php-src/trunk/ext/json/php_json.h 2010-05-21 22:59:58 UTC (rev 299605) +++ php/php-src/trunk/ext/json/php_json.h 2010-05-21 23:29:34 UTC (rev 299606) @@ -68,7 +68,7 @@ #define PHP_JSON_OBJECT_AS_ARRAY (1<<0) #define PHP_JSON_BIGINT_AS_STRING (1<<1) -static inline php_json_decode(zval *return_value, char *str, int str_len, zend_bool assoc, long depth TSRMLS_DC) +static inline void php_json_decode(zval *return_value, char *str, int str_len, zend_bool assoc, long depth TSRMLS_DC) { php_json_decode_ex(return_value, str, str_len, assoc ? PHP_JSON_OBJECT_AS_ARRAY : 0, depth TSRMLS_CC); }