felipe Thu Jul 24 19:52:24 2008 UTC
Modified files: (Branch: PHP_5_3)
/ZendEngine2 zend_API.c zend_builtin_functions.c zend_closures.c
zend_compile.c zend_exceptions.c zend_hash.c
zend_hash.h zend_ts_hash.c zend_ts_hash.h
/php-src/ext/mysqlnd mysqlnd_debug.c
/php-src/ext/reflection php_reflection.c
/php-src/ext/standard basic_functions.c browscap.c var.c
Log:
- MFH: Added TSRMLS_DC to apply_func_args_t and
zend_hash_apply_with_arguments.
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_API.c?r1=1.296.2.27.2.34.2.41&r2=1.296.2.27.2.34.2.42&diff_format=u
Index: ZendEngine2/zend_API.c
diff -u ZendEngine2/zend_API.c:1.296.2.27.2.34.2.41
ZendEngine2/zend_API.c:1.296.2.27.2.34.2.42
--- ZendEngine2/zend_API.c:1.296.2.27.2.34.2.41 Thu Jul 24 09:42:15 2008
+++ ZendEngine2/zend_API.c Thu Jul 24 19:52:23 2008
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zend_API.c,v 1.296.2.27.2.34.2.41 2008/07/24 09:42:15 dmitry Exp $ */
+/* $Id: zend_API.c,v 1.296.2.27.2.34.2.42 2008/07/24 19:52:23 felipe Exp $ */
#include "zend.h"
#include "zend_execute.h"
@@ -933,7 +933,7 @@
}
/* }}} */
-static int zend_merge_property(zval **value, int num_args, va_list args,
zend_hash_key *hash_key) /* {{{ */
+static int zend_merge_property(zval **value TSRMLS_DC, int num_args, va_list
args, zend_hash_key *hash_key) /* {{{ */
{
/* which name should a numeric property have ? */
if (hash_key->nKeyLength) {
@@ -959,7 +959,7 @@
zend_class_entry *old_scope = EG(scope);
EG(scope) = Z_OBJCE_P(obj);
- zend_hash_apply_with_arguments(properties,
(apply_func_args_t)zend_merge_property, 2, obj, obj_ht);
+ zend_hash_apply_with_arguments(properties TSRMLS_CC,
(apply_func_args_t)zend_merge_property, 2, obj, obj_ht);
EG(scope) = old_scope;
if (destroy_ht) {
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_builtin_functions.c?r1=1.277.2.12.2.25.2.24&r2=1.277.2.12.2.25.2.25&diff_format=u
Index: ZendEngine2/zend_builtin_functions.c
diff -u ZendEngine2/zend_builtin_functions.c:1.277.2.12.2.25.2.24
ZendEngine2/zend_builtin_functions.c:1.277.2.12.2.25.2.25
--- ZendEngine2/zend_builtin_functions.c:1.277.2.12.2.25.2.24 Mon Jul 21
09:41:00 2008
+++ ZendEngine2/zend_builtin_functions.c Thu Jul 24 19:52:23 2008
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zend_builtin_functions.c,v 1.277.2.12.2.25.2.24 2008/07/21 09:41:00
bjori Exp $ */
+/* $Id: zend_builtin_functions.c,v 1.277.2.12.2.25.2.25 2008/07/24 19:52:23
felipe Exp $ */
#include "zend.h"
#include "zend_API.h"
@@ -1628,7 +1628,7 @@
/* }}} */
-static int copy_class_or_interface_name(zend_class_entry **pce, int num_args,
va_list args, zend_hash_key *hash_key)
+static int copy_class_or_interface_name(zend_class_entry **pce TSRMLS_DC, int
num_args, va_list args, zend_hash_key *hash_key)
{
zval *array = va_arg(args, zval *);
zend_uint mask = va_arg(args, zend_uint);
@@ -1656,7 +1656,7 @@
}
array_init(return_value);
- zend_hash_apply_with_arguments(EG(class_table), (apply_func_args_t)
copy_class_or_interface_name, 3, return_value, mask, comply);
+ zend_hash_apply_with_arguments(EG(class_table) TSRMLS_CC,
(apply_func_args_t) copy_class_or_interface_name, 3, return_value, mask,
comply);
}
/* }}} */
@@ -1672,12 +1672,12 @@
}
array_init(return_value);
- zend_hash_apply_with_arguments(EG(class_table), (apply_func_args_t)
copy_class_or_interface_name, 3, return_value, mask, comply);
+ zend_hash_apply_with_arguments(EG(class_table) TSRMLS_CC,
(apply_func_args_t) copy_class_or_interface_name, 3, return_value, mask,
comply);
}
/* }}} */
-static int copy_function_name(zend_function *func, int num_args, va_list args,
zend_hash_key *hash_key)
+static int copy_function_name(zend_function *func TSRMLS_DC, int num_args,
va_list args, zend_hash_key *hash_key)
{
zval *internal_ar = va_arg(args, zval *),
*user_ar = va_arg(args, zval *);
@@ -1714,7 +1714,7 @@
array_init(user);
array_init(return_value);
- zend_hash_apply_with_arguments(EG(function_table), (apply_func_args_t)
copy_function_name, 2, internal, user);
+ zend_hash_apply_with_arguments(EG(function_table) TSRMLS_CC,
(apply_func_args_t) copy_function_name, 2, internal, user);
if (zend_hash_add(Z_ARRVAL_P(return_value), "internal",
sizeof("internal"), (void **)&internal, sizeof(zval *), NULL) == FAILURE) {
zval_ptr_dtor(&internal);
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_closures.c?r1=1.3.2.5&r2=1.3.2.6&diff_format=u
Index: ZendEngine2/zend_closures.c
diff -u ZendEngine2/zend_closures.c:1.3.2.5 ZendEngine2/zend_closures.c:1.3.2.6
--- ZendEngine2/zend_closures.c:1.3.2.5 Tue Jul 22 07:44:41 2008
+++ ZendEngine2/zend_closures.c Thu Jul 24 19:52:23 2008
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zend_closures.c,v 1.3.2.5 2008/07/22 07:44:41 jani Exp $ */
+/* $Id: zend_closures.c,v 1.3.2.6 2008/07/24 19:52:23 felipe Exp $ */
#include "zend.h"
#include "zend_API.h"
@@ -243,13 +243,12 @@
}
/* }}} */
-static int zval_copy_static_var(zval **p, int num_args, va_list args,
zend_hash_key *key) /* {{{ */
+static int zval_copy_static_var(zval **p TSRMLS_DC, int num_args, va_list
args, zend_hash_key *key) /* {{{ */
{
HashTable *target = va_arg(args, HashTable*);
zend_bool is_ref;
if (Z_TYPE_PP(p) & (IS_LEXICAL_VAR|IS_LEXICAL_REF)) {
- TSRMLS_FETCH();
is_ref = Z_TYPE_PP(p) & IS_LEXICAL_REF;
if (!EG(active_symbol_table)) {
@@ -297,7 +296,7 @@
ALLOC_HASHTABLE(closure->func.op_array.static_variables);
zend_hash_init(closure->func.op_array.static_variables,
zend_hash_num_elements(static_variables), NULL, ZVAL_PTR_DTOR, 0);
- zend_hash_apply_with_arguments(static_variables,
(apply_func_args_t)zval_copy_static_var, 1,
closure->func.op_array.static_variables);
+ zend_hash_apply_with_arguments(static_variables
TSRMLS_CC, (apply_func_args_t)zval_copy_static_var, 1,
closure->func.op_array.static_variables);
}
(*closure->func.op_array.refcount)++;
}
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_compile.c?r1=1.647.2.27.2.41.2.74&r2=1.647.2.27.2.41.2.75&diff_format=u
Index: ZendEngine2/zend_compile.c
diff -u ZendEngine2/zend_compile.c:1.647.2.27.2.41.2.74
ZendEngine2/zend_compile.c:1.647.2.27.2.41.2.75
--- ZendEngine2/zend_compile.c:1.647.2.27.2.41.2.74 Thu Jul 24 11:47:49 2008
+++ ZendEngine2/zend_compile.c Thu Jul 24 19:52:23 2008
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zend_compile.c,v 1.647.2.27.2.41.2.74 2008/07/24 11:47:49 dmitry Exp $
*/
+/* $Id: zend_compile.c,v 1.647.2.27.2.41.2.75 2008/07/24 19:52:23 felipe Exp $
*/
#include <zend_language_parser.h>
#include "zend.h"
@@ -2780,7 +2780,7 @@
}
}
-static int inherit_static_prop(zval **p, int num_args, va_list args,
zend_hash_key *key)
+static int inherit_static_prop(zval **p TSRMLS_DC, int num_args, va_list args,
zend_hash_key *key)
{
HashTable *target = va_arg(args, HashTable*);
@@ -2812,9 +2812,9 @@
if (parent_ce->type != ce->type) {
/* User class extends internal class */
zend_update_class_constants(parent_ce TSRMLS_CC);
- zend_hash_apply_with_arguments(CE_STATIC_MEMBERS(parent_ce),
(apply_func_args_t)inherit_static_prop, 1, &ce->default_static_members);
+ zend_hash_apply_with_arguments(CE_STATIC_MEMBERS(parent_ce)
TSRMLS_CC, (apply_func_args_t)inherit_static_prop, 1,
&ce->default_static_members);
} else {
-
zend_hash_apply_with_arguments(&parent_ce->default_static_members,
(apply_func_args_t)inherit_static_prop, 1, &ce->default_static_members
TSRMLS_CC);
+
zend_hash_apply_with_arguments(&parent_ce->default_static_members TSRMLS_CC,
(apply_func_args_t)inherit_static_prop, 1, &ce->default_static_members
TSRMLS_CC);
}
zend_hash_merge_ex(&ce->properties_info, &parent_ce->properties_info,
(copy_ctor_func_t) (ce->type & ZEND_INTERNAL_CLASS ?
zend_duplicate_property_info_internal : zend_duplicate_property_info),
sizeof(zend_property_info), (merge_checker_func_t)
do_inherit_property_access_check, ce);
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_exceptions.c?r1=1.79.2.6.2.9.2.11&r2=1.79.2.6.2.9.2.12&diff_format=u
Index: ZendEngine2/zend_exceptions.c
diff -u ZendEngine2/zend_exceptions.c:1.79.2.6.2.9.2.11
ZendEngine2/zend_exceptions.c:1.79.2.6.2.9.2.12
--- ZendEngine2/zend_exceptions.c:1.79.2.6.2.9.2.11 Sun Jul 13 21:42:49 2008
+++ ZendEngine2/zend_exceptions.c Thu Jul 24 19:52:23 2008
@@ -19,7 +19,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zend_exceptions.c,v 1.79.2.6.2.9.2.11 2008/07/13 21:42:49 helly Exp $
*/
+/* $Id: zend_exceptions.c,v 1.79.2.6.2.9.2.12 2008/07/24 19:52:23 felipe Exp $
*/
#include "zend.h"
#include "zend_API.h"
@@ -312,7 +312,7 @@
/* }}} */
-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 @@
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 @@
char *class_name;
zend_uint class_name_len;
int dup;
- TSRMLS_FETCH();
TRACE_APPEND_STR("Object(");
@@ -410,7 +408,7 @@
}
/* }}} */
-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 @@
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 @@
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);
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_hash.c?r1=1.121.2.4.2.8.2.2&r2=1.121.2.4.2.8.2.3&diff_format=u
Index: ZendEngine2/zend_hash.c
diff -u ZendEngine2/zend_hash.c:1.121.2.4.2.8.2.2
ZendEngine2/zend_hash.c:1.121.2.4.2.8.2.3
--- ZendEngine2/zend_hash.c:1.121.2.4.2.8.2.2 Mon Dec 31 07:17:04 2007
+++ ZendEngine2/zend_hash.c Thu Jul 24 19:52:23 2008
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zend_hash.c,v 1.121.2.4.2.8.2.2 2007/12/31 07:17:04 sebastian Exp $ */
+/* $Id: zend_hash.c,v 1.121.2.4.2.8.2.3 2008/07/24 19:52:23 felipe Exp $ */
#include "zend.h"
@@ -709,7 +709,7 @@
}
-ZEND_API void zend_hash_apply_with_arguments(HashTable *ht, apply_func_args_t
apply_func, int num_args, ...)
+ZEND_API void zend_hash_apply_with_arguments(HashTable *ht TSRMLS_DC,
apply_func_args_t apply_func, int num_args, ...)
{
Bucket *p;
va_list args;
@@ -726,7 +726,7 @@
hash_key.arKey = p->arKey;
hash_key.nKeyLength = p->nKeyLength;
hash_key.h = p->h;
- result = apply_func(p->pData, num_args, args, &hash_key);
+ result = apply_func(p->pData TSRMLS_CC, num_args, args,
&hash_key);
if (result & ZEND_HASH_APPLY_REMOVE) {
p = zend_hash_apply_deleter(ht, p);
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_hash.h?r1=1.78.2.2.2.2.2.4&r2=1.78.2.2.2.2.2.5&diff_format=u
Index: ZendEngine2/zend_hash.h
diff -u ZendEngine2/zend_hash.h:1.78.2.2.2.2.2.4
ZendEngine2/zend_hash.h:1.78.2.2.2.2.2.5
--- ZendEngine2/zend_hash.h:1.78.2.2.2.2.2.4 Tue Apr 29 08:15:17 2008
+++ ZendEngine2/zend_hash.h Thu Jul 24 19:52:23 2008
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zend_hash.h,v 1.78.2.2.2.2.2.4 2008/04/29 08:15:17 dmitry Exp $ */
+/* $Id: zend_hash.h,v 1.78.2.2.2.2.2.5 2008/07/24 19:52:23 felipe Exp $ */
#ifndef ZEND_HASH_H
#define ZEND_HASH_H
@@ -127,13 +127,13 @@
typedef int (*apply_func_t)(void *pDest TSRMLS_DC);
typedef int (*apply_func_arg_t)(void *pDest, void *argument TSRMLS_DC);
-typedef int (*apply_func_args_t)(void *pDest, int num_args, va_list args,
zend_hash_key *hash_key);
+typedef int (*apply_func_args_t)(void *pDest TSRMLS_DC, int num_args, va_list
args, zend_hash_key *hash_key);
ZEND_API void zend_hash_graceful_destroy(HashTable *ht);
ZEND_API void zend_hash_graceful_reverse_destroy(HashTable *ht);
ZEND_API void zend_hash_apply(HashTable *ht, apply_func_t apply_func
TSRMLS_DC);
ZEND_API void zend_hash_apply_with_argument(HashTable *ht, apply_func_arg_t
apply_func, void * TSRMLS_DC);
-ZEND_API void zend_hash_apply_with_arguments(HashTable *ht, apply_func_args_t
apply_func, int, ...);
+ZEND_API void zend_hash_apply_with_arguments(HashTable *ht TSRMLS_DC,
apply_func_args_t apply_func, int, ...);
/* This function should be used with special care (in other words,
* it should usually not be used). When used with the ZEND_HASH_APPLY_STOP
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_ts_hash.c?r1=1.14.2.1.2.2.2.1&r2=1.14.2.1.2.2.2.2&diff_format=u
Index: ZendEngine2/zend_ts_hash.c
diff -u ZendEngine2/zend_ts_hash.c:1.14.2.1.2.2.2.1
ZendEngine2/zend_ts_hash.c:1.14.2.1.2.2.2.2
--- ZendEngine2/zend_ts_hash.c:1.14.2.1.2.2.2.1 Mon Dec 31 07:17:05 2007
+++ ZendEngine2/zend_ts_hash.c Thu Jul 24 19:52:23 2008
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zend_ts_hash.c,v 1.14.2.1.2.2.2.1 2007/12/31 07:17:05 sebastian Exp $
*/
+/* $Id: zend_ts_hash.c,v 1.14.2.1.2.2.2.2 2008/07/24 19:52:23 felipe Exp $ */
#include "zend.h"
#include "zend_ts_hash.h"
@@ -169,13 +169,13 @@
end_write(ht);
}
-ZEND_API void zend_ts_hash_apply_with_arguments(TsHashTable *ht,
apply_func_args_t apply_func, int num_args, ...)
+ZEND_API void zend_ts_hash_apply_with_arguments(TsHashTable *ht TSRMLS_DC,
apply_func_args_t apply_func, int num_args, ...)
{
va_list args;
va_start(args, num_args);
begin_write(ht);
- zend_hash_apply_with_arguments(TS_HASH(ht), apply_func, num_args, args);
+ zend_hash_apply_with_arguments(TS_HASH(ht) TSRMLS_CC, apply_func,
num_args, args);
end_write(ht);
va_end(args);
}
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_ts_hash.h?r1=1.13.2.1.2.1.2.1&r2=1.13.2.1.2.1.2.2&diff_format=u
Index: ZendEngine2/zend_ts_hash.h
diff -u ZendEngine2/zend_ts_hash.h:1.13.2.1.2.1.2.1
ZendEngine2/zend_ts_hash.h:1.13.2.1.2.1.2.2
--- ZendEngine2/zend_ts_hash.h:1.13.2.1.2.1.2.1 Mon Dec 31 07:17:05 2007
+++ ZendEngine2/zend_ts_hash.h Thu Jul 24 19:52:23 2008
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zend_ts_hash.h,v 1.13.2.1.2.1.2.1 2007/12/31 07:17:05 sebastian Exp $
*/
+/* $Id: zend_ts_hash.h,v 1.13.2.1.2.1.2.2 2008/07/24 19:52:23 felipe Exp $ */
#ifndef ZEND_TS_HASH_H
#define ZEND_TS_HASH_H
@@ -72,7 +72,7 @@
ZEND_API void zend_ts_hash_graceful_destroy(TsHashTable *ht);
ZEND_API void zend_ts_hash_apply(TsHashTable *ht, apply_func_t apply_func
TSRMLS_DC);
ZEND_API void zend_ts_hash_apply_with_argument(TsHashTable *ht,
apply_func_arg_t apply_func, void * TSRMLS_DC);
-ZEND_API void zend_ts_hash_apply_with_arguments(TsHashTable *ht,
apply_func_args_t apply_func, int, ...);
+ZEND_API void zend_ts_hash_apply_with_arguments(TsHashTable *ht TSRMLS_DC,
apply_func_args_t apply_func, int, ...);
ZEND_API void zend_ts_hash_reverse_apply(TsHashTable *ht, apply_func_t
apply_func TSRMLS_DC);
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/mysqlnd_debug.c?r1=1.1.2.9&r2=1.1.2.10&diff_format=u
Index: php-src/ext/mysqlnd/mysqlnd_debug.c
diff -u php-src/ext/mysqlnd/mysqlnd_debug.c:1.1.2.9
php-src/ext/mysqlnd/mysqlnd_debug.c:1.1.2.10
--- php-src/ext/mysqlnd/mysqlnd_debug.c:1.1.2.9 Wed Apr 23 16:56:51 2008
+++ php-src/ext/mysqlnd/mysqlnd_debug.c Thu Jul 24 19:52:23 2008
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: mysqlnd_debug.c,v 1.1.2.9 2008/04/23 16:56:51 johannes Exp $ */
+/* $Id: mysqlnd_debug.c,v 1.1.2.10 2008/07/24 19:52:23 felipe Exp $ */
#include "php.h"
#include "mysqlnd.h"
@@ -1002,7 +1002,7 @@
/* }}} */
/* {{{ mysqlnd_build_trace_args */
-static int mysqlnd_build_trace_args(zval **arg, int num_args, va_list args,
zend_hash_key *hash_key)
+static int mysqlnd_build_trace_args(zval **arg TSRMLS_DC, int num_args,
va_list args, zend_hash_key *hash_key)
{
char **str;
int *len;
@@ -1042,7 +1042,6 @@
}
case IS_UNICODE: {
int l_added;
- TSRMLS_FETCH();
/*
* We do not want to apply current error mode here,
since
@@ -1095,7 +1094,6 @@
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 */
@@ -1112,7 +1110,6 @@
zstr class_name;
zend_uint class_name_len;
int dup;
- TSRMLS_FETCH();
TRACE_APPEND_STR("Object(");
@@ -1143,7 +1140,7 @@
/* }}} */
-static int mysqlnd_build_trace_string(zval **frame, int num_args, va_list
args, zend_hash_key *hash_key) /* {{{ */
+static int mysqlnd_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;
@@ -1179,7 +1176,7 @@
TRACE_APPEND_CHR('(');
if (zend_ascii_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)mysqlnd_build_trace_args, 2, str, len);
+ zend_hash_apply_with_arguments(Z_ARRVAL_PP(tmp) TSRMLS_CC,
(apply_func_args_t)mysqlnd_build_trace_args, 2, str, len);
if (last_len != *len) {
*len -= 2; /* remove last ', ' */
}
@@ -1217,7 +1214,7 @@
/* }}} */
-static int mysqlnd_build_trace_args(zval **arg, int num_args, va_list args,
zend_hash_key *hash_key) /* {{{ */
+static int mysqlnd_build_trace_args(zval **arg TSRMLS_DC, int num_args,
va_list args, zend_hash_key *hash_key) /* {{{ */
{
char **str;
int *len;
@@ -1277,7 +1274,6 @@
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 */
@@ -1294,7 +1290,6 @@
char *class_name;
zend_uint class_name_len;
int dup;
- TSRMLS_FETCH();
TRACE_APPEND_STR("Object(");
@@ -1315,7 +1310,7 @@
}
/* }}} */
-static int mysqlnd_build_trace_string(zval **frame, int num_args, va_list
args, zend_hash_key *hash_key) /* {{{ */
+static int mysqlnd_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;
@@ -1350,7 +1345,7 @@
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)mysqlnd_build_trace_args, 2, str, len);
+ zend_hash_apply_with_arguments(Z_ARRVAL_PP(tmp) TSRMLS_CC,
(apply_func_args_t)mysqlnd_build_trace_args, 2, str, len);
if (last_len != *len) {
*len -= 2; /* remove last ', ' */
}
@@ -1371,7 +1366,7 @@
MAKE_STD_ZVAL(trace);
zend_fetch_debug_backtrace(trace, 0, 0 TSRMLS_CC);
- zend_hash_apply_with_arguments(Z_ARRVAL_P(trace),
(apply_func_args_t)mysqlnd_build_trace_string, 3, str, len, &num);
+ zend_hash_apply_with_arguments(Z_ARRVAL_P(trace) TSRMLS_CC,
(apply_func_args_t)mysqlnd_build_trace_string, 3, str, len, &num);
zval_ptr_dtor(&trace);
s_tmp = emalloc(1 + MAX_LENGTH_OF_LONG + 7 + 1);
http://cvs.php.net/viewvc.cgi/php-src/ext/reflection/php_reflection.c?r1=1.164.2.33.2.45.2.20&r2=1.164.2.33.2.45.2.21&diff_format=u
Index: php-src/ext/reflection/php_reflection.c
diff -u php-src/ext/reflection/php_reflection.c:1.164.2.33.2.45.2.20
php-src/ext/reflection/php_reflection.c:1.164.2.33.2.45.2.21
--- php-src/ext/reflection/php_reflection.c:1.164.2.33.2.45.2.20 Sun Jul
20 16:51:28 2008
+++ php-src/ext/reflection/php_reflection.c Thu Jul 24 19:52:23 2008
@@ -20,7 +20,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_reflection.c,v 1.164.2.33.2.45.2.20 2008/07/20 16:51:28 felipe Exp
$ */
+/* $Id: php_reflection.c,v 1.164.2.33.2.45.2.21 2008/07/24 19:52:23 felipe Exp
$ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -835,7 +835,7 @@
}
/* }}} */
-static int _extension_ini_string(zend_ini_entry *ini_entry, int num_args,
va_list args, zend_hash_key *hash_key)
+static int _extension_ini_string(zend_ini_entry *ini_entry TSRMLS_DC, int
num_args, va_list args, zend_hash_key *hash_key)
{
string *str = va_arg(args, string *);
char *indent = va_arg(args, char *);
@@ -870,13 +870,12 @@
return ZEND_HASH_APPLY_KEEP;
}
-static int _extension_class_string(zend_class_entry **pce, int num_args,
va_list args, zend_hash_key *hash_key)
+static int _extension_class_string(zend_class_entry **pce TSRMLS_DC, int
num_args, va_list args, zend_hash_key *hash_key)
{
string *str = va_arg(args, string *);
char *indent = va_arg(args, char *);
struct _zend_module_entry *module = va_arg(args, struct
_zend_module_entry*);
int *num_classes = va_arg(args, int*);
- TSRMLS_FETCH();
if ((*pce)->module && !strcasecmp((*pce)->module->name, module->name)) {
string_printf(str, "\n");
@@ -886,7 +885,7 @@
return ZEND_HASH_APPLY_KEEP;
}
-static int _extension_const_string(zend_constant *constant, int num_args,
va_list args, zend_hash_key *hash_key)
+static int _extension_const_string(zend_constant *constant TSRMLS_DC, int
num_args, va_list args, zend_hash_key *hash_key)
{
string *str = va_arg(args, string *);
char *indent = va_arg(args, char *);
@@ -894,7 +893,6 @@
int *num_classes = va_arg(args, int*);
if (constant->module_number == module->module_number) {
- TSRMLS_FETCH();
_const_string(str, constant->name, &constant->value, indent
TSRMLS_CC);
(*num_classes)++;
}
@@ -953,7 +951,7 @@
{
string str_ini;
string_init(&str_ini);
- zend_hash_apply_with_arguments(EG(ini_directives),
(apply_func_args_t) _extension_ini_string, 3, &str_ini, indent,
module->module_number);
+ zend_hash_apply_with_arguments(EG(ini_directives) TSRMLS_CC,
(apply_func_args_t) _extension_ini_string, 3, &str_ini, indent,
module->module_number);
if (str_ini.len > 1) {
string_printf(str, "\n - INI {\n");
string_append(str, &str_ini);
@@ -967,7 +965,7 @@
int num_constants = 0;
string_init(&str_constants);
- zend_hash_apply_with_arguments(EG(zend_constants),
(apply_func_args_t) _extension_const_string, 4, &str_constants, indent, module,
&num_constants TSRMLS_CC);
+ zend_hash_apply_with_arguments(EG(zend_constants) TSRMLS_CC,
(apply_func_args_t) _extension_const_string, 4, &str_constants, indent, module,
&num_constants TSRMLS_CC);
if (num_constants) {
string_printf(str, "\n - Constants [%d] {\n",
num_constants);
string_append(str, &str_constants);
@@ -1004,7 +1002,7 @@
string_init(&sub_indent);
string_printf(&sub_indent, "%s ", indent);
string_init(&str_classes);
- zend_hash_apply_with_arguments(EG(class_table),
(apply_func_args_t) _extension_class_string, 4, &str_classes,
sub_indent.string, module, &num_classes TSRMLS_CC);
+ zend_hash_apply_with_arguments(EG(class_table) TSRMLS_CC,
(apply_func_args_t) _extension_class_string, 4, &str_classes,
sub_indent.string, module, &num_classes TSRMLS_CC);
if (num_classes) {
string_printf(str, "\n - Classes [%d] {", num_classes);
string_append(str, &str_classes);
@@ -3149,7 +3147,7 @@
/* }}} */
/* {{{ _addmethod */
-static int _addmethod(zend_function *mptr, int num_args, va_list args,
zend_hash_key *hash_key)
+static int _addmethod(zend_function *mptr TSRMLS_DC, int num_args, va_list
args, zend_hash_key *hash_key)
{
zval *method;
zend_class_entry *ce = *va_arg(args, zend_class_entry**);
@@ -3157,7 +3155,6 @@
long filter = va_arg(args, long);
if (mptr->common.fn_flags & filter) {
- TSRMLS_FETCH();
ALLOC_ZVAL(method);
reflection_method_factory(ce, mptr, method TSRMLS_CC);
add_next_index_zval(retval, method);
@@ -3188,7 +3185,7 @@
GET_REFLECTION_OBJECT_PTR(ce);
array_init(return_value);
- zend_hash_apply_with_arguments(&ce->function_table, (apply_func_args_t)
_addmethod, 3, &ce, return_value, filter);
+ zend_hash_apply_with_arguments(&ce->function_table TSRMLS_CC,
(apply_func_args_t) _addmethod, 3, &ce, return_value, filter);
}
/* }}} */
@@ -3279,7 +3276,7 @@
/* }}} */
/* {{{ _addproperty */
-static int _addproperty(zend_property_info *pptr, int num_args, va_list args,
zend_hash_key *hash_key)
+static int _addproperty(zend_property_info *pptr TSRMLS_DC, int num_args,
va_list args, zend_hash_key *hash_key)
{
zval *property;
zend_class_entry *ce = *va_arg(args, zend_class_entry**);
@@ -3291,7 +3288,6 @@
}
if (pptr->flags & filter) {
- TSRMLS_FETCH();
ALLOC_ZVAL(property);
reflection_property_factory(ce, pptr, property TSRMLS_CC);
add_next_index_zval(retval, property);
@@ -3301,12 +3297,11 @@
/* }}} */
/* {{{ _adddynproperty */
-static int _adddynproperty(zval **pptr, int num_args, va_list args,
zend_hash_key *hash_key)
+static int _adddynproperty(zval **pptr TSRMLS_DC, int num_args, va_list args,
zend_hash_key *hash_key)
{
zval *property;
zend_class_entry *ce = *va_arg(args, zend_class_entry**);
zval *retval = va_arg(args, zval*), member;
- TSRMLS_FETCH();
if (hash_key->arKey[0] == '\0') {
return 0; /* non public cannot be dynamic */
@@ -3344,11 +3339,11 @@
GET_REFLECTION_OBJECT_PTR(ce);
array_init(return_value);
- zend_hash_apply_with_arguments(&ce->properties_info,
(apply_func_args_t) _addproperty, 3, &ce, return_value, filter);
+ zend_hash_apply_with_arguments(&ce->properties_info TSRMLS_CC,
(apply_func_args_t) _addproperty, 3, &ce, return_value, filter);
if (intern->obj && (filter & ZEND_ACC_PUBLIC) != 0 &&
Z_OBJ_HT_P(intern->obj)->get_properties) {
HashTable *properties =
Z_OBJ_HT_P(intern->obj)->get_properties(intern->obj TSRMLS_CC);
- zend_hash_apply_with_arguments(properties, (apply_func_args_t)
_adddynproperty, 2, &ce, return_value);
+ zend_hash_apply_with_arguments(properties TSRMLS_CC,
(apply_func_args_t) _adddynproperty, 2, &ce, return_value);
}
}
/* }}} */
@@ -4427,7 +4422,7 @@
}
/* }}} */
-static int _addconstant(zend_constant *constant, int num_args, va_list args,
zend_hash_key *hash_key)
+static int _addconstant(zend_constant *constant TSRMLS_DC, int num_args,
va_list args, zend_hash_key *hash_key)
{
zval *const_val;
zval *retval = va_arg(args, zval*);
@@ -4454,12 +4449,12 @@
GET_REFLECTION_OBJECT_PTR(module);
array_init(return_value);
- zend_hash_apply_with_arguments(EG(zend_constants), (apply_func_args_t)
_addconstant, 2, return_value, module->module_number);
+ zend_hash_apply_with_arguments(EG(zend_constants) TSRMLS_CC,
(apply_func_args_t) _addconstant, 2, return_value, module->module_number);
}
/* }}} */
/* {{{ _addinientry */
-static int _addinientry(zend_ini_entry *ini_entry, int num_args, va_list args,
zend_hash_key *hash_key)
+static int _addinientry(zend_ini_entry *ini_entry TSRMLS_DC, int num_args,
va_list args, zend_hash_key *hash_key)
{
zval *retval = va_arg(args, zval*);
int number = va_arg(args, int);
@@ -4486,19 +4481,18 @@
GET_REFLECTION_OBJECT_PTR(module);
array_init(return_value);
- zend_hash_apply_with_arguments(EG(ini_directives), (apply_func_args_t)
_addinientry, 2, return_value, module->module_number);
+ zend_hash_apply_with_arguments(EG(ini_directives) TSRMLS_CC,
(apply_func_args_t) _addinientry, 2, return_value, module->module_number);
}
/* }}} */
/* {{{ add_extension_class */
-static int add_extension_class(zend_class_entry **pce, int num_args, va_list
args, zend_hash_key *hash_key)
+static int add_extension_class(zend_class_entry **pce TSRMLS_DC, int num_args,
va_list args, zend_hash_key *hash_key)
{
zval *class_array = va_arg(args, zval*), *zclass;
struct _zend_module_entry *module = va_arg(args, struct
_zend_module_entry*);
int add_reflection_class = va_arg(args, int);
if ((*pce)->module && !strcasecmp((*pce)->module->name, module->name)) {
- TSRMLS_FETCH();
if (add_reflection_class) {
ALLOC_ZVAL(zclass);
zend_reflection_class_factory(*pce, zclass TSRMLS_CC);
@@ -4522,7 +4516,7 @@
GET_REFLECTION_OBJECT_PTR(module);
array_init(return_value);
- zend_hash_apply_with_arguments(EG(class_table), (apply_func_args_t)
add_extension_class, 3, return_value, module, 1 TSRMLS_CC);
+ zend_hash_apply_with_arguments(EG(class_table) TSRMLS_CC,
(apply_func_args_t) add_extension_class, 3, return_value, module, 1 TSRMLS_CC);
}
/* }}} */
@@ -4537,7 +4531,7 @@
GET_REFLECTION_OBJECT_PTR(module);
array_init(return_value);
- zend_hash_apply_with_arguments(EG(class_table), (apply_func_args_t)
add_extension_class, 3, return_value, module, 0 TSRMLS_CC);
+ zend_hash_apply_with_arguments(EG(class_table) TSRMLS_CC,
(apply_func_args_t) add_extension_class, 3, return_value, module, 0 TSRMLS_CC);
}
/* }}} */
@@ -5116,7 +5110,7 @@
php_info_print_table_start();
php_info_print_table_header(2, "Reflection", "enabled");
- php_info_print_table_row(2, "Version", "$Id: php_reflection.c,v
1.164.2.33.2.45.2.20 2008/07/20 16:51:28 felipe Exp $");
+ php_info_print_table_row(2, "Version", "$Id: php_reflection.c,v
1.164.2.33.2.45.2.21 2008/07/24 19:52:23 felipe Exp $");
php_info_print_table_end();
} /* }}} */
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/basic_functions.c?r1=1.725.2.31.2.64.2.40&r2=1.725.2.31.2.64.2.41&diff_format=u
Index: php-src/ext/standard/basic_functions.c
diff -u php-src/ext/standard/basic_functions.c:1.725.2.31.2.64.2.40
php-src/ext/standard/basic_functions.c:1.725.2.31.2.64.2.41
--- php-src/ext/standard/basic_functions.c:1.725.2.31.2.64.2.40 Thu Jul 24
09:42:18 2008
+++ php-src/ext/standard/basic_functions.c Thu Jul 24 19:52:24 2008
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: basic_functions.c,v 1.725.2.31.2.64.2.40 2008/07/24 09:42:18 dmitry
Exp $ */
+/* $Id: basic_functions.c,v 1.725.2.31.2.64.2.41 2008/07/24 19:52:24 felipe
Exp $ */
#include "php.h"
#include "php_streams.h"
@@ -4887,7 +4887,7 @@
/* {{{ add_config_entry_cb
*/
-static int add_config_entry_cb(zval *entry, int num_args, va_list args,
zend_hash_key *hash_key TSRMLS_DC)
+static int add_config_entry_cb(zval *entry TSRMLS_DC, int num_args, va_list
args, zend_hash_key *hash_key)
{
zval *retval = (zval *) va_arg(args, int);
zval *tmp;
@@ -4901,7 +4901,7 @@
} else if (Z_TYPE_P(entry) == IS_ARRAY) {
MAKE_STD_ZVAL(tmp);
array_init(tmp);
- zend_hash_apply_with_arguments(Z_ARRVAL_P(entry),
(apply_func_args_t) add_config_entry_cb, 1, tmp TSRMLS_CC);
+ zend_hash_apply_with_arguments(Z_ARRVAL_P(entry) TSRMLS_CC,
(apply_func_args_t) add_config_entry_cb, 1, tmp);
add_assoc_zval_ex(retval, hash_key->arKey,
hash_key->nKeyLength, tmp);
}
return 0;
@@ -4925,7 +4925,7 @@
if (retval) {
if (Z_TYPE_P(retval) == IS_ARRAY) {
array_init(return_value);
- zend_hash_apply_with_arguments(Z_ARRVAL_P(retval),
(apply_func_args_t) add_config_entry_cb, 1, return_value TSRMLS_CC);
+ zend_hash_apply_with_arguments(Z_ARRVAL_P(retval)
TSRMLS_CC, (apply_func_args_t) add_config_entry_cb, 1, return_value);
return;
} else {
RETURN_STRING(Z_STRVAL_P(retval), 1);
@@ -5604,7 +5604,7 @@
}
/* }}} */
-static int php_ini_get_option(zend_ini_entry *ini_entry, int num_args, va_list
args, zend_hash_key *hash_key) /* {{{ */
+static int php_ini_get_option(zend_ini_entry *ini_entry TSRMLS_DC, int
num_args, va_list args, zend_hash_key *hash_key) /* {{{ */
{
zval *ini_array = va_arg(args, zval *);
int module_number = va_arg(args, int);
@@ -5675,7 +5675,7 @@
}
array_init(return_value);
- zend_hash_apply_with_arguments(EG(ini_directives), (apply_func_args_t)
php_ini_get_option, 2, return_value, extnumber, details TSRMLS_CC);
+ zend_hash_apply_with_arguments(EG(ini_directives) TSRMLS_CC,
(apply_func_args_t) php_ini_get_option, 2, return_value, extnumber, details);
}
/* }}} */
@@ -6290,17 +6290,16 @@
HashTable *hash = php_ini_get_configuration_hash();
array_init(return_value);
- zend_hash_apply_with_arguments(hash, (apply_func_args_t)
add_config_entry_cb, 1, return_value TSRMLS_CC);
+ zend_hash_apply_with_arguments(hash TSRMLS_CC, (apply_func_args_t)
add_config_entry_cb, 1, return_value);
}
/* }}} */
#endif
-static int copy_request_variable(void *pDest, int num_args, va_list args,
zend_hash_key *hash_key) /* {{{ */
+static int copy_request_variable(void *pDest TSRMLS_DC, int num_args, va_list
args, zend_hash_key *hash_key) /* {{{ */
{
zval *prefix, new_key;
int prefix_len;
zval **var = (zval **) pDest;
- TSRMLS_FETCH();
if (num_args != 1) {
return 0;
@@ -6367,18 +6366,18 @@
case 'g':
case 'G':
-
zend_hash_apply_with_arguments(Z_ARRVAL_P(PG(http_globals)[TRACK_VARS_GET]),
(apply_func_args_t) copy_request_variable, 1, prefix);
+
zend_hash_apply_with_arguments(Z_ARRVAL_P(PG(http_globals)[TRACK_VARS_GET])
TSRMLS_CC, (apply_func_args_t) copy_request_variable, 1, prefix);
break;
case 'p':
case 'P':
-
zend_hash_apply_with_arguments(Z_ARRVAL_P(PG(http_globals)[TRACK_VARS_POST]),
(apply_func_args_t) copy_request_variable, 1, prefix);
-
zend_hash_apply_with_arguments(Z_ARRVAL_P(PG(http_globals)[TRACK_VARS_FILES]),
(apply_func_args_t) copy_request_variable, 1, prefix);
+
zend_hash_apply_with_arguments(Z_ARRVAL_P(PG(http_globals)[TRACK_VARS_POST])
TSRMLS_CC, (apply_func_args_t) copy_request_variable, 1, prefix);
+
zend_hash_apply_with_arguments(Z_ARRVAL_P(PG(http_globals)[TRACK_VARS_FILES])
TSRMLS_CC, (apply_func_args_t) copy_request_variable, 1, prefix);
break;
case 'c':
case 'C':
-
zend_hash_apply_with_arguments(Z_ARRVAL_P(PG(http_globals)[TRACK_VARS_COOKIE]),
(apply_func_args_t) copy_request_variable, 1, prefix);
+
zend_hash_apply_with_arguments(Z_ARRVAL_P(PG(http_globals)[TRACK_VARS_COOKIE])
TSRMLS_CC, (apply_func_args_t) copy_request_variable, 1, prefix);
break;
}
}
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/browscap.c?r1=1.85.2.2.2.3.2.5&r2=1.85.2.2.2.3.2.6&diff_format=u
Index: php-src/ext/standard/browscap.c
diff -u php-src/ext/standard/browscap.c:1.85.2.2.2.3.2.5
php-src/ext/standard/browscap.c:1.85.2.2.2.3.2.6
--- php-src/ext/standard/browscap.c:1.85.2.2.2.3.2.5 Mon Dec 31 07:17:14 2007
+++ php-src/ext/standard/browscap.c Thu Jul 24 19:52:24 2008
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: browscap.c,v 1.85.2.2.2.3.2.5 2007/12/31 07:17:14 sebastian Exp $ */
+/* $Id: browscap.c,v 1.85.2.2.2.3.2.6 2008/07/24 19:52:24 felipe Exp $ */
#include "php.h"
#include "php_browscap.h"
@@ -212,7 +212,7 @@
}
/* }}} */
-static int browser_reg_compare(zval **browser, int num_args, va_list args,
zend_hash_key *key) /* {{{ */
+static int browser_reg_compare(zval **browser TSRMLS_DC, int num_args, va_list
args, zend_hash_key *key) /* {{{ */
{
zval **browser_regex, **previous_match;
regex_t r;
@@ -329,7 +329,7 @@
if (zend_hash_find(&browser_hash, lookup_browser_name, agent_name_len +
1, (void **) &agent) == FAILURE) {
found_browser_entry = NULL;
- zend_hash_apply_with_arguments(&browser_hash,
(apply_func_args_t) browser_reg_compare, 2, lookup_browser_name,
&found_browser_entry);
+ zend_hash_apply_with_arguments(&browser_hash TSRMLS_CC,
(apply_func_args_t) browser_reg_compare, 2, lookup_browser_name,
&found_browser_entry);
if (found_browser_entry) {
agent = &found_browser_entry;
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/var.c?r1=1.203.2.7.2.18.2.9&r2=1.203.2.7.2.18.2.10&diff_format=u
Index: php-src/ext/standard/var.c
diff -u php-src/ext/standard/var.c:1.203.2.7.2.18.2.9
php-src/ext/standard/var.c:1.203.2.7.2.18.2.10
--- php-src/ext/standard/var.c:1.203.2.7.2.18.2.9 Fri Jun 20 18:05:45 2008
+++ php-src/ext/standard/var.c Thu Jul 24 19:52:24 2008
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: var.c,v 1.203.2.7.2.18.2.9 2008/06/20 18:05:45 ohill Exp $ */
+/* $Id: var.c,v 1.203.2.7.2.18.2.10 2008/07/24 19:52:24 felipe Exp $ */
/* {{{ includes
*/
@@ -35,10 +35,9 @@
#define COMMON (Z_ISREF_PP(struc) ? "&" : "")
/* }}} */
-static int php_array_element_dump(zval **zv, int num_args, va_list args,
zend_hash_key *hash_key) /* {{{ */
+static int php_array_element_dump(zval **zv TSRMLS_DC, int num_args, va_list
args, zend_hash_key *hash_key) /* {{{ */
{
int level;
- TSRMLS_FETCH();
level = va_arg(args, int);
@@ -54,11 +53,10 @@
}
/* }}} */
-static int php_object_property_dump(zval **zv, int num_args, va_list args,
zend_hash_key *hash_key) /* {{{ */
+static int php_object_property_dump(zval **zv TSRMLS_DC, int num_args, va_list
args, zend_hash_key *hash_key) /* {{{ */
{
int level;
char *prop_name, *class_name;
- TSRMLS_FETCH();
level = va_arg(args, int);
@@ -91,7 +89,7 @@
HashTable *myht;
char *class_name;
zend_uint class_name_len;
- int (*php_element_dump_func)(zval**, int, va_list, zend_hash_key*);
+ int (*php_element_dump_func)(zval** TSRMLS_DC, int, va_list,
zend_hash_key*);
int is_temp;
if (level > 1) {
@@ -139,7 +137,7 @@
php_element_dump_func = php_object_property_dump;
head_done:
if (myht) {
- zend_hash_apply_with_arguments(myht,
(apply_func_args_t) php_element_dump_func, 1, level);
+ zend_hash_apply_with_arguments(myht TSRMLS_CC,
(apply_func_args_t) php_element_dump_func, 1, level);
if (is_temp) {
zend_hash_destroy(myht);
efree(myht);
@@ -183,10 +181,9 @@
}
/* }}} */
-static int zval_array_element_dump(zval **zv, int num_args, va_list args,
zend_hash_key *hash_key) /* {{{ */
+static int zval_array_element_dump(zval **zv TSRMLS_DC, int num_args, va_list
args, zend_hash_key *hash_key) /* {{{ */
{
int level;
- TSRMLS_FETCH();
level = va_arg(args, int);
@@ -208,11 +205,10 @@
}
/* }}} */
-static int zval_object_property_dump(zval **zv, int num_args, va_list args,
zend_hash_key *hash_key) /* {{{ */
+static int zval_object_property_dump(zval **zv TSRMLS_DC, int num_args,
va_list args, zend_hash_key *hash_key) /* {{{ */
{
int level;
char *prop_name, *class_name;
- TSRMLS_FETCH();
level = va_arg(args, int);
@@ -244,7 +240,7 @@
char *class_name;
zend_uint class_name_len;
zend_class_entry *ce;
- int (*zval_element_dump_func)(zval**, int, va_list, zend_hash_key*);
+ int (*zval_element_dump_func)(zval** TSRMLS_DC, int, va_list,
zend_hash_key*);
int is_temp = 0;
if (level > 1) {
@@ -291,7 +287,7 @@
zval_element_dump_func = zval_object_property_dump;
head_done:
if (myht) {
- zend_hash_apply_with_arguments(myht,
(apply_func_args_t) zval_element_dump_func, 1, level, (Z_TYPE_PP(struc) ==
IS_ARRAY ? 0 : 1));
+ zend_hash_apply_with_arguments(myht TSRMLS_CC,
(apply_func_args_t) zval_element_dump_func, 1, level, (Z_TYPE_PP(struc) ==
IS_ARRAY ? 0 : 1));
if (is_temp) {
zend_hash_destroy(myht);
efree(myht);
@@ -335,10 +331,9 @@
}
/* }}} */
-static int php_array_element_export(zval **zv, int num_args, va_list args,
zend_hash_key *hash_key) /* {{{ */
+static int php_array_element_export(zval **zv TSRMLS_DC, int num_args, va_list
args, zend_hash_key *hash_key) /* {{{ */
{
int level;
- TSRMLS_FETCH();
level = va_arg(args, int);
@@ -361,11 +356,10 @@
}
/* }}} */
-static int php_object_element_export(zval **zv, int num_args, va_list args,
zend_hash_key *hash_key) /* {{{ */
+static int php_object_element_export(zval **zv TSRMLS_DC, int num_args,
va_list args, zend_hash_key *hash_key) /* {{{ */
{
int level;
char *prop_name, *class_name;
- TSRMLS_FETCH();
level = va_arg(args, int);
@@ -416,7 +410,7 @@
php_printf("\n%*c", level - 1, ' ');
}
PUTS ("array (\n");
- zend_hash_apply_with_arguments(myht, (apply_func_args_t)
php_array_element_export, 1, level, (Z_TYPE_PP(struc) == IS_ARRAY ? 0 : 1));
+ zend_hash_apply_with_arguments(myht TSRMLS_CC,
(apply_func_args_t) php_array_element_export, 1, level, (Z_TYPE_PP(struc) ==
IS_ARRAY ? 0 : 1));
if (level > 1) {
php_printf("%*c", level - 1, ' ');
}
@@ -431,7 +425,7 @@
php_printf ("%s::__set_state(array(\n", class_name);
efree(class_name);
if (myht) {
- zend_hash_apply_with_arguments(myht,
(apply_func_args_t) php_object_element_export, 1, level);
+ zend_hash_apply_with_arguments(myht TSRMLS_CC,
(apply_func_args_t) php_object_element_export, 1, level);
}
if (level > 1) {
php_printf("%*c", level - 1, ' ');
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
