diff options
| author | Zeev Suraski <zeev@php.net> | 2001-07-31 05:44:11 +0000 |
|---|---|---|
| committer | Zeev Suraski <zeev@php.net> | 2001-07-31 05:44:11 +0000 |
| commit | aa1772ca7263173ee47af0d83fea866f194757ba (patch) | |
| tree | a8ea8932a07875a43423a8ffcd0100eab0c0f8a7 /ext/pgsql | |
| parent | 57507b4ea6bb2a38578444ca8359806f241fa8f5 (diff) | |
| download | php-git-aa1772ca7263173ee47af0d83fea866f194757ba.tar.gz | |
More TSRMLS_FETCH annihilation
Diffstat (limited to 'ext/pgsql')
| -rw-r--r-- | ext/pgsql/pgsql.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/ext/pgsql/pgsql.c b/ext/pgsql/pgsql.c index bbd5cfdf06..8ff51b8968 100644 --- a/ext/pgsql/pgsql.c +++ b/ext/pgsql/pgsql.c @@ -142,10 +142,9 @@ static void php_pgsql_set_default_link(int id) /* {{{ _close_pgsql_link */ -static void _close_pgsql_link(zend_rsrc_list_entry *rsrc) +static void _close_pgsql_link(zend_rsrc_list_entry *rsrc TSRMLS_DC) { PGconn *link = (PGconn *)rsrc->ptr; - TSRMLS_FETCH(); PQfinish(link); PGG(num_links)--; @@ -154,10 +153,9 @@ static void _close_pgsql_link(zend_rsrc_list_entry *rsrc) /* {{{ _close_pgsql_plink */ -static void _close_pgsql_plink(zend_rsrc_list_entry *rsrc) +static void _close_pgsql_plink(zend_rsrc_list_entry *rsrc TSRMLS_DC) { PGconn *link = (PGconn *)rsrc->ptr; - TSRMLS_FETCH(); PQfinish(link); PGG(num_persistent)--; @@ -206,7 +204,7 @@ static int _rollback_transactions(zend_rsrc_list_entry *rsrc TSRMLS_DC) /* {{{ _free_ptr */ -static void _free_ptr(zend_rsrc_list_entry *rsrc) +static void _free_ptr(zend_rsrc_list_entry *rsrc TSRMLS_DC) { pgLofp *lofp = (pgLofp *)rsrc->ptr; efree(lofp); @@ -215,9 +213,10 @@ static void _free_ptr(zend_rsrc_list_entry *rsrc) /* {{{ _free_result */ -static void _free_result(zend_rsrc_list_entry *rsrc) +static void _free_result(zend_rsrc_list_entry *rsrc TSRMLS_DC) { pgsql_result_handle *pg_result = (pgsql_result_handle *)rsrc->ptr; + PQclear(pg_result->result); efree(pg_result); } |