tony2001 Thu Jul 20 07:40:49 2006 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/json json.c Log: MFH http://cvs.php.net/viewvc.cgi/php-src/ext/json/json.c?r1=1.9.2.1&r2=1.9.2.2&diff_format=u Index: php-src/ext/json/json.c diff -u php-src/ext/json/json.c:1.9.2.1 php-src/ext/json/json.c:1.9.2.2 --- php-src/ext/json/json.c:1.9.2.1 Wed Jul 19 16:17:15 2006 +++ php-src/ext/json/json.c Thu Jul 20 07:40:49 2006 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: json.c,v 1.9.2.1 2006/07/19 16:17:15 iliaa Exp $ */ +/* $Id: json.c,v 1.9.2.2 2006/07/20 07:40:49 tony2001 Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -82,7 +82,7 @@ /* }}} */ static void json_encode_r(smart_str *buf, zval *val TSRMLS_DC); -static void json_escape_string(smart_str *buf, char *s, int len TSRMLS_DC); +static void json_escape_string(smart_str *buf, char *s, int len); static int json_determine_array_type(zval **val TSRMLS_DC) { int i; @@ -181,7 +181,7 @@ need_comma = 1; } - json_escape_string(buf, key, key_len - 1 TSRMLS_CC); + json_escape_string(buf, key, key_len - 1); smart_str_appendc(buf, ':'); json_encode_r(buf, *data TSRMLS_CC); @@ -216,7 +216,7 @@ #define REVERSE16(us) (((us & 0xf) << 12) | (((us >> 4) & 0xf) << 8) | (((us >> 8) & 0xf) << 4) | ((us >> 12) & 0xf)) -static void json_escape_string(smart_str *buf, char *s, int len TSRMLS_DC) +static void json_escape_string(smart_str *buf, char *s, int len) { int pos = 0; unsigned short us; @@ -359,7 +359,7 @@ } break; case IS_STRING: - json_escape_string(buf, Z_STRVAL_P(val), Z_STRLEN_P(val) TSRMLS_CC); + json_escape_string(buf, Z_STRVAL_P(val), Z_STRLEN_P(val)); break; case IS_ARRAY: case IS_OBJECT:
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php