From 5e9b4c26a5e43a4c97555b69b105c265240febd2 Mon Sep 17 00:00:00 2001 From: Anatol Belski Date: Mon, 21 Nov 2016 23:53:37 +0100 Subject: [PATCH] remove TSRMLS_* --- ext/gd/gd.c | 6 +++--- ext/intl/locale/locale_methods.c | 2 +- ext/json/json.c | 4 ++-- ext/mbstring/mbstring.c | 4 ++-- ext/mcrypt/mcrypt.c | 4 ++-- ext/opcache/ZendAccelerator.c | 4 ++-- ext/pdo/pdo_stmt.c | 2 +- ext/session/mod_files.c | 4 ++-- ext/snmp/snmp.c | 4 ++-- ext/sockets/sockets.c | 2 +- ext/xml/xml.c | 2 +- 11 files changed, 19 insertions(+), 19 deletions(-) diff --git a/ext/gd/gd.c b/ext/gd/gd.c index 2aa03a9551..88c90487f5 100644 --- 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 12cf6c1ce3..247262ad19 100644 --- 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 a58cb31275..01319d5f5b 100644 --- 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 7ae96f597a..d5af96a5a1 100644 --- 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 e7bdd43c9b..aa0abbd879 100644 --- 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 1491c88097..8844da6d59 100644 --- 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 0ff8a04000..a33bc2158c 100644 --- 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 b33f07e69e..7c25657616 100644 --- 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 63e8095ed7..2cfb345a24 100644 --- 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 63674c50d7..78c7652349 100644 --- 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 43086934a5..f3ca5d3047 100644 --- 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; -- 2.40.0