From 72acb65b249e86515f83e748e7b328885ab4cd5b Mon Sep 17 00:00:00 2001 From: Dmitry Stogov Date: Tue, 14 Mar 2006 11:24:30 +0000 Subject: [PATCH] zend_hash_apply() doesn't use ZEND_HASH_APPLY_... macros --- Zend/zend_constants.c | 2 +- Zend/zend_execute_API.c | 4 ++-- Zend/zend_opcode.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Zend/zend_constants.c b/Zend/zend_constants.c index 95948b2623..69607d1620 100644 --- a/Zend/zend_constants.c +++ b/Zend/zend_constants.c @@ -66,7 +66,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 cc8308b844..bd5643fe5b 100644 --- a/Zend/zend_execute_API.c +++ b/Zend/zend_execute_API.c @@ -115,7 +115,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); } @@ -127,7 +127,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 d3b502d5cf..cdaf0c3dc7 100644 --- a/Zend/zend_opcode.c +++ b/Zend/zend_opcode.c @@ -146,7 +146,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) -- 2.50.1