Skip to content

Commit d61db8d

Browse files
weltlingweltling
committed
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0: remove TSRMLS_*
2 parents 2f5e49b + 5e9b4c2 commit d61db8d

File tree

11 files changed

+19
-19
lines changed

11 files changed

+19
-19
lines changed

‎ext/gd/gd.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1036,7 +1036,7 @@ void php_gd_error_method(int type, const char *format, va_list args)
10361036
default:
10371037
type = E_ERROR;
10381038
}
1039-
php_verror(NULL, "", type, format, args TSRMLS_CC);
1039+
php_verror(NULL, "", type, format, args);
10401040
}
10411041
/* }}} */
10421042
#endif
@@ -3040,7 +3040,7 @@ PHP_FUNCTION(imagegammacorrect)
30403040
}
30413041

30423042
if ( input <= 0.0 || output <= 0.0 ) {
3043-
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Gamma values should be positive");
3043+
php_error_docref(NULL, E_WARNING, "Gamma values should be positive");
30443044
RETURN_FALSE;
30453045
}
30463046

@@ -4668,7 +4668,7 @@ PHP_FUNCTION(imagecropauto)
46684668

46694669
case GD_CROP_THRESHOLD:
46704670
if (color < 0 || (!gdImageTrueColor(im) && color >= gdImageColorsTotal(im))) {
4671-
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Color argument missing with threshold mode");
4671+
php_error_docref(NULL, E_WARNING, "Color argument missing with threshold mode");
46724672
RETURN_FALSE;
46734673
}
46744674
im_crop = gdImageCropThreshold(im, color, (float) threshold);

‎ext/intl/locale/locale_methods.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1624,7 +1624,7 @@ PHP_FUNCTION(locale_accept_from_http)
16241624
len = end ? end-start : http_accept_len-(start-http_accept);
16251625
if(len > ULOC_FULLNAME_CAPACITY) {
16261626
intl_error_set( NULL, U_ILLEGAL_ARGUMENT_ERROR,
1627-
"locale_accept_from_http: locale string too long", 0 TSRMLS_CC );
1627+
"locale_accept_from_http: locale string too long", 0 );
16281628
RETURN_FALSE;
16291629
}
16301630
if(end) {

‎ext/json/json.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -271,12 +271,12 @@ static PHP_FUNCTION(json_decode)
271271
}
272272

273273
if (depth <= 0) {
274-
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Depth must be greater than zero");
274+
php_error_docref(NULL, E_WARNING, "Depth must be greater than zero");
275275
RETURN_NULL();
276276
}
277277

278278
if (depth > INT_MAX) {
279-
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Depth must be lower than %d", INT_MAX);
279+
php_error_docref(NULL, E_WARNING, "Depth must be lower than %d", INT_MAX);
280280
RETURN_NULL();
281281
}
282282

‎ext/mbstring/mbstring.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3852,7 +3852,7 @@ PHP_FUNCTION(mb_convert_variables)
38523852
if (elist != NULL) {
38533853
efree((void *)elist);
38543854
}
3855-
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Cannot handle recursive references");
3855+
php_error_docref(NULL, E_WARNING, "Cannot handle recursive references");
38563856
RETURN_FALSE;
38573857
}
38583858
efree(stack);
@@ -3969,7 +3969,7 @@ PHP_FUNCTION(mb_convert_variables)
39693969
}
39703970
}
39713971
efree(stack);
3972-
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Cannot handle recursive references");
3972+
php_error_docref(NULL, E_WARNING, "Cannot handle recursive references");
39733973
RETURN_FALSE;
39743974
}
39753975
efree(stack);

‎ext/mcrypt/mcrypt.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -642,7 +642,7 @@ PHP_FUNCTION(mcrypt_generic)
642642
block_size = mcrypt_enc_get_block_size(pm->td);
643643
data_size = ((((int)data_len - 1) / block_size) + 1) * block_size;
644644
if (data_size <= 0) {
645-
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Integer overflow in data size");
645+
php_error_docref(NULL, E_WARNING, "Integer overflow in data size");
646646
RETURN_FALSE;
647647
}
648648
data_str = zend_string_alloc(data_size, 0);
@@ -696,7 +696,7 @@ PHP_FUNCTION(mdecrypt_generic)
696696
block_size = mcrypt_enc_get_block_size(pm->td);
697697
data_size = ((((int)data_len - 1) / block_size) + 1) * block_size;
698698
if (data_size <= 0) {
699-
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Integer overflow in data size");
699+
php_error_docref(NULL, E_WARNING, "Integer overflow in data size");
700700
RETURN_FALSE;
701701
}
702702
data_s = emalloc((size_t)data_size + 1);

