[PHP-CVS] cvs: php-src(PHP_5_3) /ext/json json.c

[Dmitry Stogov]

dmitry          Wed Jan 30 08:10:17 2008 UTC

  Modified files:              (Branch: PHP_5_3)
    /php-src/ext/json   json.c 
  Log:
  ZTS fix
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/json/json.c?r1=1.9.2.19.2.5&r2=1.9.2.19.2.6&diff_format=u
Index: php-src/ext/json/json.c
diff -u php-src/ext/json/json.c:1.9.2.19.2.5 
php-src/ext/json/json.c:1.9.2.19.2.6
--- php-src/ext/json/json.c:1.9.2.19.2.5        Wed Jan 30 03:17:57 2008
+++ php-src/ext/json/json.c     Wed Jan 30 08:10:17 2008
@@ -16,7 +16,7 @@
   +----------------------------------------------------------------------+
 */
 
-/* $Id: json.c,v 1.9.2.19.2.5 2008/01/30 03:17:57 stas Exp $ */
+/* $Id: json.c,v 1.9.2.19.2.6 2008/01/30 08:10:17 dmitry Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -102,7 +102,7 @@
 /* }}} */
 
 static void json_encode_r(smart_str *buf, zval *val, int options TSRMLS_DC);
-static void json_escape_string(smart_str *buf, char *s, int len, int options);
+static void json_escape_string(smart_str *buf, char *s, int len, int options 
TSRMLS_DC);
 
 static int json_determine_array_type(zval **val TSRMLS_DC)  /* {{{ */
 {
@@ -208,7 +208,7 @@
                             need_comma = 1;
                         }
 
-                        json_escape_string(buf, key, key_len - 1, options);
+                        json_escape_string(buf, key, key_len - 1, options 
TSRMLS_CC);
                         smart_str_appendc(buf, ':');
 
                         json_encode_r(buf, *data, options TSRMLS_CC);
@@ -248,7 +248,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, int options) 
/* {{{ */
+static void json_escape_string(smart_str *buf, char *s, int len, int options 
TSRMLS_DC) /* {{{ */
 {
     int pos = 0;
     unsigned short us;
@@ -433,7 +433,7 @@
             }
             break;
         case IS_STRING:
-            json_escape_string(buf, Z_STRVAL_P(val), Z_STRLEN_P(val), options);
+            json_escape_string(buf, Z_STRVAL_P(val), Z_STRLEN_P(val), options 
TSRMLS_CC);
             break;
         case IS_ARRAY:
         case IS_OBJECT:

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php