]> granicus.if.org Git - php/commitdiff
Fix dba after resources patch.
authorAndrei Zmievski <andrei@php.net>
Thu, 26 Oct 2000 17:38:01 +0000 (17:38 +0000)
committerAndrei Zmievski <andrei@php.net>
Thu, 26 Oct 2000 17:38:01 +0000 (17:38 +0000)
ext/dba/dba.c

index 558465725c143cba007dabeaa30e5d40adea9c5e..1a3a3c3fa8bccb5fa5a482190e438bb8a8ca1bf4 100644 (file)
@@ -178,20 +178,25 @@ static HashTable ht_keys;
 /* {{{ helper routines */
        /* {{{ dba_close */
 
-static void dba_close(zend_rsrc_list_entry *rsrc)
+static void dba_close(dba_info *info)
 {
-       dba_info *info = (dba_info *)rsrc->ptr;
        if(info->hnd) info->hnd->close(info);
        if(info->path) free(info->path);
        free(info);
 }
 /* }}} */
 
+static void dba_close_rsrc(zend_rsrc_list_entry *rsrc)
+{
+       dba_info *info = (dba_info *)rsrc->ptr;
+       dba_close(info);
+}
+
 static PHP_MINIT_FUNCTION(dba)
 {
        zend_hash_init(&ht_keys, 0, NULL, NULL, 1);
-       GLOBAL(le_db) = zend_register_list_destructors_ex(dba_close, NULL, "dba", module_number);
-       GLOBAL(le_pdb) = zend_register_list_destructors_ex(NULL, dba_close, "dba persistent", module_number);
+       GLOBAL(le_db) = zend_register_list_destructors_ex(dba_close_rsrc, NULL, "dba", module_number);
+       GLOBAL(le_pdb) = zend_register_list_destructors_ex(NULL, dba_close_rsrc, "dba persistent", module_number);
        return SUCCESS;
 }