From: Rasmus Lerdorf <rasmus@php.net>
Date: Wed, 7 Dec 2005 09:12:39 +0000 (+0000)
Subject: A few cleanups.  I hope you don't mind Omar.
X-Git-Tag: RELEASE_1_0_4~495
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9e45839ada5f2cd8071cd7ae82f810e38a350dc6;p=php

A few cleanups.  I hope you don't mind Omar.
---

diff --git a/ext/json/json.c b/ext/json/json.c
index 001c5844ee..e7fa452471 100644
--- a/ext/json/json.c
+++ b/ext/json/json.c
@@ -51,10 +51,10 @@ zend_module_entry json_module_entry = {
 #endif
 	"json",
 	json_functions,
-	PHP_MINIT(json),
-	PHP_MSHUTDOWN(json),
-	PHP_RINIT(json),
-	PHP_RSHUTDOWN(json),
+	NULL,
+	NULL,
+	NULL,
+	NULL,
 	PHP_MINFO(json),
 #if ZEND_MODULE_API_NO >= 20010901
 	PHP_JSON_VERSION,
@@ -67,38 +67,6 @@ zend_module_entry json_module_entry = {
 ZEND_GET_MODULE(json)
 #endif
 
-/* {{{ PHP_MINIT_FUNCTION
- */
-PHP_MINIT_FUNCTION(json)
-{
-	return SUCCESS;
-}
-/* }}} */
-
-/* {{{ PHP_MSHUTDOWN_FUNCTION
- */
-PHP_MSHUTDOWN_FUNCTION(json)
-{
-	return SUCCESS;
-}
-/* }}} */
-
-/* {{{ PHP_RINIT_FUNCTION
- */
-PHP_RINIT_FUNCTION(json)
-{
-	return SUCCESS;
-}
-/* }}} */
-
-/* {{{ PHP_RSHUTDOWN_FUNCTION
- */
-PHP_RSHUTDOWN_FUNCTION(json)
-{
-	return SUCCESS;
-}
-/* }}} */
-
 /* {{{ PHP_MINFO_FUNCTION
  */
 PHP_MINFO_FUNCTION(json)
@@ -113,10 +81,9 @@ PHP_MINFO_FUNCTION(json)
 
 static struct json_object *json_encode_r(zval *val);
 
-static int json_determine_array_type(zval **val) {
+static int json_determine_array_type(zval **val TSRMLS_DC) {
     int i;
     HashTable *myht;
-    TSRMLS_FETCH();
   
     if (Z_TYPE_PP(val) == IS_ARRAY) {
         myht = HASH_OF(*val);
@@ -153,15 +120,14 @@ static int json_determine_array_type(zval **val) {
     return 0;
 }
 
-static struct json_object *json_encode_array(zval **val) {
+static struct json_object *json_encode_array(zval **val TSRMLS_DC) {
     int i, r;
     HashTable *myht;
     struct json_object *obj;
-    TSRMLS_FETCH();
   
     if (Z_TYPE_PP(val) == IS_ARRAY) {
         myht = HASH_OF(*val);
-        r = json_determine_array_type(val);
+        r = json_determine_array_type(val TSRMLS_CC);
     } else {
         myht = Z_OBJPROP_PP(val);
         r = 1;
@@ -236,10 +202,10 @@ static struct json_object *json_encode_r(zval *val) {
             jo = json_object_new_string_len(Z_STRVAL_P(val), Z_STRLEN_P(val));
             break;
         case IS_ARRAY:
-            jo = json_encode_array(&val);
+            jo = json_encode_array(&val TSRMLS_CC);
             break;
         case IS_OBJECT:
-            jo = json_encode_array(&val);
+            jo = json_encode_array(&val TSRMLS_CC);
             break;
         default:
             zend_error(E_WARNING, "[json] (json_encode) type is unsupported\n");
@@ -250,7 +216,7 @@ static struct json_object *json_encode_r(zval *val) {
     return jo;
 }
 
-ZEND_FUNCTION(json_encode)
+PHP_FUNCTION(json_encode)
 {
     zval *parameter;
     struct json_object *jo;
@@ -269,9 +235,8 @@ ZEND_FUNCTION(json_encode)
     RETURN_STRING(s, 0);
 }
 
-static zval *json_decode_r(struct json_object *jo, zend_bool assoc) {
+static zval *json_decode_r(struct json_object *jo, zend_bool assoc TSRMLS_DC) {
     zval *return_value;
-    TSRMLS_FETCH();
 
     MAKE_STD_ZVAL(return_value);
 
@@ -297,7 +262,7 @@ static zval *json_decode_r(struct json_object *jo, zend_bool assoc) {
 		
         json_object_object_foreachC(jo, iter) {
           if (iter.val) {
-            mval = json_decode_r(iter.val, assoc);
+            mval = json_decode_r(iter.val, assoc TSRMLS_CC);
           } else {
             MAKE_STD_ZVAL(mval);
             ZVAL_NULL(mval);
@@ -324,7 +289,7 @@ static zval *json_decode_r(struct json_object *jo, zend_bool assoc) {
         for (i = 0; i < l; i++) {
           val = json_object_array_get_idx(jo, i);
           if (val) {
-            mval = json_decode_r(val, assoc);
+            mval = json_decode_r(val, assoc TSRMLS_CC);
           } else {
             MAKE_STD_ZVAL(mval);
             ZVAL_NULL(mval);
@@ -347,7 +312,7 @@ static zval *json_decode_r(struct json_object *jo, zend_bool assoc) {
     return return_value;
 }
 
-ZEND_FUNCTION(json_decode)
+PHP_FUNCTION(json_decode)
 {
     char *parameter;
     int parameter_len;
@@ -364,7 +329,7 @@ ZEND_FUNCTION(json_decode)
       RETURN_NULL();
     }
 
-    z = json_decode_r(jo, assoc);
+    z = json_decode_r(jo, assoc TSRMLS_CC);
     if (!z) {
         RETURN_NULL();
     }
diff --git a/ext/json/json_c/config.h b/ext/json/json_c/config.h
deleted file mode 100644
index a69a281179..0000000000
--- a/ext/json/json_c/config.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "/home/omar/clean/php-json-ext-1.1.0/config.h"
diff --git a/ext/json/php_json.h b/ext/json/php_json.h
index b9f6321ca3..60ca42c956 100644
--- a/ext/json/php_json.h
+++ b/ext/json/php_json.h
@@ -33,10 +33,6 @@ extern zend_module_entry json_module_entry;
 #include "TSRM.h"
 #endif
 
-PHP_MINIT_FUNCTION(json);
-PHP_MSHUTDOWN_FUNCTION(json);
-PHP_RINIT_FUNCTION(json);
-PHP_RSHUTDOWN_FUNCTION(json);
 PHP_MINFO_FUNCTION(json);
 
 PHP_FUNCTION(json_encode);