Browse Source

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

PHP-5.1
Dmitry Stogov 20 years ago
parent
commit
161ae714ae
  1. 2
      Zend/zend_constants.c
  2. 4
      Zend/zend_execute_API.c
  3. 2
      Zend/zend_opcode.c

2
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;
}

4
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);
}

2
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)

Loading…
Cancel
Save