From: Andrei Zmievski <andrei@php.net>
Date: Thu, 26 Oct 2000 17:38:01 +0000 (+0000)
Subject: Fix dba after resources patch.
X-Git-Tag: php-4.0.4RC3~530
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=26f5fe63757e0482c19e7e5e499bd686499d8b0b;p=php

Fix dba after resources patch.
---

diff --git a/ext/dba/dba.c b/ext/dba/dba.c
index 558465725c..1a3a3c3fa8 100644
--- a/ext/dba/dba.c
+++ b/ext/dba/dba.c
@@ -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;
 }