summaryrefslogtreecommitdiff
path: root/ext/json/json.c
diff options
context:
space:
mode:
authorAntony Dovgal <tony2001@php.net>2006-07-20 07:40:49 +0000
committerAntony Dovgal <tony2001@php.net>2006-07-20 07:40:49 +0000
commit074feedc2b6f2414603fa59b1584b3b95682e3f2 (patch)
treedcb3c8c358d2557f8d700bf3e1c24da6fbcf875c /ext/json/json.c
parent926961192fb1b439fe7e4e5f6226e9f7de2523f1 (diff)
downloadphp-git-074feedc2b6f2414603fa59b1584b3b95682e3f2.tar.gz
MFH
Diffstat (limited to 'ext/json/json.c')
-rw-r--r--ext/json/json.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/ext/json/json.c b/ext/json/json.c
index 30c394cce6..0df5017e44 100644
--- a/ext/json/json.c
+++ b/ext/json/json.c
@@ -82,7 +82,7 @@ PHP_MINFO_FUNCTION(json)
/* }}} */
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 @@ static void json_encode_array(smart_str *buf, zval **val TSRMLS_DC) {
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 @@ static void json_encode_array(smart_str *buf, zval **val TSRMLS_DC) {
#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 @@ static void json_encode_r(smart_str *buf, zval *val TSRMLS_DC) {
}
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: