From 81d901b14dd87285977ba7947a0268adb6519089 Mon Sep 17 00:00:00 2001 From: Zeev Suraski Date: Fri, 9 Jul 1999 17:24:47 +0000 Subject: Step 1 in nuking the garbage collector: - Change the hash destructor to return int - Don't kill the bucket on hash_destroy if the destructor returns 0 --- Zend/zend_constants.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'Zend/zend_constants.c') diff --git a/Zend/zend_constants.c b/Zend/zend_constants.c index a533026f48..cce14b8cc7 100644 --- a/Zend/zend_constants.c +++ b/Zend/zend_constants.c @@ -22,12 +22,13 @@ #include "zend_globals.h" -void free_zend_constant(zend_constant *c) +int free_zend_constant(zend_constant *c) { if (!(c->flags & CONST_PERSISTENT)) { zval_dtor(&c->value); } free(c->name); + return 1; } @@ -86,7 +87,7 @@ int zend_startup_constants(ELS_D) EG(zend_constants) = (HashTable *) malloc(sizeof(HashTable)); - if (zend_hash_init(EG(zend_constants), 20, NULL, (void(*)(void *)) free_zend_constant, 1)==FAILURE) { + if (zend_hash_init(EG(zend_constants), 20, NULL, ZEND_CONSTANT_DTOR, 1)==FAILURE) { return FAILURE; } -- cgit v1.2.1