summaryrefslogtreecommitdiff
path: root/ext/standard
diff options
context:
space:
mode:
Diffstat (limited to 'ext/standard')
-rw-r--r--ext/standard/array.c66
-rw-r--r--ext/standard/assert.c2
-rw-r--r--ext/standard/basic_functions.c20
-rw-r--r--ext/standard/file.c4
-rw-r--r--ext/standard/formatted_print.c16
-rw-r--r--ext/standard/fsock.c3
-rw-r--r--ext/standard/scanf.c7
-rw-r--r--ext/standard/scanf.h4
-rw-r--r--ext/standard/string.c15
-rw-r--r--ext/standard/var.c4
10 files changed, 71 insertions, 70 deletions
diff --git a/ext/standard/array.c b/ext/standard/array.c
index 1a6b6798b8..a12a95e170 100644
--- a/ext/standard/array.c
+++ b/ext/standard/array.c
@@ -364,7 +364,7 @@ static void php_natsort(INTERNAL_FUNCTION_PARAMETERS, int fold_case)
target_hash = HASH_OF(*array);
if (!target_hash) {
php_error(E_WARNING, "Wrong datatype in %s() call",
- get_active_function_name());
+ get_active_function_name(TSRMLS_C));
return;
}
@@ -530,7 +530,7 @@ static int array_user_compare(const void *a, const void *b)
args[0] = (pval **) f->pData;
args[1] = (pval **) s->pData;
- if (call_user_function_ex(EG(function_table), NULL, *BG(user_compare_func_name), &retval_ptr, 2, args, 0, NULL)==SUCCESS
+ if (call_user_function_ex(EG(function_table), NULL, *BG(user_compare_func_name), &retval_ptr, 2, args, 0, NULL TSRMLS_CC)==SUCCESS
&& retval_ptr) {
long retval;
@@ -634,7 +634,7 @@ static int array_user_key_compare(const void *a, const void *b)
Z_TYPE(key2) = IS_LONG;
}
- status = call_user_function(EG(function_table), NULL, *BG(user_compare_func_name), &retval, 2, args);
+ status = call_user_function(EG(function_table), NULL, *BG(user_compare_func_name), &retval, 2, args TSRMLS_CC);
zval_dtor(&key1);
zval_dtor(&key2);
@@ -978,7 +978,7 @@ static int php_array_walk(HashTable *target_hash, zval **userdata)
/* Call the userland function */
if (call_user_function_ex(EG(function_table), NULL, *BG(array_walk_func_name),
- &retval_ptr, userdata ? 3 : 2, args, 0, NULL) == SUCCESS) {
+ &retval_ptr, userdata ? 3 : 2, args, 0, NULL TSRMLS_CC) == SUCCESS) {
zval_ptr_dtor(&retval_ptr);
} else
@@ -1012,14 +1012,14 @@ PHP_FUNCTION(array_walk)
target_hash = HASH_OF(*array);
if (!target_hash) {
php_error(E_WARNING, "Wrong datatype in %s() call",
- get_active_function_name());
+ get_active_function_name(TSRMLS_C));
BG(array_walk_func_name) = old_walk_func_name;
RETURN_FALSE;
}
if (Z_TYPE_PP(BG(array_walk_func_name)) != IS_ARRAY &&
Z_TYPE_PP(BG(array_walk_func_name)) != IS_STRING) {
php_error(E_WARNING, "Wrong syntax for function name in %s() call",
- get_active_function_name());
+ get_active_function_name(TSRMLS_C));
BG(array_walk_func_name) = old_walk_func_name;
RETURN_FALSE;
}
@@ -1052,12 +1052,12 @@ static void php_search_array(INTERNAL_FUNCTION_PARAMETERS, int behavior)
}
if (Z_TYPE_PP(value) == IS_ARRAY || Z_TYPE_PP(value) == IS_OBJECT) {
- php_error(E_WARNING, "Wrong datatype for first argument in call to %s", get_active_function_name());
+ php_error(E_WARNING, "Wrong datatype for first argument in call to %s", get_active_function_name(TSRMLS_C));
RETURN_FALSE;
}
if (Z_TYPE_PP(array) != IS_ARRAY) {
- php_error(E_WARNING, "Wrong datatype for second argument in call to %s", get_active_function_name());
+ php_error(E_WARNING, "Wrong datatype for second argument in call to %s", get_active_function_name(TSRMLS_C));
RETURN_FALSE;
}
@@ -1167,7 +1167,7 @@ PHP_FUNCTION(extract)
extract_type = Z_LVAL_PP(z_extract_type);
if (extract_type > EXTR_SKIP && extract_type <= EXTR_PREFIX_INVALID) {
php_error(E_WARNING, "%s() expects a prefix to be specified",
- get_active_function_name());
+ get_active_function_name(TSRMLS_C));
return;
}
break;
@@ -1188,13 +1188,13 @@ PHP_FUNCTION(extract)
if (extract_type < EXTR_OVERWRITE || extract_type > EXTR_PREFIX_INVALID) {
php_error(E_WARNING, "Unknown extract type in call to %s()",
- get_active_function_name());
+ get_active_function_name(TSRMLS_C));
return;
}
if (Z_TYPE_PP(var_array) != IS_ARRAY) {
php_error(E_WARNING, "%s() expects first argument to be an array",
- get_active_function_name());
+ get_active_function_name(TSRMLS_C));
return;
}
@@ -2150,7 +2150,7 @@ PHP_FUNCTION(array_pad)
/* Make sure arguments are of the proper type */
if (Z_TYPE_PP(input) != IS_ARRAY) {
php_error(E_WARNING, "Argument to %s() should be an array",
- get_active_function_name());
+ get_active_function_name(TSRMLS_C));
return;
}
convert_to_long_ex(pad_size);
@@ -2598,7 +2598,7 @@ PHP_FUNCTION(array_multisort)
sort_order = Z_LVAL_PP(args[i]) == SORT_DESC ? -1 : 1;
parse_state[MULTISORT_ORDER] = 0;
} else {
- php_error(E_WARNING, "Argument %i to %s() is expected to be an array or sorting flag that has not already been specified", i+1, get_active_function_name());
+ php_error(E_WARNING, "Argument %i to %s() is expected to be an array or sorting flag that has not already been specified", i+1, get_active_function_name(TSRMLS_C));
MULTISORT_ABORT;
}
break;
@@ -2612,20 +2612,20 @@ PHP_FUNCTION(array_multisort)
sort_type = Z_LVAL_PP(args[i]);
parse_state[MULTISORT_TYPE] = 0;
} else {
- php_error(E_WARNING, "Argument %i to %s() is expected to be an array or sorting flag that has not already been specified", i+1, get_active_function_name());
+ php_error(E_WARNING, "Argument %i to %s() is expected to be an array or sorting flag that has not already been specified", i+1, get_active_function_name(TSRMLS_C));
MULTISORT_ABORT;
}
break;
default:
php_error(E_WARNING, "Argument %i to %s() is an unknown sort flag", i+1,
- get_active_function_name());
+ get_active_function_name(TSRMLS_C));
MULTISORT_ABORT;
break;
}
} else {
- php_error(E_WARNING, "Argument %i to %s() is expected to be an array or a sort flag", i+1, get_active_function_name());
+ php_error(E_WARNING, "Argument %i to %s() is expected to be an array or a sort flag", i+1, get_active_function_name(TSRMLS_C));
MULTISORT_ABORT;
}
}
@@ -2735,7 +2735,7 @@ PHP_FUNCTION(array_rand)
if (Z_TYPE_PP(input) != IS_ARRAY) {
zend_error(E_WARNING, "Argument to %s() has to be an array",
- get_active_function_name());
+ get_active_function_name(TSRMLS_C));
return;
}
@@ -2745,7 +2745,7 @@ PHP_FUNCTION(array_rand)
convert_to_long_ex(num_req);
num_req_val = Z_LVAL_PP(num_req);
if (num_req_val <= 0 || num_req_val > num_avail) {
- zend_error(E_WARNING, "Second argument to %s() has to be between 1 and the number of elements in the array", get_active_function_name());
+ zend_error(E_WARNING, "Second argument to %s() has to be between 1 and the number of elements in the array", get_active_function_name(TSRMLS_C));
return;
}
} else
@@ -2816,7 +2816,7 @@ PHP_FUNCTION(array_sum)
if (Z_TYPE_PP(input) != IS_ARRAY) {
php_error(E_WARNING, "The argument to %s() should be an array",
- get_active_function_name());
+ get_active_function_name(TSRMLS_C));
return;
}
@@ -2863,13 +2863,13 @@ PHP_FUNCTION(array_reduce)
if (Z_TYPE_PP(input) != IS_ARRAY) {
php_error(E_WARNING, "%s() expects argument 1 to be an array",
- get_active_function_name());
+ get_active_function_name(TSRMLS_C));
return;
}
if (!zend_is_callable(*callback, 0, &callback_name)) {
php_error(E_WARNING, "%s() expects argument 2, '%s', to be a valid callback",
- get_active_function_name(), callback_name);
+ get_active_function_name(TSRMLS_C), callback_name);
efree(callback_name);
return;
}
@@ -2891,10 +2891,10 @@ PHP_FUNCTION(array_reduce)
if (result) {
args[0] = &result;
args[1] = operand;
- if (call_user_function_ex(EG(function_table), NULL, *callback, &retval, 2, args, 0, NULL) == SUCCESS && retval) {
+ if (call_user_function_ex(EG(function_table), NULL, *callback, &retval, 2, args, 0, NULL TSRMLS_CC) == SUCCESS && retval) {
result = retval;
} else {
- php_error(E_WARNING, "%s() had an error invoking the reduction callback", get_active_function_name());
+ php_error(E_WARNING, "%s() had an error invoking the reduction callback", get_active_function_name(TSRMLS_C));
return;
}
} else
@@ -2929,14 +2929,14 @@ PHP_FUNCTION(array_filter)
if (Z_TYPE_PP(input) != IS_ARRAY) {
php_error(E_WARNING, "%s() expects argument 1 to be an array",
- get_active_function_name());
+ get_active_function_name(TSRMLS_C));
return;
}
if (ZEND_NUM_ARGS() > 1) {
if (!zend_is_callable(*callback, 0, &callback_name)) {
php_error(E_WARNING, "%s() expects argument 2, '%s', to be a valid callback",
- get_active_function_name(), callback_name);
+ get_active_function_name(TSRMLS_C), callback_name);
efree(callback_name);
return;
}
@@ -2953,14 +2953,14 @@ PHP_FUNCTION(array_filter)
if (callback) {
args[0] = operand;
- if (call_user_function_ex(EG(function_table), NULL, *callback, &retval, 1, args, 0, NULL) == SUCCESS && retval) {
+ if (call_user_function_ex(EG(function_table), NULL, *callback, &retval, 1, args, 0, NULL TSRMLS_CC) == SUCCESS && retval) {
if (!zend_is_true(retval)) {
zval_ptr_dtor(&retval);
continue;
} else
zval_ptr_dtor(&retval);
} else {
- php_error(E_WARNING, "%s() had an error invoking the filter callback", get_active_function_name());
+ php_error(E_WARNING, "%s() had an error invoking the filter callback", get_active_function_name(TSRMLS_C));
return;
}
} else if (!zend_is_true(*operand))
@@ -3008,7 +3008,7 @@ PHP_FUNCTION(array_map)
callback = *args[0];
if (Z_TYPE_P(callback) != IS_NULL && !zend_is_callable(callback, 0, &callback_name)) {
php_error(E_WARNING, "%s() expects argument 1, '%s', to be either NULL or a valid callback",
- get_active_function_name(), callback_name);
+ get_active_function_name(TSRMLS_C), callback_name);
efree(callback_name);
efree(args);
return;
@@ -3022,7 +3022,7 @@ PHP_FUNCTION(array_map)
for (i = 0; i < ZEND_NUM_ARGS()-1; i++) {
if (Z_TYPE_PP(args[i+1]) != IS_ARRAY) {
php_error(E_WARNING, "%s() expects argument %d to be an array",
- get_active_function_name(), i + 2);
+ get_active_function_name(TSRMLS_C), i + 2);
efree(array_len);
efree(args);
return;
@@ -3075,8 +3075,8 @@ PHP_FUNCTION(array_map)
}
if (Z_TYPE_P(callback) != IS_NULL) {
- if (!call_user_function_ex(EG(function_table), NULL, callback, &result, ZEND_NUM_ARGS()-1, params, 0, NULL) == SUCCESS && result) {
- php_error(E_WARNING, "%s() had an error invoking the map callback", get_active_function_name());
+ if (!call_user_function_ex(EG(function_table), NULL, callback, &result, ZEND_NUM_ARGS()-1, params, 0, NULL TSRMLS_CC) == SUCCESS && result) {
+ php_error(E_WARNING, "%s() had an error invoking the map callback", get_active_function_name(TSRMLS_C));
efree(array_len);
efree(args);
zval_dtor(return_value);
@@ -3108,7 +3108,7 @@ PHP_FUNCTION(key_exists)
}
if (Z_TYPE_PP(array) != IS_ARRAY && Z_TYPE_PP(array) != IS_OBJECT) {
- php_error(E_WARNING, "Wrong datatype for second argument in call to %s", get_active_function_name());
+ php_error(E_WARNING, "Wrong datatype for second argument in call to %s", get_active_function_name(TSRMLS_C));
RETURN_FALSE;
}
@@ -3126,7 +3126,7 @@ PHP_FUNCTION(key_exists)
RETURN_FALSE;
default:
- php_error(E_WARNING, "Wrong datatype for first argument in call to %s", get_active_function_name());
+ php_error(E_WARNING, "Wrong datatype for first argument in call to %s", get_active_function_name(TSRMLS_C));
RETURN_FALSE;
}
diff --git a/ext/standard/assert.c b/ext/standard/assert.c
index fe018ffb67..e0bb336d25 100644
--- a/ext/standard/assert.c
+++ b/ext/standard/assert.c
@@ -195,7 +195,7 @@ PHP_FUNCTION(assert)
ZVAL_FALSE(retval);
/* XXX do we want to check for error here? */
- call_user_function(CG(function_table), NULL, ASSERTG(callback), retval, 3, args);
+ call_user_function(CG(function_table), NULL, ASSERTG(callback), retval, 3, args TSRMLS_CC);
for (i = 0; i <= 2; i++) {
zval_ptr_dtor(&(args[i]));
diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c
index 82d4e7787e..e2ef244d47 100644
--- a/ext/standard/basic_functions.c
+++ b/ext/standard/basic_functions.c
@@ -933,7 +933,7 @@ PHP_FUNCTION(constant)
}
convert_to_string_ex(const_name);
- if (!zend_get_constant(Z_STRVAL_PP(const_name), Z_STRLEN_PP(const_name), return_value)) {
+ if (!zend_get_constant(Z_STRVAL_PP(const_name), Z_STRLEN_PP(const_name), return_value TSRMLS_CC)) {
php_error(E_WARNING, "Couldn't find constant %s", Z_STRVAL_PP(const_name));
RETURN_NULL();
}
@@ -1624,13 +1624,13 @@ PHP_FUNCTION(call_user_func)
if (!zend_is_callable(*params[0], 0, &name)) {
php_error(E_WARNING, "%s() expects first argument, '%s', to be a valid callback",
- get_active_function_name(), name);
+ get_active_function_name(TSRMLS_C), name);
efree(name);
efree(params);
RETURN_NULL();
}
- if (call_user_function_ex(EG(function_table), NULL, *params[0], &retval_ptr, argc - 1, params + 1, 0, NULL)==SUCCESS && retval_ptr) {
+ if (call_user_function_ex(EG(function_table), NULL, *params[0], &retval_ptr, argc - 1, params + 1, 0, NULL TSRMLS_CC)==SUCCESS && retval_ptr) {
COPY_PZVAL_TO_ZVAL(*return_value, retval_ptr);
} else {
php_error(E_WARNING, "Unable to call %s()", name);
@@ -1668,7 +1668,7 @@ PHP_FUNCTION(call_user_func_array)
if (!zend_is_callable(*func, 0, &name)) {
php_error(E_WARNING, "%s() expects first argument, '%s', to be a valid callback",
- get_active_function_name(), name);
+ get_active_function_name(TSRMLS_C), name);
efree(name);
RETURN_NULL();
}
@@ -1684,7 +1684,7 @@ PHP_FUNCTION(call_user_func_array)
current++;
}
- if (call_user_function_ex(EG(function_table), NULL, *func, &retval_ptr, count, func_params, 0, NULL) == SUCCESS && retval_ptr) {
+ if (call_user_function_ex(EG(function_table), NULL, *func, &retval_ptr, count, func_params, 0, NULL TSRMLS_CC) == SUCCESS && retval_ptr) {
COPY_PZVAL_TO_ZVAL(*return_value, retval_ptr);
} else {
php_error(E_WARNING, "Unable to call %s()", name);
@@ -1723,7 +1723,7 @@ PHP_FUNCTION(call_user_method)
}
SEPARATE_ZVAL(params[0]);
convert_to_string(*params[0]);
- if (call_user_function_ex(EG(function_table), params[1], *params[0], &retval_ptr, arg_count-2, params+2, 0, NULL)==SUCCESS && retval_ptr) {
+ if (call_user_function_ex(EG(function_table), params[1], *params[0], &retval_ptr, arg_count-2, params+2, 0, NULL TSRMLS_CC)==SUCCESS && retval_ptr) {
COPY_PZVAL_TO_ZVAL(*return_value, retval_ptr);
} else {
php_error(E_WARNING,"Unable to call %s()", Z_STRVAL_PP(params[0]));
@@ -1771,7 +1771,7 @@ PHP_FUNCTION(call_user_method_array)
zend_hash_move_forward(params_ar))
element++;
- if (call_user_function_ex(EG(function_table), obj, *method_name, &retval_ptr, num_elems, method_args, 0, NULL) == SUCCESS && retval_ptr) {
+ if (call_user_function_ex(EG(function_table), obj, *method_name, &retval_ptr, num_elems, method_args, 0, NULL TSRMLS_CC) == SUCCESS && retval_ptr) {
COPY_PZVAL_TO_ZVAL(*return_value, retval_ptr);
} else {
php_error(E_WARNING, "Unable to call %s()", Z_STRVAL_PP(method_name));
@@ -1806,7 +1806,7 @@ static int user_shutdown_function_call(php_shutdown_function_entry *shutdown_fun
zval retval;
TSRMLS_FETCH();
- if (call_user_function(EG(function_table), NULL, shutdown_function_entry->arguments[0], &retval, shutdown_function_entry->arg_count-1, shutdown_function_entry->arguments+1)==SUCCESS) {
+ if (call_user_function(EG(function_table), NULL, shutdown_function_entry->arguments[0], &retval, shutdown_function_entry->arg_count-1, shutdown_function_entry->arguments+1 TSRMLS_CC)==SUCCESS) {
zval_dtor(&retval);
} else {
php_error(E_WARNING,"Unable to call %s() - function does not exist",
@@ -1822,7 +1822,7 @@ static void user_tick_function_call(user_tick_function_entry *tick_fe)
TSRMLS_FETCH();
if (call_user_function(EG(function_table), NULL, function, &retval,
- tick_fe->arg_count - 1, tick_fe->arguments + 1) == SUCCESS) {
+ tick_fe->arg_count - 1, tick_fe->arguments+1 TSRMLS_CC) == SUCCESS) {
zval_dtor(&retval);
} else {
zval **obj, **method;
@@ -2387,7 +2387,7 @@ PHP_FUNCTION(unregister_tick_function)
/* This function is not directly accessible to end users */
PHPAPI PHP_FUNCTION(warn_not_available)
{
- php_error(E_WARNING, "%s() is not supported in this PHP build", get_active_function_name());
+ php_error(E_WARNING, "%s() is not supported in this PHP build", get_active_function_name(TSRMLS_C));
RETURN_FALSE;
}
diff --git a/ext/standard/file.c b/ext/standard/file.c
index a01946cf1d..b03911f897 100644
--- a/ext/standard/file.c
+++ b/ext/standard/file.c
@@ -621,7 +621,7 @@ PHP_FUNCTION(fopenstream)
stream = php_stream_fopen(Z_STRVAL_PP(zfilename), Z_STRVAL_PP(zmode));
if (stream == NULL) {
- zend_error(E_WARNING, "%s(): unable to open %s: %s", get_active_function_name(), Z_STRVAL_PP(zfilename), strerror(errno));
+ zend_error(E_WARNING, "%s(): unable to open %s: %s", get_active_function_name(TSRMLS_C), Z_STRVAL_PP(zfilename), strerror(errno));
RETURN_FALSE;
}
ZEND_REGISTER_RESOURCE(return_value, stream, le_stream);
@@ -1247,7 +1247,7 @@ PHP_FUNCTION(fscanf)
convert_to_string_ex( format_string );
result = php_sscanf_internal( buf,(*format_string)->value.str.val,
- argCount,args, 2,&return_value);
+ argCount, args, 2, &return_value TSRMLS_CC);
efree(args);
efree(buf);
if (SCAN_ERROR_WRONG_PARAM_COUNT == result) {
diff --git a/ext/standard/formatted_print.c b/ext/standard/formatted_print.c
index 3521865970..0a4d6d3ee1 100644
--- a/ext/standard/formatted_print.c
+++ b/ext/standard/formatted_print.c
@@ -136,11 +136,11 @@ static char *php_convert_to_decimal(double arg, int ndigits, int *decpt, int *si
inline static void
-php_sprintf_appendchar(char **buffer, int *pos, int *size, char add)
+php_sprintf_appendchar(char **buffer, int *pos, int *size, char add TSRMLS_DC)
{
if ((*pos + 1) >= *size) {
*size <<= 1;
- PRINTF_DEBUG(("%s: ereallocing buffer to %d bytes\n", get_active_function_name(), *size));
+ PRINTF_DEBUG(("%s: ereallocing buffer to %d bytes\n", get_active_function_name(TSRMLS_C), *size));
*buffer = erealloc(*buffer, *size);
}
PRINTF_DEBUG(("sprintf: appending '%c', pos=\n", add, *pos));
@@ -438,15 +438,15 @@ php_formatted_print(int ht, int *len TSRMLS_DC)
PRINTF_DEBUG(("sprintf: format[%d]='%c'\n", inpos, format[inpos]));
PRINTF_DEBUG(("sprintf: outpos=%d\n", outpos));
if (format[inpos] != '%') {
- php_sprintf_appendchar(&result, &outpos, &size, format[inpos++]);
+ php_sprintf_appendchar(&result, &outpos, &size, format[inpos++] TSRMLS_CC);
} else if (format[inpos + 1] == '%') {
- php_sprintf_appendchar(&result, &outpos, &size, '%');
+ php_sprintf_appendchar(&result, &outpos, &size, '%' TSRMLS_CC);
inpos += 2;
} else {
if (currarg >= argc && format[inpos + 1] != '%') {
efree(result);
efree(args);
- php_error(E_WARNING, "%s(): too few arguments",get_active_function_name());
+ php_error(E_WARNING, "%s(): too few arguments",get_active_function_name(TSRMLS_C));
return NULL;
}
/* starting a new format specifier, reset variables */
@@ -470,7 +470,7 @@ php_formatted_print(int ht, int *len TSRMLS_DC)
if (argnum >= argc) {
efree(result);
efree(args);
- php_error(E_WARNING, "%s(): too few arguments",get_active_function_name());
+ php_error(E_WARNING, "%s(): too few arguments", get_active_function_name(TSRMLS_C));
return NULL;
}
@@ -570,7 +570,7 @@ php_formatted_print(int ht, int *len TSRMLS_DC)
case 'c':
convert_to_long_ex(args[argnum]);
php_sprintf_appendchar(&result, &outpos, &size,
- (char) (*args[argnum])->value.lval);
+ (char) (*args[argnum])->value.lval TSRMLS_CC);
break;
case 'o':
@@ -606,7 +606,7 @@ php_formatted_print(int ht, int *len TSRMLS_DC)
break;
case '%':
- php_sprintf_appendchar(&result, &outpos, &size, '%');
+ php_sprintf_appendchar(&result, &outpos, &size, '%' TSRMLS_CC);
break;
default:
diff --git a/ext/standard/fsock.c b/ext/standard/fsock.c
index 0f321ff08e..8e3eac0828 100644
--- a/ext/standard/fsock.c
+++ b/ext/standard/fsock.c
@@ -679,13 +679,14 @@ static int php_sockop_flush(php_stream * stream)
static int php_sockop_cast(php_stream * stream, int castas, void ** ret)
{
php_sockbuf * sock = (php_sockbuf*)stream->abstract;
+ TSRMLS_FETCH();
switch(castas) {
case PHP_STREAM_AS_STDIO:
if (ret) {
/* DANGER!: data buffered in stream->readbuf will be forgotten! */
if (TOREAD(sock) > 0)
- zend_error(E_WARNING, "%s(): buffered data lost during conversion to FILE*!", get_active_function_name());
+ zend_error(E_WARNING, "%s(): buffered data lost during conversion to FILE*!", get_active_function_name(TSRMLS_C));
*ret = fdopen(sock->socket, stream->mode);
if (*ret)
return SUCCESS;
diff --git a/ext/standard/scanf.c b/ext/standard/scanf.c
index 47c9590ddc..3a6008738c 100644
--- a/ext/standard/scanf.c
+++ b/ext/standard/scanf.c
@@ -328,6 +328,7 @@ PHPAPI int ValidateFormat(char *format,int numVars,int *totalSubs)
int staticAssign[STATIC_LIST_SIZE];
int *nassign = staticAssign;
int objIndex, xpgSize, nspace = STATIC_LIST_SIZE;
+ TSRMLS_FETCH();
/*
* Initialize an array that records the number of times a variable
@@ -408,7 +409,7 @@ PHPAPI int ValidateFormat(char *format,int numVars,int *totalSubs)
if (gotXpg) {
mixedXPG:
php_error(E_WARNING,
- "cannot mix \"%\" and \"%n$\" conversion specifiers in %s", get_active_function_name() );
+ "cannot mix \"%\" and \"%n$\" conversion specifiers in %s", get_active_function_name(TSRMLS_C) );
goto error;
}
@@ -593,7 +594,7 @@ PHPAPI int ValidateFormat(char *format,int numVars,int *totalSubs)
PHPAPI int php_sscanf_internal( char *string,char *format,
int argCount,zval ***args,
- int varStart,pval **return_value)
+ int varStart,pval **return_value TSRMLS_DC)
{
int numVars, nconversions, totalVars = -1;
int i, value, result;
@@ -642,7 +643,7 @@ PHPAPI int php_sscanf_internal( char *string,char *format,
for (i = varStart;i < argCount;i++){
if ( ! PZVAL_IS_REF( *args[ i ] ) ) {
php_error(E_WARNING,"Parameter %d to %s() must be passed by reference",
- i, get_active_function_name());
+ i, get_active_function_name(TSRMLS_C));
scan_set_error_return(numVars, return_value);
return SCAN_ERROR_VAR_PASSED_BYVAL;
}
diff --git a/ext/standard/scanf.h b/ext/standard/scanf.h
index 4d5807d199..5de014f75b 100644
--- a/ext/standard/scanf.h
+++ b/ext/standard/scanf.h
@@ -43,8 +43,8 @@
* e.g. fscanf
*/
PHPAPI int ValidateFormat(char *format, int numVars, int *totalVars);
-PHPAPI int php_sscanf_internal(char *string,char *format,int argCount,zval ***args,
- int varStart,pval **return_value);
+PHPAPI int php_sscanf_internal(char *string,char *format,int argCount,zval ***args,
+ int varStart,pval **return_value TSRMLS_DC);
#endif /* SCANF_H */
diff --git a/ext/standard/string.c b/ext/standard/string.c
index ffcfbd2c0b..a2522823c2 100644
--- a/ext/standard/string.c
+++ b/ext/standard/string.c
@@ -796,7 +796,7 @@ PHP_FUNCTION(implode)
delim = *arg1;
} else {
php_error(E_WARNING, "Bad arguments to %s()",
- get_active_function_name());
+ get_active_function_name(TSRMLS_C));
return;
}
php_implode(delim, arr, return_value);
@@ -1088,7 +1088,7 @@ PHP_FUNCTION(pathinfo)
opt = Z_LVAL_PP(uopt);
if (opt < PHP_PATHINFO_DIRNAME || opt > PHP_PATHINFO_EXTENSION) {
php_error(E_WARNING, "Invalid option in call to %s()",
- get_active_function_name());
+ get_active_function_name(TSRMLS_C));
return;
}
}
@@ -3220,7 +3220,7 @@ PHP_FUNCTION(str_repeat)
if ((*mult)->value.lval < 0) {
php_error(E_WARNING, "Second argument to %s() has to be greater than or equal to 0",
- get_active_function_name());
+ get_active_function_name(TSRMLS_C));
return;
}
@@ -3538,7 +3538,7 @@ PHP_FUNCTION(str_pad)
convert_to_string_ex(pad_string);
if (Z_STRLEN_PP(pad_string) == 0) {
php_error(E_WARNING, "Padding string cannot be empty in %s()",
- get_active_function_name());
+ get_active_function_name(TSRMLS_C));
return;
}
pad_str_val = Z_STRVAL_PP(pad_string);
@@ -3548,7 +3548,7 @@ PHP_FUNCTION(str_pad)
convert_to_long_ex(pad_type);
pad_type_val = Z_LVAL_PP(pad_type);
if (pad_type_val < STR_PAD_LEFT || pad_type_val > STR_PAD_BOTH) {
- php_error(E_WARNING, "Padding type has to be STR_PAD_LEFT, STR_PAD_RIGHT, or STR_PAD_BOTH in %s()", get_active_function_name());
+ php_error(E_WARNING, "Padding type has to be STR_PAD_LEFT, STR_PAD_RIGHT, or STR_PAD_BOTH in %s()", get_active_function_name(TSRMLS_C));
return;
}
}
@@ -3602,7 +3602,6 @@ PHP_FUNCTION(sscanf)
zval ***args;
int argCount;
-
argCount = ZEND_NUM_ARGS();
if (argCount < 2) {
WRONG_PARAM_COUNT;
@@ -3621,8 +3620,8 @@ PHP_FUNCTION(sscanf)
result = php_sscanf_internal( (*literal)->value.str.val,
(*format)->value.str.val,
- argCount,args,
- 2,&return_value);
+ argCount, args,
+ 2, &return_value TSRMLS_CC);
efree(args);
if (SCAN_ERROR_WRONG_PARAM_COUNT == result) {
diff --git a/ext/standard/var.c b/ext/standard/var.c
index bd874ae587..dd2cd9d8b8 100644
--- a/ext/standard/var.c
+++ b/ext/standard/var.c
@@ -240,7 +240,7 @@ PHPAPI void php_var_serialize(zval *buf, zval **struc, HashTable *var_hash)
MAKE_STD_ZVAL(fname);
ZVAL_STRING(fname,"__sleep",1);
- res = call_user_function_ex(CG(function_table), struc, fname, &retval_ptr, 0, 0, 1, NULL);
+ res = call_user_function_ex(CG(function_table), struc, fname, &retval_ptr, 0, 0, 1, NULL TSRMLS_CC);
if (res == SUCCESS) {
if (retval_ptr && HASH_OF(retval_ptr)) {
@@ -583,7 +583,7 @@ PHPAPI int php_var_unserialize(zval **rval, const char **p, const char *max, Has
MAKE_STD_ZVAL(fname);
ZVAL_STRING(fname,"__wakeup",1);
- call_user_function_ex(CG(function_table), rval, fname, &retval_ptr, 0, 0, 1, NULL);
+ call_user_function_ex(CG(function_table), rval, fname, &retval_ptr, 0, 0, 1, NULL TSRMLS_CC);
zval_dtor(fname);
FREE_ZVAL(fname);
View Lorry Controller Status