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/msql/php_msql.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/msql/php_msql.c')
| -rw-r--r-- | ext/msql/php_msql.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/ext/msql/php_msql.c b/ext/msql/php_msql.c index e33f08943a..bf2f54771f 100644 --- a/ext/msql/php_msql.c +++ b/ext/msql/php_msql.c @@ -116,9 +116,9 @@ typedef struct { ZEND_FETCH_RESOURCE(msql_query, m_query *, &res, -1, "mSQL result", msql_globals.le_query); \ msql_result = msql_query->result -static void _delete_query(void *arg) +static void _delete_query(zend_rsrc_list_entry *rsrc) { - m_query *query = (m_query *) arg; + m_query *query = (m_query *)rsrc->ptr; if(query->result) msqlFreeResult(query->result); efree(arg); @@ -134,15 +134,17 @@ static m_query *php_msql_query_wrapper(m_result *res, int af_rows) return query; } -static void _close_msql_link(int link) +static void _close_msql_link(zend_rsrc_list_entry *rsrc) { + int link = (int)rsrc->ptr; msqlClose(link); msql_globals.num_links--; } -static void _close_msql_plink(int link) +static void _close_msql_plink(zend_rsrc_list_entry *rsrc) { + int link = (int)rsrc->ptr; msqlClose(link); msql_globals.num_persistent--; msql_globals.num_links--; @@ -160,9 +162,9 @@ DLEXPORT PHP_MINIT_FUNCTION(msql) msql_globals.max_links=-1; } msql_globals.num_persistent=0; - msql_globals.le_query = register_list_destructors(_delete_query,NULL); - msql_globals.le_link = register_list_destructors(_close_msql_link,NULL); - msql_globals.le_plink = register_list_destructors(NULL,_close_msql_plink); + msql_globals.le_query = register_list_destructors(_delete_query,NULL,"msql query"); + msql_globals.le_link = register_list_destructors(_close_msql_link,NULL,"msql link"); + msql_globals.le_plink = register_list_destructors(NULL,_close_msql_plink, "msql link persistent"); msql_module_entry.type = type; |