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

[Dmitry Stogov]

dmitry          Wed Jan 30 08:10:28 2008 UTC

  Modified files:              
    /php-src/ext/json   json.c 
  Log:
  ZTS fix
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/json/json.c?r1=1.34&r2=1.35&diff_format=u
Index: php-src/ext/json/json.c
diff -u php-src/ext/json/json.c:1.34 php-src/ext/json/json.c:1.35
--- php-src/ext/json/json.c:1.34        Wed Jan 30 03:21:30 2008
+++ php-src/ext/json/json.c     Wed Jan 30 08:10:28 2008
@@ -16,7 +16,7 @@
   +----------------------------------------------------------------------+
 */
 
-/* $Id: json.c,v 1.34 2008/01/30 03:21:30 stas Exp $ */
+/* $Id: json.c,v 1.35 2008/01/30 08:10:28 dmitry Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -97,7 +97,7 @@
 /* }}} */
 
 static void json_encode_r(smart_str *buf, zval *val, int options TSRMLS_DC);
-static void json_escape_string(smart_str *buf, zstr s, int len, zend_uchar 
type, int options);
+static void json_escape_string(smart_str *buf, zstr s, int len, zend_uchar 
type, int options TSRMLS_DC);
 
 static int json_determine_array_type(zval **val TSRMLS_DC) /* {{{ */
 {
@@ -205,7 +205,7 @@
                                                        need_comma = 1;
                                                }
 
-                                               json_escape_string(buf, key, 
key_len - 1, (i==HASH_KEY_IS_UNICODE)?IS_UNICODE:IS_STRING, options);
+                                               json_escape_string(buf, key, 
key_len - 1, (i==HASH_KEY_IS_UNICODE)?IS_UNICODE:IS_STRING, options TSRMLS_CC);
                                                smart_str_appendc(buf, ':');
 
                                                json_encode_r(buf, *data, 
options TSRMLS_CC);
@@ -245,7 +245,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, zstr s, int len, zend_uchar 
type, int options) /* {{{ */
+static void json_escape_string(smart_str *buf, zstr s, int len, zend_uchar 
type, int options TSRMLS_DC) /* {{{ */
 {
        int pos = 0;
        unsigned short us;
@@ -437,7 +437,7 @@
                        break;
                case IS_STRING:
                case IS_UNICODE:
-                       json_escape_string(buf, Z_UNIVAL_P(val), 
Z_UNILEN_P(val), Z_TYPE_P(val), options);
+                       json_escape_string(buf, Z_UNIVAL_P(val), 
Z_UNILEN_P(val), Z_TYPE_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