diff options
| author | Andrei Zmievski <andrei@php.net> | 2000-10-20 18:25:16 +0000 |
|---|---|---|
| committer | Andrei Zmievski <andrei@php.net> | 2000-10-20 18:25:16 +0000 |
| commit | 7b4983c8f82c4f361df787f58c6f5cf88d5def0b (patch) | |
| tree | e38e8ffceb65a0f2492b28e2b07c8668fcddeda4 /ext/mssql/php_mssql.c | |
| parent | a0cfab65ea72963f81a3440a3587d11bd7800337 (diff) | |
| download | php-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/mssql/php_mssql.c')
| -rw-r--r-- | ext/mssql/php_mssql.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/ext/mssql/php_mssql.c b/ext/mssql/php_mssql.c index a39237335f..9ae0a28daa 100644 --- a/ext/mssql/php_mssql.c +++ b/ext/mssql/php_mssql.c @@ -133,8 +133,9 @@ static int _clean_invalid_results(list_entry *le) return 0; } -static void _free_mssql_result(mssql_result *result) +static void _free_mssql_result(zend_rsrc_list_entry *rsrc) { + mssql_result *result = (mssql_result *)rsrc->ptr; int i,j; if (result->data) { @@ -168,8 +169,9 @@ static void php_mssql_set_default_link(int id) zend_list_addref(id); } -static void _close_mssql_link(mssql_link *mssql_ptr) +static void _close_mssql_link(zend_rsrc_list_entry *rsrc) { + mssql_link *mssql_ptr = (mssql_link *)rsrc->ptr; MSSQLLS_FETCH(); ELS_FETCH(); @@ -182,8 +184,9 @@ static void _close_mssql_link(mssql_link *mssql_ptr) } -static void _close_mssql_plink(mssql_link *mssql_ptr) +static void _close_mssql_plink(zend_rsrc_list_entry *rsrc) { + mssql_link *mssql_ptr = (mssql_link *)rsrc->ptr; MSSQLLS_FETCH(); dbclose(mssql_ptr->link); @@ -217,9 +220,9 @@ PHP_MINIT_FUNCTION(mssql) #endif REGISTER_INI_ENTRIES(); - le_result = register_list_destructors(_free_mssql_result, NULL); - le_link = register_list_destructors(_close_mssql_link, NULL); - le_plink = register_list_destructors(NULL, _close_mssql_plink); + le_result = register_list_destructors(_free_mssql_result, NULL, "mssql result"); + le_link = register_list_destructors(_close_mssql_link, NULL, "mssql link"); + le_plink = register_list_destructors(NULL, _close_mssql_plink, "mssql link persistent"); mssql_module_entry.type = type; if (dbinit()==FAIL) { |