summaryrefslogtreecommitdiff
path: root/ext/standard
diff options
context:
space:
mode:
Diffstat (limited to 'ext/standard')
-rw-r--r--ext/standard/array.c20
-rw-r--r--ext/standard/basic_functions.c8
-rw-r--r--ext/standard/file.c50
-rw-r--r--ext/standard/formatted_print.c6
-rw-r--r--ext/standard/php_array.h2
-rw-r--r--ext/standard/var.c4
6 files changed, 46 insertions, 44 deletions
diff --git a/ext/standard/array.c b/ext/standard/array.c
index 318f4e08ba..1a6b6798b8 100644
--- a/ext/standard/array.c
+++ b/ext/standard/array.c
@@ -146,7 +146,7 @@ static int array_key_compare(const void *a, const void *b)
Z_STRLEN(second) = s->nKeyLength;
}
- if (ARRAYG(compare_func)(&result, &first, &second) == FAILURE) {
+ if (ARRAYG(compare_func)(&result, &first, &second TSRMLS_CC) == FAILURE) {
return 0;
}
@@ -278,7 +278,7 @@ static int array_data_compare(const void *a, const void *b)
first = *((pval **) f->pData);
second = *((pval **) s->pData);
- if (ARRAYG(compare_func)(&result, first, second) == FAILURE) {
+ if (ARRAYG(compare_func)(&result, first, second TSRMLS_CC) == FAILURE) {
return 0;
}
@@ -878,7 +878,7 @@ PHP_FUNCTION(min)
min = args[0];
for (i=1; i<ZEND_NUM_ARGS(); i++) {
- is_smaller_function(&result, *args[i], *min);
+ is_smaller_function(&result, *args[i], *min TSRMLS_CC);
if (Z_LVAL(result) == 1) {
min = args[i];
}
@@ -930,7 +930,7 @@ PHP_FUNCTION(max)
max = args[0];
for (i=1; i<ZEND_NUM_ARGS(); i++) {
- is_smaller_or_equal_function(&result, *args[i], *max);
+ is_smaller_or_equal_function(&result, *args[i], *max TSRMLS_CC);
if (Z_LVAL(result) == 0) {
max = args[i];
}
@@ -1044,7 +1044,7 @@ static void php_search_array(INTERNAL_FUNCTION_PARAMETERS, int behavior)
HashPosition pos; /* hash iterator */
ulong num_key;
char *string_key;
- int (*compare_func)(zval *, zval *, zval *) = is_equal_function;
+ int (*compare_func)(zval *, zval *, zval * TSRMLS_DC) = is_equal_function;
if (ZEND_NUM_ARGS() < 2 || ZEND_NUM_ARGS() > 3 ||
zend_get_parameters_ex(ZEND_NUM_ARGS(), &value, &array, &strict) == FAILURE) {
@@ -1065,13 +1065,13 @@ static void php_search_array(INTERNAL_FUNCTION_PARAMETERS, int behavior)
convert_to_boolean_ex(strict);
if (Z_LVAL_PP(strict)) {
compare_func = is_identical_function;
- }
+ }
}
target_hash = HASH_OF(*array);
zend_hash_internal_pointer_reset_ex(target_hash, &pos);
while(zend_hash_get_current_data_ex(target_hash, (void **)&entry, &pos) == SUCCESS) {
- compare_func(&res, *value, *entry);
+ compare_func(&res, *value, *entry TSRMLS_CC);
if (Z_LVAL(res) == 1) {
if (behavior==0) {
RETURN_TRUE;
@@ -1941,7 +1941,7 @@ PHP_FUNCTION(array_keys)
zend_hash_internal_pointer_reset_ex(Z_ARRVAL_PP(input), &pos);
while(zend_hash_get_current_data_ex(Z_ARRVAL_PP(input), (void **)&entry, &pos) == SUCCESS) {
if (search_value != NULL) {
- is_equal_function(&res, *search_value, *entry);
+ is_equal_function(&res, *search_value, *entry TSRMLS_CC);
add_key = zval_is_true(&res);
}
@@ -2513,7 +2513,7 @@ int multisort_compare(const void *a, const void *b)
do {
set_compare_func(ARRAYG(multisort_flags)[MULTISORT_TYPE][r]);
- ARRAYG(compare_func)(&temp, *((zval **)ab[r]->pData), *((zval **)bb[r]->pData));
+ ARRAYG(compare_func)(&temp, *((zval **)ab[r]->pData), *((zval **)bb[r]->pData) TSRMLS_CC);
result = ARRAYG(multisort_flags)[MULTISORT_ORDER][r] * Z_LVAL(temp);
if (result != 0)
return result;
@@ -2830,7 +2830,7 @@ PHP_FUNCTION(array_sum)
continue;
SEPARATE_ZVAL(entry);
- convert_scalar_to_number(*entry);
+ convert_scalar_to_number(*entry TSRMLS_CC);
if (Z_TYPE_PP(entry) == IS_LONG && Z_TYPE_P(return_value) == IS_LONG) {
Z_LVAL_P(return_value) += Z_LVAL_PP(entry);
diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c
index 4fc830ab01..7767ec275d 100644
--- a/ext/standard/basic_functions.c
+++ b/ext/standard/basic_functions.c
@@ -1863,12 +1863,13 @@ static int user_tick_function_compare(user_tick_function_entry *tick_fe1,
{
zval *func1 = tick_fe1->arguments[0];
zval *func2 = tick_fe2->arguments[0];
+ TSRMLS_FETCH();
if (Z_TYPE_P(func1) == IS_STRING && Z_TYPE_P(func2) == IS_STRING) {
return (zend_binary_zval_strcmp(func1, func2) == 0);
} else if (Z_TYPE_P(func1) == IS_ARRAY && Z_TYPE_P(func2) == IS_ARRAY) {
zval result;
- zend_compare_arrays(&result, func1, func2);
+ zend_compare_arrays(&result, func1, func2 TSRMLS_CC);
return (Z_LVAL(result) == 0);
} else
return 0;
@@ -1933,7 +1934,6 @@ PHP_FUNCTION(highlight_file)
pval **filename;
zend_syntax_highlighter_ini syntax_highlighter_ini;
-
if (ZEND_NUM_ARGS()!=1 || zend_get_parameters_ex(1, &filename)==FAILURE) {
WRONG_PARAM_COUNT;
}
@@ -1941,7 +1941,7 @@ PHP_FUNCTION(highlight_file)
php_get_highlight_struct(&syntax_highlighter_ini);
- if (highlight_file(Z_STRVAL_PP(filename), &syntax_highlighter_ini)==FAILURE) {
+ if (highlight_file(Z_STRVAL_PP(filename), &syntax_highlighter_ini TSRMLS_CC)==FAILURE) {
RETURN_FALSE;
}
RETURN_TRUE;
@@ -1967,7 +1967,7 @@ PHP_FUNCTION(highlight_string)
hicompiled_string_description = zend_make_compiled_string_description("highlighted code" TSRMLS_CC);
- if (highlight_string(*expr, &syntax_highlighter_ini, hicompiled_string_description)==FAILURE) {
+ if (highlight_string(*expr, &syntax_highlighter_ini, hicompiled_string_description TSRMLS_CC)==FAILURE) {
efree(hicompiled_string_description);
RETURN_FALSE;
}
diff --git a/ext/standard/file.c b/ext/standard/file.c
index 0af13d8388..d2d076343f 100644
--- a/ext/standard/file.c
+++ b/ext/standard/file.c
@@ -243,7 +243,7 @@ PHP_FUNCTION(flock)
WRONG_PARAM_COUNT;
}
- what = zend_fetch_resource(arg1, -1, "File-Handle", &type, 4, le_fopen, le_popen, le_socket, le_stream);
+ what = zend_fetch_resource(arg1 TSRMLS_CC, -1, "File-Handle", &type, 4, le_fopen, le_popen, le_socket, le_stream);
ZEND_VERIFY_RESOURCE(what);
#if HAVE_PHP_STREAM
@@ -705,7 +705,7 @@ PHP_FUNCTION(fclose)
WRONG_PARAM_COUNT;
}
- what = zend_fetch_resource(arg1, -1, "File-Handle", &type, 3, le_fopen, le_socket, le_stream);
+ what = zend_fetch_resource(arg1 TSRMLS_CC, -1, "File-Handle", &type, 3, le_fopen, le_socket, le_stream);
ZEND_VERIFY_RESOURCE(what);
zend_list_delete((*arg1)->value.lval);
@@ -783,7 +783,7 @@ PHP_FUNCTION(pclose)
WRONG_PARAM_COUNT;
}
- what = zend_fetch_resource(arg1,-1,"File-Handle",NULL,1,le_popen);
+ what = zend_fetch_resource(arg1 TSRMLS_CC,-1,"File-Handle",NULL,1,le_popen);
ZEND_VERIFY_RESOURCE(what);
zend_list_delete((*arg1)->value.lval);
@@ -805,7 +805,7 @@ PHP_FUNCTION(feof)
if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &arg1) == FAILURE) {
WRONG_PARAM_COUNT;
}
- what = zend_fetch_resource(arg1, -1, "File-Handle", &type, 4, le_fopen, le_popen, le_socket, le_stream);
+ what = zend_fetch_resource(arg1 TSRMLS_CC, -1, "File-Handle", &type, 4, le_fopen, le_popen, le_socket, le_stream);
ZEND_VERIFY_RESOURCE(what);
if (type == le_socket) {
@@ -877,7 +877,7 @@ PHP_FUNCTION(socket_set_blocking)
WRONG_PARAM_COUNT;
}
- what = zend_fetch_resource(arg1, -1, "File-Handle", &type, 2, le_socket, le_stream);
+ what = zend_fetch_resource(arg1 TSRMLS_CC, -1, "File-Handle", &type, 2, le_socket, le_stream);
ZEND_VERIFY_RESOURCE(what);
convert_to_long_ex(arg2);
@@ -925,7 +925,7 @@ PHP_FUNCTION(socket_set_timeout)
WRONG_PARAM_COUNT;
}
/* XXX: add stream support --Wez. */
- what = zend_fetch_resource(socket, -1, "File-Handle", &type, 1, le_socket);
+ what = zend_fetch_resource(socket TSRMLS_CC, -1, "File-Handle", &type, 1, le_socket);
ZEND_VERIFY_RESOURCE(what);
socketd = *(int *)what;
@@ -963,7 +963,7 @@ PHP_FUNCTION(socket_get_status)
}
/* XXX: add stream support --Wez. */
- what = zend_fetch_resource(socket, -1, "File-Handle", &type, 1, le_socket);
+ what = zend_fetch_resource(socket TSRMLS_CC, -1, "File-Handle", &type, 1, le_socket);
ZEND_VERIFY_RESOURCE(what);
socketd = *(int *)what;
sock = php_get_socket(socketd);
@@ -994,7 +994,7 @@ PHP_FUNCTION(fgets)
WRONG_PARAM_COUNT;
}
- what = zend_fetch_resource(arg1, -1, "File-Handle", &type, 4, le_fopen, le_popen, le_socket, le_stream);
+ what = zend_fetch_resource(arg1 TSRMLS_CC, -1, "File-Handle", &type, 4, le_fopen, le_popen, le_socket, le_stream);
ZEND_VERIFY_RESOURCE(what);
convert_to_long_ex(arg2);
@@ -1070,7 +1070,7 @@ PHP_FUNCTION(fgetc) {
WRONG_PARAM_COUNT;
}
- what = zend_fetch_resource(arg1, -1, "File-Handle", &type, 4, le_fopen, le_popen, le_socket, le_stream);
+ what = zend_fetch_resource(arg1 TSRMLS_CC, -1, "File-Handle", &type, 4, le_fopen, le_popen, le_socket, le_stream);
ZEND_VERIFY_RESOURCE(what);
if (type == le_socket) {
@@ -1142,7 +1142,7 @@ PHP_FUNCTION(fgetss)
break;
}
- what = zend_fetch_resource(fd, -1, "File-Handle", &type, 4, le_fopen, le_popen, le_socket, le_stream);
+ what = zend_fetch_resource(fd TSRMLS_CC, -1, "File-Handle", &type, 4, le_fopen, le_popen, le_socket, le_stream);
ZEND_VERIFY_RESOURCE(what);
if (type == le_socket) {
@@ -1210,7 +1210,7 @@ PHP_FUNCTION(fscanf)
file_handle = args[0];
format_string = args[1];
- what = zend_fetch_resource(file_handle, -1, "File-Handle", &type, 4, le_fopen, le_popen, le_socket, le_stream);
+ what = zend_fetch_resource(file_handle TSRMLS_CC, -1, "File-Handle", &type, 4, le_fopen, le_popen, le_socket, le_stream);
/*
* we can't do a ZEND_VERIFY_RESOURCE(what), otherwise we end up
@@ -1294,7 +1294,7 @@ PHP_FUNCTION(fwrite)
break;
}
- what = zend_fetch_resource(arg1, -1, "File-Handle", &type, 4, le_fopen,
+ what = zend_fetch_resource(arg1 TSRMLS_CC, -1, "File-Handle", &type, 4, le_fopen,
le_popen, le_socket, le_stream);
ZEND_VERIFY_RESOURCE(what);
@@ -1344,7 +1344,7 @@ PHP_FUNCTION(fflush)
WRONG_PARAM_COUNT;
}
- what = zend_fetch_resource(arg1,-1,"File-Handle",&type,4,le_fopen,le_popen,le_socket, le_stream);
+ what = zend_fetch_resource(arg1 TSRMLS_CC,-1,"File-Handle",&type,4,le_fopen,le_popen,le_socket, le_stream);
ZEND_VERIFY_RESOURCE(what);
#if HAVE_PHP_STREAM
@@ -1399,7 +1399,7 @@ PHP_FUNCTION(set_file_buffer)
/* XXX: add stream support --Wez. */
- what = zend_fetch_resource(arg1,-1,"File-Handle",&type,2,le_fopen,le_popen);
+ what = zend_fetch_resource(arg1 TSRMLS_CC,-1,"File-Handle",&type,2,le_fopen,le_popen);
ZEND_VERIFY_RESOURCE(what);
convert_to_long_ex(arg2);
@@ -1429,7 +1429,7 @@ PHP_FUNCTION(rewind)
}
/* XXX: add stream support --Wez. */
- what = zend_fetch_resource(arg1,-1,"File-Handle",NULL,2,le_fopen,le_popen);
+ what = zend_fetch_resource(arg1 TSRMLS_CC,-1,"File-Handle",NULL,2,le_fopen,le_popen);
ZEND_VERIFY_RESOURCE(what);
rewind((FILE*) what);
@@ -1451,7 +1451,7 @@ PHP_FUNCTION(ftell)
}
/* XXX: add stream support --Wez. */
- what = zend_fetch_resource(arg1,-1,"File-Handle",NULL,2,le_fopen,le_popen);
+ what = zend_fetch_resource(arg1 TSRMLS_CC,-1,"File-Handle",NULL,2,le_fopen,le_popen);
ZEND_VERIFY_RESOURCE(what);
ret = ftell((FILE*) what);
@@ -1478,7 +1478,7 @@ PHP_FUNCTION(fseek)
}
/* XXX: add stream support --Wez. */
- what = zend_fetch_resource(arg1,-1,"File-Handle",NULL,2,le_fopen,le_popen);
+ what = zend_fetch_resource(arg1 TSRMLS_CC,-1,"File-Handle",NULL,2,le_fopen,le_popen);
ZEND_VERIFY_RESOURCE(what);
convert_to_long_ex(arg2);
@@ -1699,7 +1699,7 @@ PHP_FUNCTION(fpassthru)
}
/* XXX: add stream support --Wez. */
- what = zend_fetch_resource(arg1,-1,"File-Handle",&type,3,le_fopen,le_popen,le_socket);
+ what = zend_fetch_resource(arg1 TSRMLS_CC,-1,"File-Handle",&type,3,le_fopen,le_popen,le_socket);
ZEND_VERIFY_RESOURCE(what);
if (type == le_socket) {
@@ -1788,7 +1788,7 @@ PHP_NAMED_FUNCTION(php_if_ftruncate)
}
/* XXX: add stream support --Wez. */
- what = zend_fetch_resource(fp,-1,"File-Handle",&type,3,le_fopen,le_popen,le_socket);
+ what = zend_fetch_resource(fp TSRMLS_CC,-1,"File-Handle",&type,3,le_fopen,le_popen,le_socket);
ZEND_VERIFY_RESOURCE(what);
if (type == le_socket)
@@ -1823,7 +1823,7 @@ PHP_NAMED_FUNCTION(php_if_fstat)
}
/* XXX: add stream support --Wez. */
- what = zend_fetch_resource(fp,-1,"File-Handle",&type,3,le_fopen,le_popen,le_socket);
+ what = zend_fetch_resource(fp TSRMLS_CC,-1,"File-Handle",&type,3,le_fopen,le_popen,le_socket);
ZEND_VERIFY_RESOURCE(what);
if (fstat(fileno((FILE *) what ), &stat_sb)) {
@@ -2003,7 +2003,7 @@ PHP_FUNCTION(fread)
}
/* XXX: add stream support --Wez. */
- what = zend_fetch_resource(arg1,-1,"File-Handle",&type,3,le_fopen,le_popen,le_socket);
+ what = zend_fetch_resource(arg1 TSRMLS_CC,-1,"File-Handle",&type,3,le_fopen,le_popen,le_socket);
ZEND_VERIFY_RESOURCE(what);
if (type == le_socket) {
@@ -2083,7 +2083,7 @@ PHP_FUNCTION(fgetcsv) {
}
/* XXX: add stream support --Wez. */
- what = zend_fetch_resource(fd,-1,"File-Handle",&type,3,le_fopen,le_popen,le_socket);
+ what = zend_fetch_resource(fd TSRMLS_CC,-1,"File-Handle",&type,3,le_fopen,le_popen,le_socket);
ZEND_VERIFY_RESOURCE(what);
if (type == le_socket) {
@@ -2252,7 +2252,7 @@ PHP_FUNCTION(fd_set)
WRONG_PARAM_COUNT;
}
/* XXX: add stream support --Wez. */
- what = zend_fetch_resource(arg,-1,"select",&type,3,le_fopen,le_socket,le_popen);
+ what = zend_fetch_resource(arg TSRMLS_CC,-1,"select",&type,3,le_fopen,le_socket,le_popen);
ZEND_VERIFY_RESOURCE(what);
if(type == le_socket) {
fd = *(int *)what;
@@ -2273,7 +2273,7 @@ PHP_FUNCTION(fd_set)
FD_ZERO(&readfd);
for(i = 0; i < ARG_COUNT(ht); i++) {
/* XXX: add stream support --Wez. */
- what = zend_fetch_resource(*args,-1,"select",&type,3,le_fopen,le_socket,le_popen);
+ what = zend_fetch_resource(*args TSRMLS_CC,-1,"select",&type,3,le_fopen,le_socket,le_popen);
ZEND_VERIFY_RESOURCE(what);
if(type == le_socket) {
fd = *(int *)what;
@@ -2323,7 +2323,7 @@ PHP_FUNCTION(fd_isset)
}
/* XXX: add stream support --Wez. */
- what = zend_fetch_resource(fdarg,-1,"select",&type,3,le_fopen,le_socket,le_popen);
+ what = zend_fetch_resource(fdarg TSRMLS_CC,-1,"select",&type,3,le_fopen,le_socket,le_popen);
ZEND_VERIFY_RESOURCE(what);
if(type == le_socket) {
diff --git a/ext/standard/formatted_print.c b/ext/standard/formatted_print.c
index f010c458f9..3521865970 100644
--- a/ext/standard/formatted_print.c
+++ b/ext/standard/formatted_print.c
@@ -408,7 +408,7 @@ php_sprintf_getnumber(char *buffer, int *pos)
*
*/
static char *
-php_formatted_print(int ht, int *len)
+php_formatted_print(int ht, int *len TSRMLS_DC)
{
pval ***args;
int argc, size = 240, inpos = 0, outpos = 0, temppos;
@@ -632,7 +632,7 @@ PHP_FUNCTION(user_sprintf)
char *result;
int len;
- if ((result=php_formatted_print(ht,&len))==NULL) {
+ if ((result=php_formatted_print(ht, &len TSRMLS_CC))==NULL) {
RETURN_FALSE;
}
RETVAL_STRINGL(result,len,1);
@@ -647,7 +647,7 @@ PHP_FUNCTION(user_printf)
char *result;
int len;
- if ((result=php_formatted_print(ht,&len))==NULL) {
+ if ((result=php_formatted_print(ht, &len TSRMLS_CC))==NULL) {
RETURN_FALSE;
}
PHPWRITE(result,len);
diff --git a/ext/standard/php_array.h b/ext/standard/php_array.h
index d1aeefa24c..e96899af50 100644
--- a/ext/standard/php_array.h
+++ b/ext/standard/php_array.h
@@ -85,7 +85,7 @@ int multisort_compare(const void *a, const void *b);
typedef struct {
int *multisort_flags[2];
- int (*compare_func)(zval *result, zval *op1, zval *op2);
+ int (*compare_func)(zval *result, zval *op1, zval *op2 TSRMLS_DC);
} php_array_globals;
#ifdef ZTS
diff --git a/ext/standard/var.c b/ext/standard/var.c
index e151ae7182..bd874ae587 100644
--- a/ext/standard/var.c
+++ b/ext/standard/var.c
@@ -98,7 +98,9 @@ head_done:
break;
case IS_RESOURCE: {
char *type_name;
- type_name = zend_rsrc_list_get_rsrc_type(Z_LVAL_PP(struc));
+ TSRMLS_FETCH();
+
+ type_name = zend_rsrc_list_get_rsrc_type(Z_LVAL_PP(struc) TSRMLS_CC);
php_printf("%sresource(%ld) of type (%s)\n", COMMON, Z_LVAL_PP(struc), type_name ? type_name : "Unknown");
break;
}
View Lorry Controller Status