Skip to content

Commit fe6f871

Browse files
zsuraskizsuraski
committed
- Get rid of ELS_*(), and use TSRMLS_*() instead.
- Move to the new ts_allocate_id() API This patch is *bound* to break some files, as I must have had typos somewhere. If you use any uncommon extension, please try to build it...
1 parent 2c254ba commit fe6f871

70 files changed

Lines changed: 392 additions & 381 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎ext/com/COM.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1577,7 +1577,7 @@ static int php_COM_load_typelib(ITypeLib *TypeLib, int mode)
15771577
ITypeComp *TypeComp;
15781578
int i;
15791579
int interfaces;
1580-
ELS_FETCH();
1580+
TSRMLS_FETCH();
15811581

15821582
if(NULL == TypeLib)
15831583
{
@@ -1646,7 +1646,7 @@ static int php_COM_load_typelib(ITypeLib *TypeLib, int mode)
16461646

16471647
/* Before registering the contsnt, let's see if we can find it */
16481648
{
1649-
zend_register_constant(&c ELS_CC);
1649+
zend_register_constant(&c TSRMLS_CC);
16501650
}
16511651
j++;
16521652
}

‎ext/ctype/ctype.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ ZEND_GET_MODULE(ctype)
8585
*/
8686
PHP_MINFO_FUNCTION(ctype)
8787
{
88-
ELS_FETCH();
88+
TSRMLS_FETCH();
8989
SLS_FETCH();
9090

9191
php_info_print_table_start();

‎ext/curl/curl.c‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,7 @@ static size_t curl_write(char *data, size_t size, size_t nmemb, void *ctx)
259259
php_curl *ch = (php_curl *) ctx;
260260
php_curl_write *t = ch->handlers->write;
261261
size_t length = size * nmemb;
262-
ELS_FETCH();
262+
TSRMLS_FETCH();
263263

264264
switch (t->method) {
265265
case PHP_CURL_STDOUT:
@@ -274,7 +274,7 @@ static size_t curl_write(char *data, size_t size, size_t nmemb, void *ctx)
274274
zval *argv[2];
275275
zval *retval;
276276
int error;
277-
ELS_FETCH();
277+
TSRMLS_FETCH();
278278

279279
MAKE_STD_ZVAL(argv[0]);
280280
MAKE_STD_ZVAL(argv[1]);
@@ -315,7 +315,7 @@ static size_t curl_read(char *data, size_t size, size_t nmemb, void *ctx)
315315
php_curl *ch = (php_curl *) ctx;
316316
php_curl_read *t = ch->handlers->read;
317317
int length = -1;
318-
ELS_FETCH();
318+
TSRMLS_FETCH();
319319

320320
switch (t->method) {
321321
case PHP_CURL_DIRECT:
@@ -371,7 +371,7 @@ static size_t curl_write_header(char *data, size_t size, size_t nmemb, void *ctx
371371
php_curl_write *t = ch->handlers->write_header;
372372
int error;
373373
int length;
374-
ELS_FETCH();
374+
TSRMLS_FETCH();
375375

376376
switch (t->method) {
377377
case PHP_CURL_STDOUT:
@@ -437,7 +437,7 @@ static size_t curl_passwd(void *ctx, char *prompt, char *buf, int buflen)
437437
zval *retval;
438438
int error;
439439
int ret = 0;
440-
ELS_FETCH();
440+
TSRMLS_FETCH();
441441

442442
MAKE_STD_ZVAL(argv[0]);
443443
MAKE_STD_ZVAL(argv[1]);

‎ext/db/db.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ dbm_info *php_find_dbm(pval *id)
174174
dbm_info *info;
175175
int numitems, i;
176176
int info_type;
177-
ELS_FETCH();
177+
TSRMLS_FETCH();
178178

179179
if (Z_TYPE_P(id) == IS_STRING) {
180180
numitems = zend_hash_num_elements(&EG(regular_list));

‎ext/ereg/ereg.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -84,17 +84,17 @@ static void _free_reg_cache(reg_cache *rc)
8484
#undef regcomp
8585
#define regcomp(a,b,c) _php_regcomp(a,b,c)
8686

87-
static void php_reg_init_globals(php_reg_globals *reg_globals)
87+
static void php_reg_init_globals(php_reg_globals *reg_globals TSRMLS_DC)
8888
{
8989
zend_hash_init(&reg_globals->ht_rc, 0, NULL, (void (*)(void *)) _free_reg_cache, 1);
9090
}
9191

9292
PHP_MINIT_FUNCTION(regex)
9393
{
9494
#ifdef ZTS
95-
reg_globals_id = ts_allocate_id(sizeof(php_reg_globals), (ts_allocate_ctor) php_reg_init_globals, NULL);
95+
ts_allocate_id(&reg_globals_id, sizeof(php_reg_globals), (ts_allocate_ctor) php_reg_init_globals, NULL);
9696
#else
97-
php_reg_init_globals(&reg_globals);
97+
php_reg_init_globals(&reg_globals TSRMLS_CC);
9898
#endif
9999

100100
return SUCCESS;

‎ext/fdf/fdf.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -731,7 +731,7 @@ SAPI_POST_HANDLER_FUNC(fdf_post_handler)
731731
FDFErc err;
732732
ASInt32 nBytes;
733733
zval *array_ptr = (zval *) arg;
734-
ELS_FETCH();
734+
TSRMLS_FETCH();
735735
PLS_FETCH();
736736

737737
fp=php_open_temporary_file(NULL,"fdfdata.",&filename);
@@ -774,7 +774,7 @@ SAPI_POST_HANDLER_FUNC(fdf_post_handler)
774774
for(p=value;*p;p++) if(*p=='\r') *p='\n';
775775
if(lastfieldname) efree(lastfieldname);
776776
lastfieldname = estrdup(name);
777-
php_register_variable(name, value, array_ptr ELS_CC PLS_CC);
777+
php_register_variable(name, value, array_ptr TSRMLS_CC PLS_CC);
778778
}
779779
}
780780
}

‎ext/hyperwave/hg_comm.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -632,7 +632,7 @@ char *fnInsAnchorsIntoText(char *text, DLIST *pAnchorList, char **bodytag, char
632632
int laststart=0;
633633
char emptystring[BUFFERLEN];
634634
int i;
635-
ELS_FETCH();
635+
TSRMLS_FETCH();
636636

637637
emptystring[0] = '\0';
638638

‎ext/java/java.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -599,7 +599,7 @@ static void _php_java_destructor(zend_rsrc_list_entry *rsrc)
599599
}
600600

601601
#ifdef ZTS
602-
static void alloc_java_globals_ctor(php_java_globals *java_globals) {
602+
static void alloc_java_globals_ctor(php_java_globals *java_globals TSRMLS_DC) {
603603
memset(java_globals, 0, sizeof(php_java_globals));
604604
}
605605
#endif
@@ -624,7 +624,7 @@ PHP_MINIT_FUNCTION(java) {
624624
}
625625

626626
#ifdef ZTS
627-
java_globals_id = ts_allocate_id(sizeof(php_java_globals),
627+
ts_allocate_id(&java_globals_id, sizeof(php_java_globals),
628628
(ts_allocate_ctor)alloc_java_globals_ctor, NULL);
629629
#endif
630630

‎ext/mailparse/mailparse.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -498,7 +498,7 @@ static int extract_callback_user_func(const char *p, size_t n, zval *userfunc)
498498
{
499499
zval * retval;
500500
zval * arg;
501-
ELS_FETCH();
501+
TSRMLS_FETCH();
502502

503503
MAKE_STD_ZVAL(retval);
504504
retval->type = IS_BOOL;

‎ext/mbstring/mbstring.c‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -819,7 +819,7 @@ php_mbstr_encoding_handler(zval *arg, char *res, char *separator) {
819819
mbfl_encoding_detector *identd;
820820
mbfl_buffer_converter *convd;
821821
MBSTRLS_FETCH();
822-
ELS_FETCH();
822+
TSRMLS_FETCH();
823823
PLS_FETCH();
824824

825825
mbfl_string_init(&string);
@@ -919,10 +919,10 @@ php_mbstr_encoding_handler(zval *arg, char *res, char *separator) {
919919
ret = mbfl_buffer_converter_feed_result(convd, &string, &result);
920920
}
921921
if (ret != NULL) {
922-
php_register_variable_safe(val_list[n], ret->val, ret->len, array_ptr ELS_CC PLS_CC);
922+
php_register_variable_safe(val_list[n], ret->val, ret->len, array_ptr TSRMLS_CC PLS_CC);
923923
efree(ret->val);
924924
} else {
925-
php_register_variable_safe(val_list[n], val_list[n+1], len_list[n+1], array_ptr ELS_CC PLS_CC);
925+
php_register_variable_safe(val_list[n], val_list[n+1], len_list[n+1], array_ptr TSRMLS_CC PLS_CC);
926926
}
927927
n+=2;
928928
}
@@ -954,7 +954,7 @@ SAPI_POST_HANDLER_FUNC(php_mbstr_post_handler)
954954
}
955955

956956
/* http input processing */
957-
void mbstr_treat_data(int arg, char *str, zval* destArray ELS_DC PLS_DC SLS_DC)
957+
void mbstr_treat_data(int arg, char *str, zval* destArray TSRMLS_DC PLS_DC SLS_DC)
958958
{
959959
char *res = NULL, *var, *val, *separator=NULL;
960960
const char *c_var;
@@ -1239,7 +1239,7 @@ PHP_FUNCTION(mb_parse_str)
12391239
}
12401240
n++;
12411241
/* add variable to symbol table */
1242-
php_register_variable_safe(var, val, val_len, track_vars_array ELS_CC PLS_CC);
1242+
php_register_variable_safe(var, val, val_len, track_vars_array TSRMLS_CC PLS_CC);
12431243
mbfl_string_clear(&resvar);
12441244
mbfl_string_clear(&resval);
12451245
}

0 commit comments

Comments
 (0)