zend_hash_apply() doesn't use ZEND_HASH_APPLY_... macros

diff --git a/Zend/zend_constants.c b/Zend/zend_constants.c
index 10dbe360b3ff3d9ab96c71fae2b4b76bb718d9f5..0f8e0a41bdadf46ce8edbe282de2600706570175 100644 (file)
--- a/Zend/zend_constants.c
+++ b/Zend/zend_constants.c
@@ -61,7 +61,7 @@ static int clean_non_persistent_constant(zend_constant *c TSRMLS_DC)
 
 static int clean_non_persistent_constant_full(zend_constant *c TSRMLS_DC)
 {
-       return (c->flags & CONST_PERSISTENT) ? ZEND_HASH_APPLY_KEEP : ZEND_HASH_APPLY_REMOVE;
+       return (c->flags & CONST_PERSISTENT) ? 0 : 1;
 }
 
 

diff --git a/Zend/zend_execute_API.c b/Zend/zend_execute_API.c
index 53d1f0d4575ba99eefe59357e662d0290ac9d4de..76533e51d5b561a3526c0733c94a24637bb8ba1c 100644 (file)
--- a/Zend/zend_execute_API.c
+++ b/Zend/zend_execute_API.c
@@ -103,7 +103,7 @@ static int clean_non_persistent_function(zend_function *function TSRMLS_DC)
 
 static int clean_non_persistent_function_full(zend_function *function TSRMLS_DC)
 {
-       return (function->type == ZEND_INTERNAL_FUNCTION) ? ZEND_HASH_APPLY_KEEP : ZEND_HASH_APPLY_REMOVE;
+       return (function->type != ZEND_INTERNAL_FUNCTION);
 }
 
 
@@ -115,7 +115,7 @@ static int clean_non_persistent_class(zend_class_entry **ce TSRMLS_DC)
 
 static int clean_non_persistent_class_full(zend_class_entry **ce TSRMLS_DC)
 {
-       return ((*ce)->type == ZEND_INTERNAL_CLASS) ? ZEND_HASH_APPLY_KEEP : ZEND_HASH_APPLY_REMOVE;
+       return ((*ce)->type != ZEND_INTERNAL_CLASS);
 }
 
 

diff --git a/Zend/zend_opcode.c b/Zend/zend_opcode.c
index cd35202de8f0a91570f9db36d95f710fd63a7c29..9e6849693975b2c6118014ceb82dc97aa408a378 100644 (file)
--- a/Zend/zend_opcode.c
+++ b/Zend/zend_opcode.c
@@ -143,7 +143,7 @@ ZEND_API int zend_cleanup_function_data_full(zend_function *function TSRMLS_DC)
        if (function->type == ZEND_USER_FUNCTION) {
                zend_cleanup_op_array_data((zend_op_array *) function);
        }
-       return ZEND_HASH_APPLY_KEEP;
+       return 0;
 }
 
 ZEND_API int zend_cleanup_class_data(zend_class_entry **pce TSRMLS_DC)