‎ext/opcache/ZendAccelerator.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1777,10 +1777,10 @@ zend_op_array *persistent_compile_file(zend_file_handle *file_handle, int type)
17771777
file_handle->type == ZEND_HANDLE_FILENAME &&
17781778
UNEXPECTED(access(ZSTR_VAL(persistent_script->script.filename), R_OK) != 0)) {
17791779
if (type == ZEND_REQUIRE) {
1780-
zend_message_dispatcher(ZMSG_FAILED_REQUIRE_FOPEN, file_handle->filename TSRMLS_CC);
1780+
zend_message_dispatcher(ZMSG_FAILED_REQUIRE_FOPEN, file_handle->filename);
17811781
zend_bailout();
17821782
} else {
1783-
zend_message_dispatcher(ZMSG_FAILED_INCLUDE_FOPEN, file_handle->filename TSRMLS_CC);
1783+
zend_message_dispatcher(ZMSG_FAILED_INCLUDE_FOPEN, file_handle->filename);
17841784
}
17851785
return NULL;
17861786
}

‎ext/pdo/pdo_stmt.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2563,7 +2563,7 @@ static int row_prop_exists(zval *object, zval *member, int check_empty, void **c
25632563
int res;
25642564
zval val;
25652565

2566-
fetch_value(stmt, &val, colno, NULL TSRMLS_CC);
2566+
fetch_value(stmt, &val, colno, NULL);
25672567
res = check_empty ? i_zend_is_true(&val) : Z_TYPE(val) != IS_NULL;
25682568
zval_dtor(&val);
25692569

‎ext/session/mod_files.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ static void ps_files_open(ps_files *data, const char *key)
175175
}
176176

177177
if (!ps_files_path_create(buf, sizeof(buf), data, key)) {
178-
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);
178+
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);
179179
return;
180180
}
181181

@@ -200,7 +200,7 @@ static void ps_files_open(ps_files *data, const char *key)
200200
if (fstat(data->fd, &sbuf) || (sbuf.st_uid != 0 && sbuf.st_uid != getuid() && sbuf.st_uid != geteuid())) {
201201
close(data->fd);
202202
data->fd = -1;
203-
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Session data file is not created by your uid");
203+
php_error_docref(NULL, E_WARNING, "Session data file is not created by your uid");
204204
return;
205205
}
206206
#endif

‎ext/snmp/snmp.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2068,11 +2068,11 @@ static int php_snmp_has_property(zval *object, zval *member, int has_set_exists,
20682068
}
20692069
/* }}} */
20702070

2071-
static HashTable *php_snmp_get_gc(zval *object, zval ***gc_data, int *gc_data_count TSRMLS_DC) /* {{{ */
2071+
static HashTable *php_snmp_get_gc(zval *object, zval ***gc_data, int *gc_data_count) /* {{{ */
20722072
{
20732073
*gc_data = NULL;
20742074
*gc_data_count = 0;
2075-
return zend_std_get_properties(object TSRMLS_CC);
2075+
return zend_std_get_properties(object);
20762076
}
20772077
/* }}} */
20782078

‎ext/sockets/sockets.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2370,7 +2370,7 @@ PHP_FUNCTION(socket_export_stream)
23702370
char *protocol = NULL;
23712371
size_t protocollen = 0;
23722372

2373-
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &zsocket) == FAILURE) {
2373+
if (zend_parse_parameters(ZEND_NUM_ARGS(), "r", &zsocket) == FAILURE) {
23742374
return;
23752375
}
23762376
if ((socket = (php_socket *) zend_fetch_resource(Z_RES_P(zsocket), le_socket_name, le_socket)) == NULL) {

‎ext/xml/xml.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1606,7 +1606,7 @@ PHP_FUNCTION(xml_parser_set_option)
16061606
convert_to_long_ex(val);
16071607
parser->toffset = Z_LVAL_P(val);
16081608
if (parser->toffset < 0) {
1609-
php_error_docref(NULL TSRMLS_CC, E_NOTICE, "tagstart ignored, because it is out of range");
1609+
php_error_docref(NULL, E_NOTICE, "tagstart ignored, because it is out of range");
16101610
parser->toffset = 0;
16111611
}
16121612
break;

0 commit comments

Comments
 (0)