diff options
| author | Felipe Pena <felipe@php.net> | 2008-07-24 19:52:24 +0000 |
|---|---|---|
| committer | Felipe Pena <felipe@php.net> | 2008-07-24 19:52:24 +0000 |
| commit | 0fbe6a0c14a7f8bc664484c33615d48a213ab662 (patch) | |
| tree | 0f7005c0598c1ff321dc3b22a2cf122e2956bbcc /Zend/zend_exceptions.c | |
| parent | ae8a21ad77cf23191b0d9635336330ad852953fd (diff) | |
| download | php-git-0fbe6a0c14a7f8bc664484c33615d48a213ab662.tar.gz | |
- MFH: Added TSRMLS_DC to apply_func_args_t and zend_hash_apply_with_arguments.
Diffstat (limited to 'Zend/zend_exceptions.c')
| -rw-r--r-- | Zend/zend_exceptions.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/Zend/zend_exceptions.c b/Zend/zend_exceptions.c index f71b53db70..5f725a4b72 100644 --- a/Zend/zend_exceptions.c +++ b/Zend/zend_exceptions.c @@ -312,7 +312,7 @@ ZEND_METHOD(error_exception, getSeverity) /* }}} */ -static int _build_trace_args(zval **arg, int num_args, va_list args, zend_hash_key *hash_key) /* {{{ */ +static int _build_trace_args(zval **arg TSRMLS_DC, int num_args, va_list args, zend_hash_key *hash_key) /* {{{ */ { char **str; int *len; @@ -372,7 +372,6 @@ static int _build_trace_args(zval **arg, int num_args, va_list args, zend_hash_k double dval = Z_DVAL_PP(arg); char *s_tmp; int l_tmp; - TSRMLS_FETCH(); s_tmp = emalloc(MAX_LENGTH_OF_DOUBLE + EG(precision) + 1); l_tmp = zend_sprintf(s_tmp, "%.*G", (int) EG(precision), dval); /* SAFE */ @@ -389,7 +388,6 @@ static int _build_trace_args(zval **arg, int num_args, va_list args, zend_hash_k char *class_name; zend_uint class_name_len; int dup; - TSRMLS_FETCH(); TRACE_APPEND_STR("Object("); @@ -410,7 +408,7 @@ static int _build_trace_args(zval **arg, int num_args, va_list args, zend_hash_k } /* }}} */ -static int _build_trace_string(zval **frame, int num_args, va_list args, zend_hash_key *hash_key) /* {{{ */ +static int _build_trace_string(zval **frame TSRMLS_DC, int num_args, va_list args, zend_hash_key *hash_key) /* {{{ */ { char *s_tmp, **str; int *len, *num; @@ -445,7 +443,7 @@ static int _build_trace_string(zval **frame, int num_args, va_list args, zend_ha TRACE_APPEND_CHR('('); if (zend_hash_find(ht, "args", sizeof("args"), (void**)&tmp) == SUCCESS) { int last_len = *len; - zend_hash_apply_with_arguments(Z_ARRVAL_PP(tmp), (apply_func_args_t)_build_trace_args, 2, str, len); + zend_hash_apply_with_arguments(Z_ARRVAL_PP(tmp) TSRMLS_CC, (apply_func_args_t)_build_trace_args, 2, str, len); if (last_len != *len) { *len -= 2; /* remove last ', ' */ } @@ -464,7 +462,7 @@ ZEND_METHOD(exception, getTraceAsString) int res_len = 0, *len = &res_len, num = 0; trace = zend_read_property(default_exception_ce, getThis(), "trace", sizeof("trace")-1, 1 TSRMLS_CC); - zend_hash_apply_with_arguments(Z_ARRVAL_P(trace), (apply_func_args_t)_build_trace_string, 3, str, len, &num); + zend_hash_apply_with_arguments(Z_ARRVAL_P(trace) TSRMLS_CC, (apply_func_args_t)_build_trace_string, 3, str, len, &num); s_tmp = emalloc(1 + MAX_LENGTH_OF_LONG + 7 + 1); sprintf(s_tmp, "#%d {main}", num); |