clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-21 18:07:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

ZTS fixes.

Browse Source
This commit is contained in:
Sebastian Bergmann 2003-01-12 14:25:58 +00:00
parent 6cc7ee265c
commit 24db7f182a
3 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
Zend/zend.c
View File

@ -106,7 +106,7 @@ static uint zend_version_info_length;
#define PRINT_ZVAL_INDENT 4
static void print_hash(HashTable *ht, int indent)
static void print_hash(HashTable *ht, int indent TSRMLS_DC)
{
zval **tmp;
char *string_key;
@ -135,7 +135,7 @@ static void print_hash(HashTable *ht, int indent)
break;
}
ZEND_PUTS("] => ");
zend_print_zval_r(*tmp, indent+PRINT_ZVAL_INDENT);
zend_print_zval_r(*tmp, indent+PRINT_ZVAL_INDENT TSRMLS_CC);
ZEND_PUTS("\n");
zend_hash_move_forward_ex(ht, &iterator);
}
@ -146,7 +146,7 @@ static void print_hash(HashTable *ht, int indent)
ZEND_PUTS(")\n");
}
static void print_flat_hash(HashTable *ht)
static void print_flat_hash(HashTable *ht TSRMLS_DC)
{
zval **tmp;
char *string_key;
@ -170,7 +170,7 @@ static void print_flat_hash(HashTable *ht)
break;
}
ZEND_PUTS("] => ");
zend_print_flat_zval_r(*tmp);
zend_print_flat_zval_r(*tmp TSRMLS_CC);
zend_hash_move_forward_ex(ht, &iterator);
}
}
@ -256,7 +256,7 @@ ZEND_API int zend_print_zval_ex(zend_write_func_t write_func, zval *expr, int in
return expr->value.str.len;
}
ZEND_API void zend_print_flat_zval_r(zval *expr)
ZEND_API void zend_print_flat_zval_r(zval *expr TSRMLS_DC)
{
zend_write_func_t write_func = zend_write;
@ -268,7 +268,7 @@ ZEND_API void zend_print_flat_zval_r(zval *expr)
expr->value.ht->nApplyCount--;
return;
}
print_flat_hash(expr->value.ht);
print_flat_hash(expr->value.ht TSRMLS_CC);
ZEND_PUTS(")");
expr->value.ht->nApplyCount--;
break;
@ -294,7 +294,7 @@ ZEND_API void zend_print_flat_zval_r(zval *expr)
properties->nApplyCount--;
return;
}
print_flat_hash(properties);
print_flat_hash(properties TSRMLS_CC);
properties->nApplyCount--;
}
ZEND_PUTS(")");
@ -306,13 +306,13 @@ ZEND_API void zend_print_flat_zval_r(zval *expr)
}
}
ZEND_API void zend_print_zval_r(zval *expr, int indent)
ZEND_API void zend_print_zval_r(zval *expr, int indent TSRMLS_DC)
{
zend_print_zval_r_ex(zend_write, expr, indent);
zend_print_zval_r_ex(zend_write, expr, indent TSRMLS_CC);
}
ZEND_API void zend_print_zval_r_ex(zend_write_func_t write_func, zval *expr, int indent)
ZEND_API void zend_print_zval_r_ex(zend_write_func_t write_func, zval *expr, int indent TSRMLS_DC)
{
switch (expr->type) {
case IS_ARRAY:
@ -322,7 +322,7 @@ ZEND_API void zend_print_zval_r_ex(zend_write_func_t write_func, zval *expr, int
expr->value.ht->nApplyCount--;
return;
}
print_hash(expr->value.ht, indent);
print_hash(expr->value.ht, indent TSRMLS_CC);
expr->value.ht->nApplyCount--;
break;
case IS_OBJECT:
@ -347,7 +347,7 @@ ZEND_API void zend_print_zval_r_ex(zend_write_func_t write_func, zval *expr, int
properties->nApplyCount--;
return;
}
print_hash(properties, indent);
print_hash(properties, indent TSRMLS_CC);
properties->nApplyCount--;
}
break;

6
Zend/zend.h
View File

@ -433,9 +433,9 @@ ZEND_API char *get_zend_version(void);
ZEND_API void zend_make_printable_zval(zval *expr, zval *expr_copy, int *use_copy);
ZEND_API int zend_print_zval(zval *expr, int indent);
ZEND_API int zend_print_zval_ex(zend_write_func_t write_func, zval *expr, int indent);
ZEND_API void zend_print_zval_r(zval *expr, int indent);
ZEND_API void zend_print_flat_zval_r(zval *expr);
ZEND_API void zend_print_zval_r_ex(zend_write_func_t write_func, zval *expr, int indent);
ZEND_API void zend_print_zval_r(zval *expr, int indent TSRMLS_DC);
ZEND_API void zend_print_flat_zval_r(zval *expr TSRMLS_DC);
ZEND_API void zend_print_zval_r_ex(zend_write_func_t write_func, zval *expr, int indent TSRMLS_DC);
ZEND_API void zend_output_debug_string(zend_bool trigger_break, char *format, ...);
#if ZEND_DEBUG

6
Zend/zend_builtin_functions.c
View File

@ -1298,7 +1298,7 @@ static zval *debug_backtrace_get_args(void ***curpos TSRMLS_DC) {
return arg_array;
}
void debug_print_backtrace_args(zval *arg_array)
void debug_print_backtrace_args(zval *arg_array TSRMLS_DC)
{
zval **tmp;
HashPosition iterator;
@ -1309,7 +1309,7 @@ void debug_print_backtrace_args(zval *arg_array)
if (i++) {
ZEND_PUTS(", ");
}
zend_print_flat_zval_r(*tmp);
zend_print_flat_zval_r(*tmp TSRMLS_CC);
zend_hash_move_forward_ex(arg_array->value.ht, &iterator);
}
}
@ -1426,7 +1426,7 @@ ZEND_FUNCTION(debug_print_backtrace)
}
zend_printf("%s(", function_name?function_name:"main");
if (arg_array) {
debug_print_backtrace_args(arg_array);
debug_print_backtrace_args(arg_array TSRMLS_CC);
zval_ptr_dtor(&arg_array);
}
zend_printf(") called at [%s:%d]\n", filename, lineno);