diff options
| author | Zeev Suraski <zeev@php.net> | 1999-07-09 17:24:47 +0000 |
|---|---|---|
| committer | Zeev Suraski <zeev@php.net> | 1999-07-09 17:24:47 +0000 |
| commit | 81d901b14dd87285977ba7947a0268adb6519089 (patch) | |
| tree | a94bc7f17920fd62d2de5fccd984bfba388d5475 /Zend/zend_constants.c | |
| parent | db1e0bc8201a1f6667094205dc14b3af248ddbd1 (diff) | |
| download | php-git-81d901b14dd87285977ba7947a0268adb6519089.tar.gz | |
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
Diffstat (limited to 'Zend/zend_constants.c')
| -rw-r--r-- | Zend/zend_constants.c | 5 |
1 files changed, 3 insertions, 2 deletions
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; } |