remove TSRMLS_*

diff --git a/ext/gd/gd.c b/ext/gd/gd.c
index 2aa03a95519ecf7120f74c229c3fa7999bab3175..88c90487f59b4bfcae0df713228efa2959197a6c 100644 (file)
--- a/ext/gd/gd.c
+++ b/ext/gd/gd.c
@@ -1036,7 +1036,7 @@ void php_gd_error_method(int type, const char *format, va_list args)
                default:
                        type = E_ERROR;
        }
-       php_verror(NULL, "", type, format, args TSRMLS_CC);
+       php_verror(NULL, "", type, format, args);
 }
 /* }}} */
 #endif
@@ -3040,7 +3040,7 @@ PHP_FUNCTION(imagegammacorrect)
        }
 
        if ( input <= 0.0 || output <= 0.0 ) {
-               php_error_docref(NULL TSRMLS_CC, E_WARNING, "Gamma values should be positive");
+               php_error_docref(NULL, E_WARNING, "Gamma values should be positive");
                RETURN_FALSE;
        }
 
@@ -4668,7 +4668,7 @@ PHP_FUNCTION(imagecropauto)
 
                case GD_CROP_THRESHOLD:
                        if (color < 0 || (!gdImageTrueColor(im) && color >= gdImageColorsTotal(im))) {
-                               php_error_docref(NULL TSRMLS_CC, E_WARNING, "Color argument missing with threshold mode");
+                               php_error_docref(NULL, E_WARNING, "Color argument missing with threshold mode");
                                RETURN_FALSE;
                        }
                        im_crop = gdImageCropThreshold(im, color, (float) threshold);

diff --git a/ext/intl/locale/locale_methods.c b/ext/intl/locale/locale_methods.c
index 12cf6c1ce3b4cfc8c9fcc299139cf98988bd015e..247262ad190a5f0a3b0de6a8a6e011ffb72e8913 100644 (file)
--- a/ext/intl/locale/locale_methods.c
+++ b/ext/intl/locale/locale_methods.c
@@ -1628,7 +1628,7 @@ PHP_FUNCTION(locale_accept_from_http)
                        len = end ? end-start : http_accept_len-(start-http_accept);
                        if(len > ULOC_FULLNAME_CAPACITY) {
                                intl_error_set( NULL, U_ILLEGAL_ARGUMENT_ERROR,
-                                               "locale_accept_from_http: locale string too long", 0 TSRMLS_CC );
+                                               "locale_accept_from_http: locale string too long", 0 );
                                RETURN_FALSE;
                        }
                        if(end) {

diff --git a/ext/json/json.c b/ext/json/json.c
index a58cb31275d4c091b37aa699e89a8e3ee3914ef3..01319d5f5bc29cdadcaf54dad7d954ca73d90590 100644 (file)
--- a/ext/json/json.c
+++ b/ext/json/json.c
@@ -261,12 +261,12 @@ static PHP_FUNCTION(json_decode)
        }
 
        if (depth <= 0) {
-               php_error_docref(NULL TSRMLS_CC, E_WARNING, "Depth must be greater than zero");
+               php_error_docref(NULL, E_WARNING, "Depth must be greater than zero");
                RETURN_NULL();
        }
 
        if (depth > INT_MAX) {
-               php_error_docref(NULL TSRMLS_CC, E_WARNING, "Depth must be lower than %d", INT_MAX);
+               php_error_docref(NULL, E_WARNING, "Depth must be lower than %d", INT_MAX);
                RETURN_NULL();
        }
 

diff --git a/ext/mbstring/mbstring.c b/ext/mbstring/mbstring.c
index 7ae96f597af7b966981907c02e1ce3817a113fac..d5af96a5a110446d13a69edef880c76872977ee9 100644 (file)
--- a/ext/mbstring/mbstring.c
+++ b/ext/mbstring/mbstring.c
@@ -3825,7 +3825,7 @@ detect_end:
                        if (elist != NULL) {
                                efree((void *)elist);
                        }
