mirror of
https://github.com/php/php-src.git
synced 2024-09-21 18:07:23 +00:00
remove TSRMLS_*
This commit is contained in:
parent
914ff56cff
commit
5e9b4c26a5
@ -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);
|
||||
|
@ -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) {
|
||||
|
@ -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();
|
||||
}
|
||||
|
||||
|
@ -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);
|
||||
|
@ -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);
|
||||
|
@ -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;
|
||||
}
|
||||
|
@ -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);
|
||||
|
||||
|
@ -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
|
||||
|
@ -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);
|
||||
}
|
||||
/* }}} */
|
||||
|
||||
|
@ -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) {
|
||||
|
@ -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;
|
||||
|
Loading…
Reference in New Issue
Block a user