summaryrefslogtreecommitdiff
path: root/ext/dba/dba.c
diff options
context:
space:
mode:
authorAndrei Zmievski <andrei@php.net>2000-10-20 18:25:16 +0000
committerAndrei Zmievski <andrei@php.net>2000-10-20 18:25:16 +0000
commit7b4983c8f82c4f361df787f58c6f5cf88d5def0b (patch)
treee38e8ffceb65a0f2492b28e2b07c8668fcddeda4 /ext/dba/dba.c
parenta0cfab65ea72963f81a3440a3587d11bd7800337 (diff)
downloadphp-git-7b4983c8f82c4f361df787f58c6f5cf88d5def0b.tar.gz
Mega-patch to get better resource information for modules.
* Fixed a bug in zend_rsrc_list_get_rsrc_type() * Switched register_list_destructors() to use zend_register_list_destructors_ex() instead * Updated all relevant modules to provide the resource type name to register_list_destructors() call * Updated var_dump() to output resource type name instead of number @- Made resource type names visible, e.g. var_dump() and @ get_resource_type() display "file" for file resources. (Andrei)
Diffstat (limited to 'ext/dba/dba.c')
-rw-r--r--ext/dba/dba.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/ext/dba/dba.c b/ext/dba/dba.c
index ac552802d6..6d70e11113 100644
--- a/ext/dba/dba.c
+++ b/ext/dba/dba.c
@@ -178,8 +178,9 @@ static HashTable ht_keys;
/* {{{ helper routines */
/* {{{ dba_close */
-static void dba_close(dba_info *info)
+static void dba_close(zend_rsrc_list_entry *rsrc)
{
+ dba_info *info = (dba_info *)rsrc->ptr;
if(info->hnd) info->hnd->close(info);
if(info->path) free(info->path);
free(info);
@@ -189,8 +190,8 @@ static void dba_close(dba_info *info)
static PHP_MINIT_FUNCTION(dba)
{
zend_hash_init(&ht_keys, 0, NULL, NULL, 1);
- GLOBAL(le_db) = register_list_destructors(dba_close, NULL);
- GLOBAL(le_pdb) = register_list_destructors(NULL, dba_close);
+ GLOBAL(le_db) = register_list_destructors(dba_close, NULLi,"dba");
+ GLOBAL(le_pdb) = register_list_destructors(NULL, dba_close,"dba persistent");
return SUCCESS;
}