summaryrefslogtreecommitdiff
path: root/ext/sybase_ct/php_sybase_ct.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/sybase_ct/php_sybase_ct.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/sybase_ct/php_sybase_ct.c')
-rw-r--r--ext/sybase_ct/php_sybase_ct.c17
1 files changed, 12 insertions, 5 deletions
diff --git a/ext/sybase_ct/php_sybase_ct.c b/ext/sybase_ct/php_sybase_ct.c
index b09fa09377..6c9ff7675f 100644
--- a/ext/sybase_ct/php_sybase_ct.c
+++ b/ext/sybase_ct/php_sybase_ct.c
@@ -127,9 +127,15 @@ static void _free_sybase_result(sybase_result *result)
efree(result);
}
+static void php_free_sybase_result(zend_rsrc_list_entry *rsrc)
+{
+ sybase_result *result = (sybase_result *)rsrc->ptr;
+ _free_sybase_result(result);
+}
-static void _close_sybase_link(sybase_link *sybase_ptr)
+static void _close_sybase_link(zend_rsrc_list_entry *rsrc)
{
+ sybase_link *sybase_ptr = (sybase_link *)rsrc->ptr;
CS_INT con_status;
ELS_FETCH();
SybCtLS_FETCH();
@@ -160,8 +166,9 @@ static void _close_sybase_link(sybase_link *sybase_ptr)
}
-static void _close_sybase_plink(sybase_link *sybase_ptr)
+static void _close_sybase_plink(zend_rsrc_list_entry *rsrc)
{
+ sybase_link *sybase_ptr = (sybase_link *)rsrc->ptr;
CS_INT con_status;
SybCtLS_FETCH();
@@ -315,9 +322,9 @@ PHP_MINIT_FUNCTION(sybase)
REGISTER_INI_ENTRIES();
- le_link = register_list_destructors(_close_sybase_link,NULL);
- le_plink = register_list_destructors(NULL,_close_sybase_plink);
- le_result = register_list_destructors(_free_sybase_result,NULL);
+ le_link = register_list_destructors(_close_sybase_link,NULL, "sybase-ct link");
+ le_plink = register_list_destructors(NULL,_close_sybase_plink, "sybase-ct link persistent");
+ le_result = register_list_destructors(php_free_sybase_result,NULL, "sybase-ct result");
return SUCCESS;
}