From: Zeev Suraski <zeev@php.net>
Date: Thu, 2 Aug 2001 05:25:29 +0000 (+0000)
Subject: TSRMLS fixes
X-Git-Tag: PRE_ENGINE2_SPLIT~136
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3aa5674a84891e3d599ff984bfdd3c8735823752;p=php

TSRMLS fixes
---

diff --git a/Zend/zend_builtin_functions.c b/Zend/zend_builtin_functions.c
index a0e5e67da4..344fd3d1c0 100644
--- a/Zend/zend_builtin_functions.c
+++ b/Zend/zend_builtin_functions.c
@@ -851,7 +851,7 @@ ZEND_FUNCTION(get_declared_classes)
 	}
 
 	array_init(return_value);
-	zend_hash_apply_with_arguments(EG(class_table), (apply_func_args_t)copy_class_name, 1, return_value);
+	zend_hash_apply_with_arguments(EG(class_table), (apply_func_args_t) copy_class_name, 1, return_value);
 }
 /* }}} */
 
@@ -891,7 +891,7 @@ ZEND_FUNCTION(get_defined_functions)
 	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), (apply_func_args_t) copy_function_name, 2, internal, user);
 	
 	if (zend_hash_add(return_value->value.ht, "internal", sizeof("internal"), (void **)&internal, sizeof(zval *), NULL) == FAILURE) {
 		zend_error(E_WARNING, "Cannot add internal functions to return value from get_defined_functions()");
diff --git a/Zend/zend_hash.c b/Zend/zend_hash.c
index 0078a53893..437190e001 100644
--- a/Zend/zend_hash.c
+++ b/Zend/zend_hash.c
@@ -711,7 +711,7 @@ ZEND_API void zend_hash_apply_with_argument(HashTable *ht, apply_func_arg_t appl
 	HASH_PROTECT_RECURSION(ht);
 	p = ht->pListHead;
 	while (p != NULL) {
-		if (apply_func(p->pData, argument)) {
+		if (apply_func(p->pData, argument TSRMLS_CC)) {
 			p = zend_hash_apply_deleter(ht, p);
 		} else {
 			p = p->pListNext;
@@ -721,7 +721,7 @@ ZEND_API void zend_hash_apply_with_argument(HashTable *ht, apply_func_arg_t appl
 }
 
 
-ZEND_API void zend_hash_apply_with_arguments(HashTable *ht, int (*destruct)(void *, int, va_list, zend_hash_key *), int num_args, ...)
+ZEND_API void zend_hash_apply_with_arguments(HashTable *ht, apply_func_args_t destruct, int num_args, ...)
 {
 	Bucket *p;
 	va_list args;
diff --git a/Zend/zend_hash.h b/Zend/zend_hash.h
index e14b6c62f8..c1d593f76e 100644
--- a/Zend/zend_hash.h
+++ b/Zend/zend_hash.h
@@ -38,7 +38,7 @@ typedef int  (*compare_func_t)(const void *, const void *);
 typedef void (*sort_func_t)(void *, size_t, register size_t, compare_func_t);
 typedef void (*dtor_func_t)(void *pDest);
 typedef int (*apply_func_t)(void *pDest TSRMLS_DC);
-typedef int (*apply_func_arg_t)(void *pDest, void *argument);
+typedef int (*apply_func_arg_t)(void *pDest, void *argument TSRMLS_DC);
 typedef void (*copy_ctor_func_t)(void *pElement);
 
 struct _hashtable;