-                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "Cannot handle recursive references");
+                       php_error_docref(NULL, E_WARNING, "Cannot handle recursive references");
                        RETURN_FALSE;
                }
                efree(stack);
@@ -3942,7 +3942,7 @@ conv_end:
                                }
                        }
                        efree(stack);
-                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "Cannot handle recursive references");
+                       php_error_docref(NULL, E_WARNING, "Cannot handle recursive references");
                        RETURN_FALSE;
                }
                efree(stack);

diff --git a/ext/mcrypt/mcrypt.c b/ext/mcrypt/mcrypt.c
index e7bdd43c9bb2c449e1e6da065babd96ddf277cb8..aa0abbd8791c521a8bec97eff55f56f3b82d2c93 100644 (file)
--- a/ext/mcrypt/mcrypt.c
+++ b/ext/mcrypt/mcrypt.c
@@ -642,7 +642,7 @@ PHP_FUNCTION(mcrypt_generic)
                block_size = mcrypt_enc_get_block_size(pm->td);
                data_size = ((((int)data_len - 1) / block_size) + 1) * block_size;
                if (data_size <= 0) {
-                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "Integer overflow in data size");
+                       php_error_docref(NULL, E_WARNING, "Integer overflow in data size");
                        RETURN_FALSE;
                }
                data_str = zend_string_alloc(data_size, 0);
@@ -696,7 +696,7 @@ PHP_FUNCTION(mdecrypt_generic)
                block_size = mcrypt_enc_get_block_size(pm->td);
                data_size = ((((int)data_len - 1) / block_size) + 1) * block_size;
                if (data_size <= 0) {
-                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "Integer overflow in data size");
+                       php_error_docref(NULL, E_WARNING, "Integer overflow in data size");
                        RETURN_FALSE;
                }
                data_s = emalloc((size_t)data_size + 1);

diff --git a/ext/opcache/ZendAccelerator.c b/ext/opcache/ZendAccelerator.c
index 1491c88097b8047a32a309e408551d159aa60ae5..8844da6d591d3e13bf5ce01ef710a919d5628a10 100644 (file)
--- a/ext/opcache/ZendAccelerator.c
+++ b/ext/opcache/ZendAccelerator.c
@@ -1769,10 +1769,10 @@ zend_op_array *persistent_compile_file(zend_file_handle *file_handle, int type)
            file_handle->type == ZEND_HANDLE_FILENAME &&
            UNEXPECTED(access(ZSTR_VAL(persistent_script->full_path), R_OK) != 0)) {
                if (type == ZEND_REQUIRE) {
-                       zend_message_dispatcher(ZMSG_FAILED_REQUIRE_FOPEN, file_handle->filename TSRMLS_CC);
+                       zend_message_dispatcher(ZMSG_FAILED_REQUIRE_FOPEN, file_handle->filename);
                        zend_bailout();
                } else {
-                       zend_message_dispatcher(ZMSG_FAILED_INCLUDE_FOPEN, file_handle->filename TSRMLS_CC);
+                       zend_message_dispatcher(ZMSG_FAILED_INCLUDE_FOPEN, file_handle->filename);
                }
                return NULL;
        }

diff --git a/ext/pdo/pdo_stmt.c b/ext/pdo/pdo_stmt.c
index 0ff8a040007e66e151e1d6c59f06387a25a7dda1..a33bc2158cba4bb89aea90dfcaf80f28fe55da22 100644 (file)
--- a/ext/pdo/pdo_stmt.c
+++ b/ext/pdo/pdo_stmt.c
@@ -2568,7 +2568,7 @@ static int row_prop_exists(zval *object, zval *member, int check_empty, void **c
                                        int res;
                                        zval val;
 
-                                       fetch_value(stmt, &val, colno, NULL TSRMLS_CC);
+                                       fetch_value(stmt, &val, colno, NULL);
                                        res = check_empty ? i_zend_is_true(&val) : Z_TYPE(val) != IS_NULL;
                                        zval_dtor(&val);
 

diff --git a/ext/session/mod_files.c b/ext/session/mod_files.c
index b33f07e69e3d1a00c57ecee9f1c200509ce21ed5..7c25657616de929234191a7b38384dc7d06176c7 100644 (file)
--- a/ext/session/mod_files.c
+++ b/ext/session/mod_files.c
@@ -175,7 +175,7 @@ static void ps_files_open(ps_files *data, const char *key)
                }
 
                if (!ps_files_path_create(buf, sizeof(buf), data, key)) {
-                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to create session data file path. Too short session ID, invalid save_path or path lentgth exceeds MAXPATHLEN(%d)", MAXPATHLEN);
+                       php_error_docref(NULL, E_WARNING, "Failed to create session data file path. Too short session ID, invalid save_path or path lentgth exceeds MAXPATHLEN(%d)", MAXPATHLEN);
                        return;
                }
 
