More TSRMLS_FETCH annihilation (Zend compatibility patch)

diff --git a/ext/com/COM.c b/ext/com/COM.c
index 51d953c9c4b8e40edb4070ea59749b0ed2ada4b0..c10865cdd85e555556653df81ffe3c7ce92bc2de 100644 (file)
--- a/ext/com/COM.c
+++ b/ext/com/COM.c
@@ -1150,6 +1150,7 @@ PHPAPI pval php_COM_get_property_handler(zend_property_reference *property_refer
        int type;
        comval *obj, *obj_prop;
        VARIANT *var_result;
+       TSRMLS_FETCH();
 
        INIT_ZVAL(return_value);    
        ZVAL_NULL(&return_value);
@@ -1243,7 +1244,7 @@ PHPAPI int php_COM_set_property_handler(zend_property_reference *property_refere
        comval *obj;
        int type;
        VARIANT var_result;
-
+       TSRMLS_FETCH();
 
        /* fetch the IDispatch interface */
        zend_hash_index_find(Z_OBJPROP_P(object), 0, (void **) &comval_handle);
@@ -1632,7 +1633,7 @@ static int php_COM_load_typelib(ITypeLib *TypeLib, int mode)
                                {
                                        /* Oops, it already exists. No problem if it is defined as the same value */
                                        /* Check to see if they are the same */
-                                       if (!compare_function(&results, &c.value, &exists) && INI_INT("com.autoregister_verbose"))
+                                       if (!compare_function(&results, &c.value, &exists TSRMLS_CC) && INI_INT("com.autoregister_verbose"))
                                        {
                                                php_error(E_WARNING,"Type library value %s is already defined and has a different value", c.name);
                                        }

diff --git a/ext/com/VARIANT.c b/ext/com/VARIANT.c
index cc79171167b3c5c4f88c92bac43a5f525809e2e9..af435bacbd56362ceff86bd8441a6496536bec15 100644 (file)
--- a/ext/com/VARIANT.c
+++ b/ext/com/VARIANT.c
@@ -179,6 +179,7 @@ pval php_VARIANT_get_property_handler(zend_property_reference *property_referenc
 {
        zend_overloaded_element *overloaded_property;
        int type;
+       TSRMLS_FETCH();
 
        pval result, **var_handle, *object = property_reference->object;
        VARIANT *var_arg;
@@ -231,6 +232,7 @@ int php_VARIANT_set_property_handler(zend_property_reference *property_reference
 {
        zend_overloaded_element *overloaded_property;
        int type;
+       TSRMLS_FETCH();
 
        pval **var_handle, *object = property_reference->object;
        VARIANT *var_arg;

diff --git a/ext/com/conversion.c b/ext/com/conversion.c
index 519c3b95e2fc1a365c8697d0125ca790a6a13deb..8f7e80a9c6209fda7988104270c0af49bfc67e64 100644 (file)
--- a/ext/com/conversion.c
+++ b/ext/com/conversion.c
@@ -37,17 +37,17 @@
 
 /* prototypes */
 
-PHPAPI void php_pval_to_variant(pval *pval_arg, VARIANT *var_arg, int codepage);
-PHPAPI void php_pval_to_variant_ex(pval *pval_arg, VARIANT *var_arg, pval *pval_type, int codepage);
+PHPAPI void php_pval_to_variant(pval *pval_arg, VARIANT *var_arg, int codepage TSRMLS_DC);
+PHPAPI void php_pval_to_variant_ex(pval *pval_arg, VARIANT *var_arg, pval *pval_type, int codepage TSRMLS_DC);
 PHPAPI int php_variant_to_pval(VARIANT *var_arg, pval *pval_arg, int persistent, int codepage);
 PHPAPI OLECHAR *php_char_to_OLECHAR(char *C_str, uint strlen, int codepage);
 PHPAPI char *php_OLECHAR_to_char(OLECHAR *unicode_str, uint *out_length, int persistent, int codepage);
 
-static void pval_to_variant_ex(pval *pval_arg, VARIANT *var_arg, int type, int codepage);
-static void comval_to_variant(pval *pval_arg, VARIANT *var_arg);
+static void pval_to_variant_ex(pval *pval_arg, VARIANT *var_arg, int type, int codepage TSRMLS_DC);
+static void comval_to_variant(pval *pval_arg, VARIANT *var_arg TSRMLS_DC);
 
 /* implementations */
-PHPAPI void php_pval_to_variant(pval *pval_arg, VARIANT *var_arg, int codepage)
+PHPAPI void php_pval_to_variant(pval *pval_arg, VARIANT *var_arg, int codepage TSRMLS_DC)
 {
        int type = VT_EMPTY;    /* default variant type */
        
@@ -100,15 +100,15 @@ PHPAPI void php_pval_to_variant(pval *pval_arg, VARIANT *var_arg, int codepage)
                type |= VT_BYREF;
        }
 
-       pval_to_variant_ex(pval_arg, var_arg, type, codepage);
+       pval_to_variant_ex(pval_arg, var_arg, type, codepage TSRMLS_CC);
 }
 
-PHPAPI void php_pval_to_variant_ex(pval *pval_arg, VARIANT *var_arg, pval *pval_type, int codepage)
+PHPAPI void php_pval_to_variant_ex(pval *pval_arg, VARIANT *var_arg, pval *pval_type, int codepage TSRMLS_DC)
 {
-       pval_to_variant_ex(pval_arg, var_arg, Z_LVAL_P(pval_type), codepage);
+       pval_to_variant_ex(pval_arg, var_arg, Z_LVAL_P(pval_type), codepage TSRMLS_CC);
 }
 
-static void pval_to_variant_ex(pval *pval_arg, VARIANT *var_arg, int type, int codepage)               
+static void pval_to_variant_ex(pval *pval_arg, VARIANT *var_arg, int type, int codepage TSRMLS_DC)
 {
        OLECHAR *unicode_str;
 
@@ -162,11 +162,11 @@ static void pval_to_variant_ex(pval *pval_arg, VARIANT *var_arg, int type, int c
                                                {
                                                   if(type)     /* explicit type */
                                                   {
-                                                          pval_to_variant_ex(*entry, v, type, codepage);               /* Do the required conversion */
+                                                          pval_to_variant_ex(*entry, v, type, codepage TSRMLS_CC);             /* Do the required conversion */
                                                   }
                                                   else
                                                   {
-                                                               php_pval_to_variant(*entry, v, codepage);                    /* Do the required conversion */
+                                                               php_pval_to_variant(*entry, v, codepage TSRMLS_CC);                    /* Do the required conversion */
                                                        }
                                                }
                                                else
@@ -267,7 +267,7 @@ static void pval_to_variant_ex(pval *pval_arg, VARIANT *var_arg, int type, int c
                           break;
    
                   case VT_UNKNOWN:
-                               comval_to_variant(pval_arg, var_arg);
+                       comval_to_variant(pval_arg, var_arg TSRMLS_CC);
                           if(V_VT(var_arg) != VT_DISPATCH)
                           {
                                   VariantInit(var_arg);
@@ -280,7 +280,7 @@ static void pval_to_variant_ex(pval *pval_arg, VARIANT *var_arg, int type, int c
                           break;
    
                   case VT_DISPATCH:
-                               comval_to_variant(pval_arg, var_arg);
+                               comval_to_variant(pval_arg, var_arg TSRMLS_CC);
                           if(V_VT(var_arg) != VT_DISPATCH)
                           {
                                   VariantInit(var_arg);
@@ -355,7 +355,7 @@ static void pval_to_variant_ex(pval *pval_arg, VARIANT *var_arg, int type, int c
                           break;
    
                   case VT_UNKNOWN|VT_BYREF:
-                               comval_to_variant(pval_arg, var_arg);
+                               comval_to_variant(pval_arg, var_arg TSRMLS_CC);
                           if(V_VT(var_arg) != VT_DISPATCH)
                           {
                                   VariantInit(var_arg);
@@ -368,7 +368,7 @@ static void pval_to_variant_ex(pval *pval_arg, VARIANT *var_arg, int type, int c
                           break;
    
                   case VT_DISPATCH|VT_BYREF:
-                               comval_to_variant(pval_arg, var_arg);
+                               comval_to_variant(pval_arg, var_arg TSRMLS_CC);
                           if(V_VT(var_arg) != VT_DISPATCH)
                           {
                                   VariantInit(var_arg);
@@ -893,7 +893,7 @@ PHPAPI char *php_OLECHAR_to_char(OLECHAR *unicode_str, uint *out_length, int per
        return C_str;
 }
 
-static void comval_to_variant(pval *pval_arg, VARIANT *var_arg)
+static void comval_to_variant(pval *pval_arg, VARIANT *var_arg TSRMLS_DC)
 {
        pval **comval_handle;
        comval *obj;

diff --git a/ext/ftp/php_ftp.c b/ext/ftp/php_ftp.c
index f2ed4fe891e59240b2c14dd3106f820afc5544ba..803f2bf6cf68f98afb61ade197a2fd9572e5d0b5 100644 (file)
--- a/ext/ftp/php_ftp.c
+++ b/ext/ftp/php_ftp.c
@@ -634,7 +634,7 @@ PHP_FUNCTION(ftp_fput)
 
        FTPBUF(ftp, arg1);
        convert_to_string(arg2);
-       rsrc = zend_fetch_resource(&arg3,-1,"File-Handle",&type,3,php_file_le_fopen(),php_file_le_popen(),php_file_le_socket());
+       rsrc = zend_fetch_resource(&arg3 TSRMLS_CC,-1,"File-Handle",&type,3,php_file_le_fopen(),php_file_le_popen(),php_file_le_socket());
        ZEND_VERIFY_RESOURCE(rsrc);   
        XTYPE(xtype, arg4);
 

diff --git a/ext/interbase/interbase.c b/ext/interbase/interbase.c
index fc603f253dd106ad77e8af6dc82bfd95216ada72..42db0388c77e0e3f9dddb3665f1bce3328751cc2 100644 (file)
--- a/ext/interbase/interbase.c
+++ b/ext/interbase/interbase.c
@@ -455,7 +455,7 @@ static void _php_ibase_free_trans(zend_rsrc_list_entry *rsrc)
        ibase_db_link *ib_link;
        TSRMLS_FETCH();
 
-       ib_link = (ibase_db_link *) zend_fetch_resource(NULL, ib_trans->link_rsrc, "InterBase link", NULL, 2, le_link, le_plink);
+       ib_link = (ibase_db_link *) zend_fetch_resource(NULL TSRMLS_CC, ib_trans->link_rsrc, "InterBase link", NULL, 2, le_link, le_plink);
        
        if (ib_link) {
                if (ib_link->trans[ib_trans->trans_num] != NULL) {
@@ -2833,7 +2833,7 @@ PHP_FUNCTION(ibase_blob_import)
                RETURN_FALSE;
        }
 
-       what = zend_fetch_resource(file_arg, -1, "File-Handle", &type, 2, php_file_le_fopen(), php_file_le_stream());
+       what = zend_fetch_resource(file_arg TSRMLS_CC, -1, "File-Handle", &type, 2, php_file_le_fopen(), php_file_le_stream());
        ZEND_VERIFY_RESOURCE(what);
 
        if (type == php_file_le_fopen())

diff --git a/ext/mailparse/mailparse.c b/ext/mailparse/mailparse.c
index 89d1231816fa74723a064453f267ebef823f4d82..7945411d0ff8c3b035b2daea5542bfda441b200d 100755 (executable)
--- a/ext/mailparse/mailparse.c
+++ b/ext/mailparse/mailparse.c
@@ -204,7 +204,7 @@ PHP_FUNCTION(mailparse_determine_best_xfer_encoding)
                WRONG_PARAM_COUNT;
        }
 
-       what = zend_fetch_resource(file, -1, "File-Handle", &type, 2, php_file_le_fopen(), php_file_le_stream());
+       what = zend_fetch_resource(file TSRMLS_CC, -1, "File-Handle", &type, 2, php_file_le_fopen(), php_file_le_stream());
        ZEND_VERIFY_RESOURCE(what);
 
 #if HAVE_PHP_STREAM

diff --git a/ext/mssql/php_mssql.c b/ext/mssql/php_mssql.c
index 608c69ab1ebabcea97b75ee54a303bc4b3cef511..c991ca0bfcf869bfd0a18dc6ea4a773e7434c81a 100644 (file)
--- a/ext/mssql/php_mssql.c
+++ b/ext/mssql/php_mssql.c
@@ -256,7 +256,7 @@ static mssql_statement* _mssql_get_statement(zval **stmt)
 {
        mssql_statement *statement;
 
-       statement = (mssql_statement *) zend_fetch_resource(stmt, -1, "MS SQL-Statement", NULL, 1, le_statement);
+       statement = (mssql_statement *) zend_fetch_resource(stmt TSRMLS_CC, -1, "MS SQL-Statement", NULL, 1, le_statement);
 
        if (statement) {
                return statement;

diff --git a/ext/muscat/muscat.c b/ext/muscat/muscat.c
index f7af8bff7ab099678f06a0906107fb0746947801..092ee0014daf793fc3483bb4010023f2832a866e 100644 (file)
--- a/ext/muscat/muscat.c
+++ b/ext/muscat/muscat.c
@@ -229,7 +229,7 @@ PHP_FUNCTION(muscat_setup_net)
        zval_copy_ctor(handle->handles.muscatnet_handle.socketr);
 
        // but for our convenience extract the FD
-       what=zend_fetch_resource(socket_arg,-1,"Socket-Handle",NULL,1,php_file_le_socket());
+       what=zend_fetch_resource(socket_arg TSRMLS_CC,-1,"Socket-Handle",NULL,1,php_file_le_socket());
         ZEND_VERIFY_RESOURCE(what);
        handle->handles.muscatnet_handle.socketd=*(int*)what;
        php_set_sock_blocking(handle->handles.muscatnet_handle.socketd,1);
@@ -254,7 +254,7 @@ PHP_FUNCTION(muscat_setup_net_)
        *handle->handles.muscatnet_handle.socketr=*return_value;
        zval_copy_ctor(handle->handles.muscatnet_handle.socketr);
        // but for our convenience extract the FD
-       what=zend_fetch_resource(&return_value,-1,"File-Handle",NULL,1,php_file_le_socket);
+       what=zend_fetch_resource(&return_value TSRMLS_CC,-1,"File-Handle",NULL,1,php_file_le_socket);
         ZEND_VERIFY_RESOURCE(what);
        handle->handles.muscatnet_handle.socketd=*(int*)what;
        _discard(handle);

diff --git a/ext/oci8/oci8.c b/ext/oci8/oci8.c
index c2c9ba4402d2be1a0b170642d7a076186623c675..90f154c8a90fc26aca9ffdbaaa5f8e345cfdc140 100644 (file)
--- a/ext/oci8/oci8.c
+++ b/ext/oci8/oci8.c
@@ -965,7 +965,7 @@ static oci_connection *oci_get_conn(zval **conn)
 {
        oci_connection *connection;
 
-       connection = (oci_connection *) zend_fetch_resource(conn, -1, "OCI8-Connection", NULL, 1, le_conn);
+       connection = (oci_connection *) zend_fetch_resource(conn TSRMLS_CC, -1, "OCI8-Connection", NULL, 1, le_conn);
 
        if (connection && connection->is_open) {
                return connection;
@@ -981,7 +981,7 @@ static oci_statement *oci_get_stmt(zval **stmt)
 {
        oci_statement *statement;
 
-       statement = (oci_statement *) zend_fetch_resource(stmt, -1, "OCI8-Statement", NULL, 1, le_stmt);
+       statement = (oci_statement *) zend_fetch_resource(stmt TSRMLS_CC, -1, "OCI8-Statement", NULL, 1, le_stmt);
 
        if (statement && statement->conn->is_open) {
                return statement;
@@ -3988,12 +3988,12 @@ PHP_FUNCTION(ocierror)
        dvoid *errh = NULL;
 
        if (zend_get_parameters_ex(1, &arg) == SUCCESS) {
-               statement = (oci_statement *) zend_fetch_resource(arg, -1, NULL, NULL, 1, le_stmt);
+               statement = (oci_statement *) zend_fetch_resource(arg TSRMLS_CC, -1, NULL, NULL, 1, le_stmt);
                if (statement) {
                        errh = statement->pError;
                        error = statement->error;
                } else {
-                       connection = (oci_connection *) zend_fetch_resource(arg, -1, NULL, NULL, 1, le_conn);
+                       connection = (oci_connection *) zend_fetch_resource(arg TSRMLS_CC, -1, NULL, NULL, 1, le_conn);
                        if (connection) {
                                errh = connection->pError;
                                error = connection->error;

diff --git a/ext/odbc/php_odbc.c b/ext/odbc/php_odbc.c
index 00bfc9ccfe518c81794b96d09720820da7edc63a..ff098f59787c2c10c5d04ced0f36aaf617fc8fdb 100644 (file)
--- a/ext/odbc/php_odbc.c
+++ b/ext/odbc/php_odbc.c
@@ -2205,7 +2205,7 @@ PHP_FUNCTION(odbc_close)
                WRONG_PARAM_COUNT;
        }
 
-       conn = (odbc_connection *) zend_fetch_resource(pv_conn, -1, "ODBC-Link", &found_resource_type, 2, le_conn, le_pconn);
+       conn = (odbc_connection *) zend_fetch_resource(pv_conn TSRMLS_CC, -1, "ODBC-Link", &found_resource_type, 2, le_conn, le_pconn);
        if (found_resource_type==le_pconn) {
                is_pconn = 1;
        }

diff --git a/ext/openssl/openssl.c b/ext/openssl/openssl.c
index 00264f046481de96f8e6ebe6555d37e1d7420404..e2deb4b1157b66f376f73383c2d745a6bbaf8867 100644 (file)
--- a/ext/openssl/openssl.c
+++ b/ext/openssl/openssl.c
@@ -202,7 +202,7 @@ static X509 * php_openssl_x509_from_zval(zval ** val, int makeresource, long * r
                void * what;
                int type;
 
-               what = zend_fetch_resource(val, -1, "OpenSSL X.509", &type, 1, le_x509);
+               what = zend_fetch_resource(val TSRMLS_CC, -1, "OpenSSL X.509", &type, 1, le_x509);
                if (!what)
                        return NULL;
 
@@ -297,7 +297,7 @@ static EVP_PKEY * php_openssl_evp_from_zval(zval ** val, int public_key, char *
                void * what;
                int type;
 
-               what = zend_fetch_resource(val, -1, "OpenSSL X.509/key", &type, 2, le_x509, le_key);
+               what = zend_fetch_resource(val TSRMLS_CC, -1, "OpenSSL X.509/key", &type, 2, le_x509, le_key);
                if (!what)
                        return NULL;
 

diff --git a/ext/oracle/oracle.c b/ext/oracle/oracle.c
index 05894d0721723fc0343eee65647527a14b21fc1c..c9f1507c770b4b8678bff26517c3bec86969106f 100644 (file)
--- a/ext/oracle/oracle.c
+++ b/ext/oracle/oracle.c
@@ -1518,7 +1518,7 @@ PHP_FUNCTION(ora_error)
        }
 
        if (argc == 1) {
-               res = zend_fetch_resource(arg, -1,"Oracle-Connection/Cursor",&what,3,le_conn, le_pconn, le_cursor);
+               res = zend_fetch_resource(arg TSRMLS_CC, -1,"Oracle-Connection/Cursor",&what,3,le_conn, le_pconn, le_cursor);
                ZEND_VERIFY_RESOURCE(res);
 
                if (what == le_cursor) {
@@ -1550,7 +1550,7 @@ PHP_FUNCTION(ora_errorcode)
        }
 
        if (argc == 1) {
-               res = zend_fetch_resource(arg, -1,"Oracle-Connection/Cursor",&what,3,le_conn, le_pconn, le_cursor);
+               res = zend_fetch_resource(arg TSRMLS_CC, -1,"Oracle-Connection/Cursor",&what,3,le_conn, le_pconn, le_cursor);
                ZEND_VERIFY_RESOURCE(res);
 
                if (what == le_cursor) {
@@ -1595,7 +1595,7 @@ ora_get_cursor(HashTable *list, pval **ind)
        oraConnection *db_conn;
        TSRMLS_FETCH();
 
-       cursor = (oraCursor *) zend_fetch_resource(ind, -1, "Oracle-Cursor", NULL, 1, le_cursor);
+       cursor = (oraCursor *) zend_fetch_resource(ind TSRMLS_CC, -1, "Oracle-Cursor", NULL, 1, le_cursor);
        if (! cursor) {
                return NULL;
        }

diff --git a/ext/recode/recode.c b/ext/recode/recode.c
index 07acccfd09a53ec808fde71951780eced88f713c..0833e49a93b1de0bdf7c5a6b5ba7c5e85f730e27 100644 (file)
--- a/ext/recode/recode.c
+++ b/ext/recode/recode.c
@@ -172,14 +172,14 @@ PHP_FUNCTION(recode_file)
                WRONG_PARAM_COUNT;
        }
 
-       in_fp = zend_fetch_resource(input,-1, "File-Handle", &in_type, 
+       in_fp = zend_fetch_resource(input TSRMLS_CC,-1, "File-Handle", &in_type, 
                2, php_file_le_fopen(), php_file_le_popen());
        if (!in_fp) {
                php_error(E_WARNING,"Unable to find input file identifier");
                RETURN_FALSE;
        }
 
-       out_fp = zend_fetch_resource(output,-1, "File-Handle", &out_type,
+       out_fp = zend_fetch_resource(output TSRMLS_CC,-1, "File-Handle", &out_type,
                2, php_file_le_fopen(), php_file_le_popen());
        if (!out_fp) {
                php_error(E_WARNING,"Unable to find output file identifier");

diff --git a/ext/rpc/com/com_wrapper.c b/ext/rpc/com/com_wrapper.c
index 51d953c9c4b8e40edb4070ea59749b0ed2ada4b0..c10865cdd85e555556653df81ffe3c7ce92bc2de 100644 (file)
--- a/ext/rpc/com/com_wrapper.c
+++ b/ext/rpc/com/com_wrapper.c
@@ -1150,6 +1150,7 @@ PHPAPI pval php_COM_get_property_handler(zend_property_reference *property_refer
        int type;
        comval *obj, *obj_prop;
        VARIANT *var_result;
+       TSRMLS_FETCH();
 
        INIT_ZVAL(return_value);    
        ZVAL_NULL(&return_value);
@@ -1243,7 +1244,7 @@ PHPAPI int php_COM_set_property_handler(zend_property_reference *property_refere
        comval *obj;
        int type;
        VARIANT var_result;
-
+       TSRMLS_FETCH();
 
        /* fetch the IDispatch interface */
        zend_hash_index_find(Z_OBJPROP_P(object), 0, (void **) &comval_handle);
@@ -1632,7 +1633,7 @@ static int php_COM_load_typelib(ITypeLib *TypeLib, int mode)
                                {
                                        /* Oops, it already exists. No problem if it is defined as the same value */
                                        /* Check to see if they are the same */
-                                       if (!compare_function(&results, &c.value, &exists) && INI_INT("com.autoregister_verbose"))
+                                       if (!compare_function(&results, &c.value, &exists TSRMLS_CC) && INI_INT("com.autoregister_verbose"))
                                        {
                                                php_error(E_WARNING,"Type library value %s is already defined and has a different value", c.name);
                                        }

diff --git a/ext/rpc/com/conversion.c b/ext/rpc/com/conversion.c
index 519c3b95e2fc1a365c8697d0125ca790a6a13deb..8f7e80a9c6209fda7988104270c0af49bfc67e64 100644 (file)
--- a/ext/rpc/com/conversion.c
+++ b/ext/rpc/com/conversion.c
@@ -37,17 +37,17 @@
 
 /* prototypes */
 
-PHPAPI void php_pval_to_variant(pval *pval_arg, VARIANT *var_arg, int codepage);
-PHPAPI void php_pval_to_variant_ex(pval *pval_arg, VARIANT *var_arg, pval *pval_type, int codepage);
+PHPAPI void php_pval_to_variant(pval *pval_arg, VARIANT *var_arg, int codepage TSRMLS_DC);
+PHPAPI void php_pval_to_variant_ex(pval *pval_arg, VARIANT *var_arg, pval *pval_type, int codepage TSRMLS_DC);
 PHPAPI int php_variant_to_pval(VARIANT *var_arg, pval *pval_arg, int persistent, int codepage);
 PHPAPI OLECHAR *php_char_to_OLECHAR(char *C_str, uint strlen, int codepage);
 PHPAPI char *php_OLECHAR_to_char(OLECHAR *unicode_str, uint *out_length, int persistent, int codepage);
 
-static void pval_to_variant_ex(pval *pval_arg, VARIANT *var_arg, int type, int codepage);
-static void comval_to_variant(pval *pval_arg, VARIANT *var_arg);
+static void pval_to_variant_ex(pval *pval_arg, VARIANT *var_arg, int type, int codepage TSRMLS_DC);
+static void comval_to_variant(pval *pval_arg, VARIANT *var_arg TSRMLS_DC);
 
 /* implementations */
-PHPAPI void php_pval_to_variant(pval *pval_arg, VARIANT *var_arg, int codepage)
+PHPAPI void php_pval_to_variant(pval *pval_arg, VARIANT *var_arg, int codepage TSRMLS_DC)
 {
        int type = VT_EMPTY;    /* default variant type */
        
@@ -100,15 +100,15 @@ PHPAPI void php_pval_to_variant(pval *pval_arg, VARIANT *var_arg, int codepage)
                type |= VT_BYREF;
        }
 
-       pval_to_variant_ex(pval_arg, var_arg, type, codepage);
+       pval_to_variant_ex(pval_arg, var_arg, type, codepage TSRMLS_CC);
 }
 
-PHPAPI void php_pval_to_variant_ex(pval *pval_arg, VARIANT *var_arg, pval *pval_type, int codepage)
+PHPAPI void php_pval_to_variant_ex(pval *pval_arg, VARIANT *var_arg, pval *pval_type, int codepage TSRMLS_DC)
 {
-       pval_to_variant_ex(pval_arg, var_arg, Z_LVAL_P(pval_type), codepage);
+       pval_to_variant_ex(pval_arg, var_arg, Z_LVAL_P(pval_type), codepage TSRMLS_CC);
 }
 
-static void pval_to_variant_ex(pval *pval_arg, VARIANT *var_arg, int type, int codepage)               
+static void pval_to_variant_ex(pval *pval_arg, VARIANT *var_arg, int type, int codepage TSRMLS_DC)
 {
        OLECHAR *unicode_str;
 
@@ -162,11 +162,11 @@ static void pval_to_variant_ex(pval *pval_arg, VARIANT *var_arg, int type, int c
                                                {
                                                   if(type)     /* explicit type */
                                                   {
-                                                          pval_to_variant_ex(*entry, v, type, codepage);               /* Do the required conversion */
+                                                          pval_to_variant_ex(*entry, v, type, codepage TSRMLS_CC);             /* Do the required conversion */
                                                   }
                                                   else
                                                   {
-                                                               php_pval_to_variant(*entry, v, codepage);                    /* Do the required conversion */
+                                                               php_pval_to_variant(*entry, v, codepage TSRMLS_CC);                    /* Do the required conversion */
                                                        }
                                                }
                                                else
@@ -267,7 +267,7 @@ static void pval_to_variant_ex(pval *pval_arg, VARIANT *var_arg, int type, int c
                           break;
    
                   case VT_UNKNOWN:
-                               comval_to_variant(pval_arg, var_arg);
+                       comval_to_variant(pval_arg, var_arg TSRMLS_CC);
                           if(V_VT(var_arg) != VT_DISPATCH)
                           {
                                   VariantInit(var_arg);
@@ -280,7 +280,7 @@ static void pval_to_variant_ex(pval *pval_arg, VARIANT *var_arg, int type, int c
                           break;
    
                   case VT_DISPATCH:
-                               comval_to_variant(pval_arg, var_arg);
+                               comval_to_variant(pval_arg, var_arg TSRMLS_CC);
                           if(V_VT(var_arg) != VT_DISPATCH)
                           {
                                   VariantInit(var_arg);
@@ -355,7 +355,7 @@ static void pval_to_variant_ex(pval *pval_arg, VARIANT *var_arg, int type, int c
                           break;
    
                   case VT_UNKNOWN|VT_BYREF:
-                               comval_to_variant(pval_arg, var_arg);
+                               comval_to_variant(pval_arg, var_arg TSRMLS_CC);
                           if(V_VT(var_arg) != VT_DISPATCH)
                           {
                                   VariantInit(var_arg);
@@ -368,7 +368,7 @@ static void pval_to_variant_ex(pval *pval_arg, VARIANT *var_arg, int type, int c
                           break;
    
                   case VT_DISPATCH|VT_BYREF:
-                               comval_to_variant(pval_arg, var_arg);
+                               comval_to_variant(pval_arg, var_arg TSRMLS_CC);
                           if(V_VT(var_arg) != VT_DISPATCH)
                           {
                                   VariantInit(var_arg);
@@ -893,7 +893,7 @@ PHPAPI char *php_OLECHAR_to_char(OLECHAR *unicode_str, uint *out_length, int per
        return C_str;
 }
 
-static void comval_to_variant(pval *pval_arg, VARIANT *var_arg)
+static void comval_to_variant(pval *pval_arg, VARIANT *var_arg TSRMLS_DC)
 {
        pval **comval_handle;
        comval *obj;

diff --git a/ext/rpc/com/variant.c b/ext/rpc/com/variant.c
index cc79171167b3c5c4f88c92bac43a5f525809e2e9..af435bacbd56362ceff86bd8441a6496536bec15 100644 (file)
--- a/ext/rpc/com/variant.c
+++ b/ext/rpc/com/variant.c
@@ -179,6 +179,7 @@ pval php_VARIANT_get_property_handler(zend_property_reference *property_referenc
 {
        zend_overloaded_element *overloaded_property;
        int type;
+       TSRMLS_FETCH();
 
        pval result, **var_handle, *object = property_reference->object;
        VARIANT *var_arg;
@@ -231,6 +232,7 @@ int php_VARIANT_set_property_handler(zend_property_reference *property_reference
 {
        zend_overloaded_element *overloaded_property;
        int type;
+       TSRMLS_FETCH();
 
        pval **var_handle, *object = property_reference->object;
        VARIANT *var_arg;

diff --git a/ext/standard/array.c b/ext/standard/array.c
index 318f4e08ba0e677690011dfd299317ae54ded64c..1a6b6798b8240678657573b7a020679832f809c3 100644 (file)
--- a/ext/standard/array.c
+++ b/ext/standard/array.c
@@ -146,7 +146,7 @@ static int array_key_compare(const void *a, const void *b)
                Z_STRLEN(second) = s->nKeyLength;
        }
  
-    if (ARRAYG(compare_func)(&result, &first, &second) == FAILURE) {
+    if (ARRAYG(compare_func)(&result, &first, &second TSRMLS_CC) == FAILURE) {
         return 0;
     } 
 
@@ -278,7 +278,7 @@ static int array_data_compare(const void *a, const void *b)
        first = *((pval **) f->pData);
        second = *((pval **) s->pData);
 
-    if (ARRAYG(compare_func)(&result, first, second) == FAILURE) {
+    if (ARRAYG(compare_func)(&result, first, second TSRMLS_CC) == FAILURE) {
         return 0;
     } 
 
@@ -878,7 +878,7 @@ PHP_FUNCTION(min)
                min = args[0];
 
                for (i=1; i<ZEND_NUM_ARGS(); i++) {
-                       is_smaller_function(&result, *args[i], *min);
+                       is_smaller_function(&result, *args[i], *min TSRMLS_CC);
                        if (Z_LVAL(result) == 1) {
                                min = args[i];
                        }
@@ -930,7 +930,7 @@ PHP_FUNCTION(max)
                max = args[0];
 
                for (i=1; i<ZEND_NUM_ARGS(); i++) {
-                       is_smaller_or_equal_function(&result, *args[i], *max);
+                       is_smaller_or_equal_function(&result, *args[i], *max TSRMLS_CC);
                        if (Z_LVAL(result) == 0) {
                                max = args[i];
                        }
@@ -1044,7 +1044,7 @@ static void php_search_array(INTERNAL_FUNCTION_PARAMETERS, int behavior)
        HashPosition pos;                       /* hash iterator */
        ulong num_key;
        char *string_key;
-       int (*compare_func)(zval *, zval *, zval *) = is_equal_function;
+       int (*compare_func)(zval *, zval *, zval * TSRMLS_DC) = is_equal_function;
        
        if (ZEND_NUM_ARGS() < 2 || ZEND_NUM_ARGS() > 3 ||
                zend_get_parameters_ex(ZEND_NUM_ARGS(), &value, &array, &strict) == FAILURE) {
@@ -1065,13 +1065,13 @@ static void php_search_array(INTERNAL_FUNCTION_PARAMETERS, int behavior)
                convert_to_boolean_ex(strict);
                if (Z_LVAL_PP(strict)) {
                        compare_func = is_identical_function;
-               } 
+           }
        }
 
        target_hash = HASH_OF(*array);
        zend_hash_internal_pointer_reset_ex(target_hash, &pos);
        while(zend_hash_get_current_data_ex(target_hash, (void **)&entry, &pos) == SUCCESS) {
-       compare_func(&res, *value, *entry);
+       compare_func(&res, *value, *entry TSRMLS_CC);
                if (Z_LVAL(res) == 1) {
                        if (behavior==0) {           
                                RETURN_TRUE;
@@ -1941,7 +1941,7 @@ PHP_FUNCTION(array_keys)
        zend_hash_internal_pointer_reset_ex(Z_ARRVAL_PP(input), &pos);
        while(zend_hash_get_current_data_ex(Z_ARRVAL_PP(input), (void **)&entry, &pos) == SUCCESS) {
                if (search_value != NULL) {
-               is_equal_function(&res, *search_value, *entry);
+               is_equal_function(&res, *search_value, *entry TSRMLS_CC);
                        add_key = zval_is_true(&res);
                }
        
@@ -2513,7 +2513,7 @@ int multisort_compare(const void *a, const void *b)
        do {
                set_compare_func(ARRAYG(multisort_flags)[MULTISORT_TYPE][r]);
 
-               ARRAYG(compare_func)(&temp, *((zval **)ab[r]->pData), *((zval **)bb[r]->pData));
+               ARRAYG(compare_func)(&temp, *((zval **)ab[r]->pData), *((zval **)bb[r]->pData) TSRMLS_CC);
                result = ARRAYG(multisort_flags)[MULTISORT_ORDER][r] * Z_LVAL(temp);
                if (result != 0)
                        return result;
@@ -2830,7 +2830,7 @@ PHP_FUNCTION(array_sum)
                        continue;
 
                SEPARATE_ZVAL(entry);
-               convert_scalar_to_number(*entry);
+               convert_scalar_to_number(*entry TSRMLS_CC);
 
                if (Z_TYPE_PP(entry) == IS_LONG && Z_TYPE_P(return_value) == IS_LONG) {
                        Z_LVAL_P(return_value) += Z_LVAL_PP(entry);

diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c
index 4fc830ab010046b1fe9f90386ccdaaa579af9868..7767ec275d063e7a4c29dcc1a6cb245d8fc6251a 100644 (file)
--- a/ext/standard/basic_functions.c
+++ b/ext/standard/basic_functions.c
@@ -1863,12 +1863,13 @@ static int user_tick_function_compare(user_tick_function_entry *tick_fe1,
 {
        zval *func1 = tick_fe1->arguments[0];
        zval *func2 = tick_fe2->arguments[0];
+       TSRMLS_FETCH();
 
        if (Z_TYPE_P(func1) == IS_STRING && Z_TYPE_P(func2) == IS_STRING) {
                return (zend_binary_zval_strcmp(func1, func2) == 0);
        } else if (Z_TYPE_P(func1) == IS_ARRAY && Z_TYPE_P(func2) == IS_ARRAY) {
                zval result;
-               zend_compare_arrays(&result, func1, func2);
+               zend_compare_arrays(&result, func1, func2 TSRMLS_CC);
                return (Z_LVAL(result) == 0);
        } else
                return 0;
@@ -1933,7 +1934,6 @@ PHP_FUNCTION(highlight_file)
        pval **filename;
        zend_syntax_highlighter_ini syntax_highlighter_ini;
 
-
        if (ZEND_NUM_ARGS()!=1 || zend_get_parameters_ex(1, &filename)==FAILURE) {
                WRONG_PARAM_COUNT;
        }
@@ -1941,7 +1941,7 @@ PHP_FUNCTION(highlight_file)
 
        php_get_highlight_struct(&syntax_highlighter_ini);
 
-       if (highlight_file(Z_STRVAL_PP(filename), &syntax_highlighter_ini)==FAILURE) {
+       if (highlight_file(Z_STRVAL_PP(filename), &syntax_highlighter_ini TSRMLS_CC)==FAILURE) {
                RETURN_FALSE;
        }
        RETURN_TRUE;
@@ -1967,7 +1967,7 @@ PHP_FUNCTION(highlight_string)
 
        hicompiled_string_description = zend_make_compiled_string_description("highlighted code" TSRMLS_CC);
 
-       if (highlight_string(*expr, &syntax_highlighter_ini, hicompiled_string_description)==FAILURE) {
+       if (highlight_string(*expr, &syntax_highlighter_ini, hicompiled_string_description TSRMLS_CC)==FAILURE) {
                efree(hicompiled_string_description);
                RETURN_FALSE;
        }

diff --git a/ext/standard/file.c b/ext/standard/file.c
index 0af13d8388f7977e7b9645ad7c35df45365bbc45..d2d076343fd64e2e3b2eee37715119039076efc0 100644 (file)
--- a/ext/standard/file.c
+++ b/ext/standard/file.c
@@ -243,7 +243,7 @@ PHP_FUNCTION(flock)
         WRONG_PARAM_COUNT;
     }
 
-       what = zend_fetch_resource(arg1, -1, "File-Handle", &type, 4, le_fopen, le_popen, le_socket, le_stream);
+       what = zend_fetch_resource(arg1 TSRMLS_CC, -1, "File-Handle", &type, 4, le_fopen, le_popen, le_socket, le_stream);
        ZEND_VERIFY_RESOURCE(what);
 
 #if HAVE_PHP_STREAM
@@ -705,7 +705,7 @@ PHP_FUNCTION(fclose)
                WRONG_PARAM_COUNT;
        }
 
-       what = zend_fetch_resource(arg1, -1, "File-Handle", &type, 3, le_fopen, le_socket, le_stream);
+       what = zend_fetch_resource(arg1 TSRMLS_CC, -1, "File-Handle", &type, 3, le_fopen, le_socket, le_stream);
        ZEND_VERIFY_RESOURCE(what);
 
        zend_list_delete((*arg1)->value.lval);
@@ -783,7 +783,7 @@ PHP_FUNCTION(pclose)
                WRONG_PARAM_COUNT;
        }
 
-       what = zend_fetch_resource(arg1,-1,"File-Handle",NULL,1,le_popen);
+       what = zend_fetch_resource(arg1 TSRMLS_CC,-1,"File-Handle",NULL,1,le_popen);
        ZEND_VERIFY_RESOURCE(what);
 
        zend_list_delete((*arg1)->value.lval);
@@ -805,7 +805,7 @@ PHP_FUNCTION(feof)
        if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &arg1) == FAILURE) {
                WRONG_PARAM_COUNT;
        }
-       what = zend_fetch_resource(arg1, -1, "File-Handle", &type, 4, le_fopen, le_popen, le_socket, le_stream);
+       what = zend_fetch_resource(arg1 TSRMLS_CC, -1, "File-Handle", &type, 4, le_fopen, le_popen, le_socket, le_stream);
        ZEND_VERIFY_RESOURCE(what);
 
        if (type == le_socket) {
@@ -877,7 +877,7 @@ PHP_FUNCTION(socket_set_blocking)
                WRONG_PARAM_COUNT;
        }
 
-       what = zend_fetch_resource(arg1, -1, "File-Handle", &type, 2, le_socket, le_stream);
+       what = zend_fetch_resource(arg1 TSRMLS_CC, -1, "File-Handle", &type, 2, le_socket, le_stream);
        ZEND_VERIFY_RESOURCE(what);
 
        convert_to_long_ex(arg2);
@@ -925,7 +925,7 @@ PHP_FUNCTION(socket_set_timeout)
                WRONG_PARAM_COUNT;
        }
        /* XXX: add stream support --Wez. */
-       what = zend_fetch_resource(socket, -1, "File-Handle", &type, 1, le_socket);
+       what = zend_fetch_resource(socket TSRMLS_CC, -1, "File-Handle", &type, 1, le_socket);
        ZEND_VERIFY_RESOURCE(what);
        socketd = *(int *)what;
 
@@ -963,7 +963,7 @@ PHP_FUNCTION(socket_get_status)
        }
        /* XXX: add stream support --Wez. */
 
-       what = zend_fetch_resource(socket, -1, "File-Handle", &type, 1, le_socket);
+       what = zend_fetch_resource(socket TSRMLS_CC, -1, "File-Handle", &type, 1, le_socket);
        ZEND_VERIFY_RESOURCE(what);
        socketd = *(int *)what;
        sock = php_get_socket(socketd);
@@ -994,7 +994,7 @@ PHP_FUNCTION(fgets)
                WRONG_PARAM_COUNT;
        }
 
-       what = zend_fetch_resource(arg1, -1, "File-Handle", &type, 4, le_fopen, le_popen, le_socket, le_stream);
+       what = zend_fetch_resource(arg1 TSRMLS_CC, -1, "File-Handle", &type, 4, le_fopen, le_popen, le_socket, le_stream);
        ZEND_VERIFY_RESOURCE(what);
 
        convert_to_long_ex(arg2);
@@ -1070,7 +1070,7 @@ PHP_FUNCTION(fgetc) {
                WRONG_PARAM_COUNT;
        }
 
-       what = zend_fetch_resource(arg1, -1, "File-Handle", &type, 4, le_fopen, le_popen, le_socket, le_stream);
+       what = zend_fetch_resource(arg1 TSRMLS_CC, -1, "File-Handle", &type, 4, le_fopen, le_popen, le_socket, le_stream);
        ZEND_VERIFY_RESOURCE(what);
 
        if (type == le_socket) {
@@ -1142,7 +1142,7 @@ PHP_FUNCTION(fgetss)
                break;
        }
 
-       what = zend_fetch_resource(fd, -1, "File-Handle", &type, 4, le_fopen, le_popen, le_socket, le_stream);
+       what = zend_fetch_resource(fd TSRMLS_CC, -1, "File-Handle", &type, 4, le_fopen, le_popen, le_socket, le_stream);
        ZEND_VERIFY_RESOURCE(what);
 
        if (type == le_socket) {
@@ -1210,7 +1210,7 @@ PHP_FUNCTION(fscanf)
        file_handle    = args[0];
        format_string  = args[1];
 
-       what = zend_fetch_resource(file_handle, -1, "File-Handle", &type, 4, le_fopen, le_popen, le_socket, le_stream);
+       what = zend_fetch_resource(file_handle TSRMLS_CC, -1, "File-Handle", &type, 4, le_fopen, le_popen, le_socket, le_stream);
 
        /*
         * we can't do a ZEND_VERIFY_RESOURCE(what), otherwise we end up
@@ -1294,7 +1294,7 @@ PHP_FUNCTION(fwrite)
                break;
        }
 
-       what = zend_fetch_resource(arg1, -1, "File-Handle", &type, 4, le_fopen,
+       what = zend_fetch_resource(arg1 TSRMLS_CC, -1, "File-Handle", &type, 4, le_fopen,
                        le_popen, le_socket, le_stream);
        ZEND_VERIFY_RESOURCE(what);
 
@@ -1344,7 +1344,7 @@ PHP_FUNCTION(fflush)
                WRONG_PARAM_COUNT;
        }
 
-       what = zend_fetch_resource(arg1,-1,"File-Handle",&type,4,le_fopen,le_popen,le_socket, le_stream);
+       what = zend_fetch_resource(arg1 TSRMLS_CC,-1,"File-Handle",&type,4,le_fopen,le_popen,le_socket, le_stream);
        ZEND_VERIFY_RESOURCE(what);
 
 #if HAVE_PHP_STREAM
@@ -1399,7 +1399,7 @@ PHP_FUNCTION(set_file_buffer)
 
        /* XXX: add stream support --Wez. */
 
-       what = zend_fetch_resource(arg1,-1,"File-Handle",&type,2,le_fopen,le_popen);
+       what = zend_fetch_resource(arg1 TSRMLS_CC,-1,"File-Handle",&type,2,le_fopen,le_popen);
        ZEND_VERIFY_RESOURCE(what);
 
        convert_to_long_ex(arg2);
@@ -1429,7 +1429,7 @@ PHP_FUNCTION(rewind)
        }
        /* XXX: add stream support --Wez. */
 
-       what = zend_fetch_resource(arg1,-1,"File-Handle",NULL,2,le_fopen,le_popen);
+       what = zend_fetch_resource(arg1 TSRMLS_CC,-1,"File-Handle",NULL,2,le_fopen,le_popen);
        ZEND_VERIFY_RESOURCE(what);
 
        rewind((FILE*) what);
@@ -1451,7 +1451,7 @@ PHP_FUNCTION(ftell)
        }
        /* XXX: add stream support --Wez. */
 
-       what = zend_fetch_resource(arg1,-1,"File-Handle",NULL,2,le_fopen,le_popen);
+       what = zend_fetch_resource(arg1 TSRMLS_CC,-1,"File-Handle",NULL,2,le_fopen,le_popen);
        ZEND_VERIFY_RESOURCE(what);
 
        ret = ftell((FILE*) what);
@@ -1478,7 +1478,7 @@ PHP_FUNCTION(fseek)
        }
        /* XXX: add stream support --Wez. */
 
-       what = zend_fetch_resource(arg1,-1,"File-Handle",NULL,2,le_fopen,le_popen);
+       what = zend_fetch_resource(arg1 TSRMLS_CC,-1,"File-Handle",NULL,2,le_fopen,le_popen);
        ZEND_VERIFY_RESOURCE(what);
 
        convert_to_long_ex(arg2);
@@ -1699,7 +1699,7 @@ PHP_FUNCTION(fpassthru)
        }
 
        /* XXX: add stream support --Wez. */
-       what = zend_fetch_resource(arg1,-1,"File-Handle",&type,3,le_fopen,le_popen,le_socket);
+       what = zend_fetch_resource(arg1 TSRMLS_CC,-1,"File-Handle",&type,3,le_fopen,le_popen,le_socket);
        ZEND_VERIFY_RESOURCE(what);
 
        if (type == le_socket) {
@@ -1788,7 +1788,7 @@ PHP_NAMED_FUNCTION(php_if_ftruncate)
        }
        /* XXX: add stream support --Wez. */
 
-       what = zend_fetch_resource(fp,-1,"File-Handle",&type,3,le_fopen,le_popen,le_socket);
+       what = zend_fetch_resource(fp TSRMLS_CC,-1,"File-Handle",&type,3,le_fopen,le_popen,le_socket);
        ZEND_VERIFY_RESOURCE(what);
 
        if (type == le_socket)
@@ -1823,7 +1823,7 @@ PHP_NAMED_FUNCTION(php_if_fstat)
        }
        /* XXX: add stream support --Wez. */
 
-       what = zend_fetch_resource(fp,-1,"File-Handle",&type,3,le_fopen,le_popen,le_socket);
+       what = zend_fetch_resource(fp TSRMLS_CC,-1,"File-Handle",&type,3,le_fopen,le_popen,le_socket);
        ZEND_VERIFY_RESOURCE(what);
 
        if (fstat(fileno((FILE *) what ), &stat_sb)) {
@@ -2003,7 +2003,7 @@ PHP_FUNCTION(fread)
        }
        /* XXX: add stream support --Wez. */
 
-       what = zend_fetch_resource(arg1,-1,"File-Handle",&type,3,le_fopen,le_popen,le_socket);
+       what = zend_fetch_resource(arg1 TSRMLS_CC,-1,"File-Handle",&type,3,le_fopen,le_popen,le_socket);
        ZEND_VERIFY_RESOURCE(what);
 
        if (type == le_socket) {
@@ -2083,7 +2083,7 @@ PHP_FUNCTION(fgetcsv) {
        }
        /* XXX: add stream support --Wez. */
 
-       what = zend_fetch_resource(fd,-1,"File-Handle",&type,3,le_fopen,le_popen,le_socket);
+       what = zend_fetch_resource(fd TSRMLS_CC,-1,"File-Handle",&type,3,le_fopen,le_popen,le_socket);
        ZEND_VERIFY_RESOURCE(what);
 
        if (type == le_socket) {
@@ -2252,7 +2252,7 @@ PHP_FUNCTION(fd_set)
                                WRONG_PARAM_COUNT;
                }
        /* XXX: add stream support --Wez. */
-               what = zend_fetch_resource(arg,-1,"select",&type,3,le_fopen,le_socket,le_popen);
+               what = zend_fetch_resource(arg TSRMLS_CC,-1,"select",&type,3,le_fopen,le_socket,le_popen);
                ZEND_VERIFY_RESOURCE(what);
                if(type == le_socket) {
                                fd = *(int *)what;
@@ -2273,7 +2273,7 @@ PHP_FUNCTION(fd_set)
                FD_ZERO(&readfd);
                for(i = 0; i < ARG_COUNT(ht); i++) {
        /* XXX: add stream support --Wez. */
-                               what = zend_fetch_resource(*args,-1,"select",&type,3,le_fopen,le_socket,le_popen);
+                               what = zend_fetch_resource(*args TSRMLS_CC,-1,"select",&type,3,le_fopen,le_socket,le_popen);
                                ZEND_VERIFY_RESOURCE(what);
                                if(type == le_socket) {
                                                fd = *(int *)what;
@@ -2323,7 +2323,7 @@ PHP_FUNCTION(fd_isset)
        }
        /* XXX: add stream support --Wez. */
 
-       what = zend_fetch_resource(fdarg,-1,"select",&type,3,le_fopen,le_socket,le_popen);
+       what = zend_fetch_resource(fdarg TSRMLS_CC,-1,"select",&type,3,le_fopen,le_socket,le_popen);
        ZEND_VERIFY_RESOURCE(what);
 
        if(type == le_socket) {

diff --git a/ext/standard/formatted_print.c b/ext/standard/formatted_print.c
index f010c458f91b298e3879c638039ec9169ab6eaf5..3521865970d48321140ada118e908fc737bc743c 100644 (file)
--- a/ext/standard/formatted_print.c
+++ b/ext/standard/formatted_print.c
@@ -408,7 +408,7 @@ php_sprintf_getnumber(char *buffer, int *pos)
  *
  */
 static char *
-php_formatted_print(int ht, int *len)
+php_formatted_print(int ht, int *len TSRMLS_DC)
 {
        pval ***args;
        int argc, size = 240, inpos = 0, outpos = 0, temppos;
@@ -632,7 +632,7 @@ PHP_FUNCTION(user_sprintf)
        char *result;
        int len;
        
-       if ((result=php_formatted_print(ht,&len))==NULL) {
+       if ((result=php_formatted_print(ht, &len TSRMLS_CC))==NULL) {
                RETURN_FALSE;
        }
        RETVAL_STRINGL(result,len,1);
@@ -647,7 +647,7 @@ PHP_FUNCTION(user_printf)
        char *result;
        int len;
        
-       if ((result=php_formatted_print(ht,&len))==NULL) {
+       if ((result=php_formatted_print(ht, &len TSRMLS_CC))==NULL) {
                RETURN_FALSE;
        }
        PHPWRITE(result,len);

diff --git a/ext/standard/php_array.h b/ext/standard/php_array.h
index d1aeefa24ccd31c1e64d0b81b3acf9912248e0ad..e96899af50584040af75ce18e0538eca3932335d 100644 (file)
--- a/ext/standard/php_array.h
+++ b/ext/standard/php_array.h
@@ -85,7 +85,7 @@ int multisort_compare(const void *a, const void *b);
 
 typedef struct {
        int *multisort_flags[2];
-       int (*compare_func)(zval *result, zval *op1, zval *op2);
+       int (*compare_func)(zval *result, zval *op1, zval *op2 TSRMLS_DC);
 } php_array_globals;
 
 #ifdef ZTS

diff --git a/ext/standard/var.c b/ext/standard/var.c
index e151ae7182474172e2587dcd59194b051917ec36..bd874ae587181a1ef3d961781c3be82340360ae2 100644 (file)
--- a/ext/standard/var.c
+++ b/ext/standard/var.c
@@ -98,7 +98,9 @@ head_done:
                        break;
                case IS_RESOURCE: {
                        char *type_name;
-                       type_name = zend_rsrc_list_get_rsrc_type(Z_LVAL_PP(struc));
+                       TSRMLS_FETCH();
+
+                       type_name = zend_rsrc_list_get_rsrc_type(Z_LVAL_PP(struc) TSRMLS_CC);
                        php_printf("%sresource(%ld) of type (%s)\n", COMMON, Z_LVAL_PP(struc), type_name ? type_name : "Unknown");
                        break;
                }

diff --git a/ext/wddx/wddx.c b/ext/wddx/wddx.c
index bbcc617a50e445f4e60ac212408dd05f0cbcb38f..9c369695544625df5020a8092629dc9cf7d00a52 100644 (file)
--- a/ext/wddx/wddx.c
+++ b/ext/wddx/wddx.c
@@ -892,6 +892,7 @@ static void php_wddx_process_data(void *user_data, const char *s, int len)
        wddx_stack *stack = (wddx_stack *)user_data;
        char *decoded_value;
        int decoded_len;
+       TSRMLS_FETCH();
 
        if (!wddx_stack_is_empty(stack)) {
                wddx_stack_top(stack, (void**)&ent);
@@ -928,7 +929,7 @@ static void php_wddx_process_data(void *user_data, const char *s, int len)
                                Z_TYPE_P(ent->data) = IS_STRING;
                                Z_STRLEN_P(ent->data) = len;
                                Z_STRVAL_P(ent->data) = estrndup(s, len);
-                               convert_scalar_to_number(ent->data);
+                               convert_scalar_to_number(ent->data TSRMLS_CC);
                                break;
 
                        case ST_BOOLEAN:
@@ -996,7 +997,7 @@ PHP_FUNCTION(wddx_serialize_value)
        int comment_len = 0;
        wddx_packet *packet;
        
-       if (zend_parse_parameters(ZEND_NUM_ARGS(), "z|s",
+       if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z|s",
                                                          &var, &comment, &comment_len) == FAILURE)
                return;
        
@@ -1094,7 +1095,7 @@ PHP_FUNCTION(wddx_packet_start)
 
        comment = NULL;
 
-       if (zend_parse_parameters(ZEND_NUM_ARGS(), "|s", &comment, &comment_len) == FAILURE)
+       if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|s", &comment, &comment_len) == FAILURE)
                return;
 
        packet = php_wddx_constructor();
@@ -1116,7 +1117,7 @@ PHP_FUNCTION(wddx_packet_end)
        zval *packet_id;
        wddx_packet *packet = NULL;
        
-       if (zend_parse_parameters(ZEND_NUM_ARGS(), "r", &packet_id) == FAILURE)
+       if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &packet_id) == FAILURE)
                return;
 
        ZEND_FETCH_RESOURCE(packet, wddx_packet *, &packet_id, -1, "WDDX packet ID", le_wddx);
@@ -1156,7 +1157,7 @@ PHP_FUNCTION(wddx_add_vars)
        
        packet_id = args[0];
 
-       packet = (wddx_packet *)zend_fetch_resource(packet_id, -1, "WDDX packet ID", NULL, 1, le_wddx);
+       packet = (wddx_packet *)zend_fetch_resource(packet_id TSRMLS_CC, -1, "WDDX packet ID", NULL, 1, le_wddx);
        if (!packet)
        {
                efree(args);
@@ -1181,7 +1182,7 @@ PHP_FUNCTION(wddx_deserialize)
        char *packet;
        int packet_len;
        
-       if (zend_parse_parameters(ZEND_NUM_ARGS(), "s", &packet, &packet_len) == FAILURE)
+       if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &packet, &packet_len) == FAILURE)
                return;
 
        if (packet_len == 0)

diff --git a/ext/xml/xml.c b/ext/xml/xml.c
index f43d3be8c6ede60a11a599c9c91135d69132758f..e5de0af07f3529930be1cbc998f98d7d2d0145a1 100644 (file)
--- a/ext/xml/xml.c
+++ b/ext/xml/xml.c
@@ -243,6 +243,8 @@ PHP_MINFO_FUNCTION(xml)
 static zval *_xml_resource_zval(long value)
 {
        zval *ret;
+       TSRMLS_FETCH();
+
        MAKE_STD_ZVAL(ret);
 
        ret->type = IS_RESOURCE;

diff --git a/sapi/apache/sapi_apache.c b/sapi/apache/sapi_apache.c
index e34f6701f9517f58a961e569a16b68b6f47f4c10..1d9e03c3eb096bc2597a2957f063ab653c6a6dcf 100644 (file)
--- a/sapi/apache/sapi_apache.c
+++ b/sapi/apache/sapi_apache.c
@@ -76,7 +76,7 @@ int apache_php_module_main(request_rec *r, int display_source_mode TSRMLS_DC TSR
                zend_syntax_highlighter_ini syntax_highlighter_ini;
 
                php_get_highlight_struct(&syntax_highlighter_ini);
-               if (highlight_file(SG(request_info).path_translated,&syntax_highlighter_ini)){
+               if (highlight_file(SG(request_info).path_translated,&syntax_highlighter_ini TSRMLS_CC)){
                        return OK;
                } else {
                        return NOT_FOUND;