diff options
| author | Zeev Suraski <zeev@php.net> | 2001-07-30 04:54:16 +0000 |
|---|---|---|
| committer | Zeev Suraski <zeev@php.net> | 2001-07-30 04:54:16 +0000 |
| commit | 8ce8324e5907d9a08789b9a4bea3f1622057932a (patch) | |
| tree | 57d068869333cc7ce147097cbd7cab95cbf366fb /Zend/zend_API.c | |
| parent | 11e5d2f22966ff2dff2848e73e38fb87ec55a2c1 (diff) | |
| download | php-git-8ce8324e5907d9a08789b9a4bea3f1622057932a.tar.gz | |
More TSRMLS_FETCH annihilation
Diffstat (limited to 'Zend/zend_API.c')
| -rw-r--r-- | Zend/zend_API.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/Zend/zend_API.c b/Zend/zend_API.c index 2de112725e..f422fac3fd 100644 --- a/Zend/zend_API.c +++ b/Zend/zend_API.c @@ -466,7 +466,7 @@ static int zend_parse_arg(int arg_num, zval **arg, va_list *va, char **spec, int return SUCCESS; } -static int zend_parse_va_args(int num_args, char *type_spec, va_list *va, int flags) +static int zend_parse_va_args(int num_args, char *type_spec, va_list *va, int flags TSRMLS_DC) { char *spec_walk; char buf[1024]; @@ -477,7 +477,6 @@ static int zend_parse_va_args(int num_args, char *type_spec, va_list *va, int fl void **p; int arg_count; int quiet = flags & ZEND_PARSE_PARAMS_QUIET; - TSRMLS_FETCH(); for (spec_walk = type_spec; *spec_walk; spec_walk++) { c = *spec_walk; @@ -548,25 +547,25 @@ static int zend_parse_va_args(int num_args, char *type_spec, va_list *va, int fl return SUCCESS; } -ZEND_API int zend_parse_parameters_ex(int flags, int num_args, char *type_spec, ...) +ZEND_API int zend_parse_parameters_ex(int flags TSRMLS_DC, int num_args, char *type_spec, ...) { va_list va; int retval; va_start(va, type_spec); - retval = zend_parse_va_args(num_args, type_spec, &va, flags); + retval = zend_parse_va_args(num_args, type_spec, &va, flags TSRMLS_CC); va_end(va); return retval; } -ZEND_API int zend_parse_parameters(int num_args, char *type_spec, ...) +ZEND_API int zend_parse_parameters(int num_args TSRMLS_DC, char *type_spec, ...) { va_list va; int retval; va_start(va, type_spec); - retval = zend_parse_va_args(num_args, type_spec, &va, 0); + retval = zend_parse_va_args(num_args, type_spec, &va, 0 TSRMLS_CC); va_end(va); return retval; |