@@ -200,7 +200,7 @@ static void ps_files_open(ps_files *data, const char *key)
                        if (fstat(data->fd, &sbuf) || (sbuf.st_uid != 0 && sbuf.st_uid != getuid() && sbuf.st_uid != geteuid())) {
                                close(data->fd);
                                data->fd = -1;
-                               php_error_docref(NULL TSRMLS_CC, E_WARNING, "Session data file is not created by your uid");
+                               php_error_docref(NULL, E_WARNING, "Session data file is not created by your uid");
                                return;
                        }
 #endif

diff --git a/ext/snmp/snmp.c b/ext/snmp/snmp.c
index 63e8095ed7cebdfe78a1a8f1cef1c699b33ebab7..2cfb345a243cdae9ee1648f01499fba2892fef59 100644 (file)
--- a/ext/snmp/snmp.c
+++ b/ext/snmp/snmp.c
@@ -2071,11 +2071,11 @@ static int php_snmp_has_property(zval *object, zval *member, int has_set_exists,
 }
 /* }}} */
 
-static HashTable *php_snmp_get_gc(zval *object, zval ***gc_data, int *gc_data_count TSRMLS_DC) /* {{{ */
+static HashTable *php_snmp_get_gc(zval *object, zval ***gc_data, int *gc_data_count) /* {{{ */
 {
        *gc_data = NULL;
        *gc_data_count = 0;
-       return zend_std_get_properties(object TSRMLS_CC);
+       return zend_std_get_properties(object);
 }
 /* }}} */
 

diff --git a/ext/sockets/sockets.c b/ext/sockets/sockets.c
index 63674c50d73152125d34d399a4b289c73f83d6ea..78c765234937788fcd785783b234927c836edee2 100644 (file)
--- a/ext/sockets/sockets.c
+++ b/ext/sockets/sockets.c
@@ -2370,7 +2370,7 @@ PHP_FUNCTION(socket_export_stream)
        char *protocol = NULL;
        size_t protocollen = 0;
 
-       if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &zsocket) == FAILURE) {
+       if (zend_parse_parameters(ZEND_NUM_ARGS(), "r", &zsocket) == FAILURE) {
                return;
        }
        if ((socket = (php_socket *) zend_fetch_resource(Z_RES_P(zsocket), le_socket_name, le_socket)) == NULL) {

diff --git a/ext/xml/xml.c b/ext/xml/xml.c
index 43086934a56b83017322d566fd04cd4ecb5a6edd..f3ca5d304737b2a5a4cf44915463f3a76fc2bd49 100644 (file)
--- a/ext/xml/xml.c
+++ b/ext/xml/xml.c
@@ -1610,7 +1610,7 @@ PHP_FUNCTION(xml_parser_set_option)
                        convert_to_long_ex(val);
                        parser->toffset = Z_LVAL_P(val);
                        if (parser->toffset < 0) {
-                               php_error_docref(NULL TSRMLS_CC, E_NOTICE, "tagstart ignored, because it is out of range");
+                               php_error_docref(NULL, E_NOTICE, "tagstart ignored, because it is out of range");
                                parser->toffset = 0;
                        }
                        break;