diff options
| author | Zeev Suraski <zeev@php.net> | 2001-07-30 08:24:42 +0000 |
|---|---|---|
| committer | Zeev Suraski <zeev@php.net> | 2001-07-30 08:24:42 +0000 |
| commit | c43806f4152c3ff908c7ead039daf5e163700f0e (patch) | |
| tree | 8e6eb9e2aef084f04a7bfeb7269dd4d5186ac0c4 /ext/standard/scanf.c | |
| parent | 4187439cfffdbb2573453ea41a3c344632405f47 (diff) | |
| download | php-git-c43806f4152c3ff908c7ead039daf5e163700f0e.tar.gz | |
Zend compatibility patch
Diffstat (limited to 'ext/standard/scanf.c')
| -rw-r--r-- | ext/standard/scanf.c | 7 |
1 files changed, 4 insertions, 3 deletions
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; } |