cvs: php4 /ext/aspell aspell.c /ext/bz2 bz2.c /ext/com COM.c VARIANT.c /ext/cpdf cpdf.c /ext/curl curl.c /ext/db db.c php_db.h /ext/dba dba.c
/ext/dbase dbase.c /ext/dbplus dbplus.c php_dbplus.h /ext/domxml php_domxml.c /ext/fbsql php_fbsql.c /ext/fdf fdf.c /ext/ftp php_ftp.c /ext/gd
gd.c gdt1.h /ext/gmp gmp.c /ext/hyperwave hw.c /ext/icap php_icap.c /ext/imap php_imap.c /ext/ingres_ii ii.c ii.h /ext/interbase interbase.c
/ext/java java.c /ext/ldap ldap.c /ext/mcal php_mcal.c /ext/ming ming.c /ext/mnogosearch php_mnogo.c /ext/msql php_msql.c /ext/mssql php_mssql.c
/ext/mysql php_mysql.c /ext/ncurses ncurses.c /ext/oci8 oci8.c /ext/odbc php_odbc.c velocis.c /ext/openssl openssl.c /ext/oracle oracle.c
/ext/pdf pdf.c /ext/pgsql pgsql.c /ext/printer printer.c /ext/pspell pspell.c /ext/sablot sablot.c /ext/shmop shmop.c /ext/sockets sockets.c
/ext/standard dir.c file.c /ext/sybase php_sybase_db.c /ext/sybase_ct php_sybase_ct.c /ext/sysvsem sysvsem.c /ext/sysvshm sysvshm.c /ext/wddx
wddx.c /ext/xml xml.c /ext/xslt sablot.c /ext/zip zip.c /ext/zlib zlib.c /main php_ticks.c

zeev Tue Jul 31 01:44:17 2001 EDT Modified files: /php4/ext/aspell aspell.c /php4/ext/bz2 bz2.c /php4/ext/com COM.c VARIANT.c /php4/ext/cpdf cpdf.c /php4/ext/curl curl.c /php4/ext/db db.c php_db.h /php4/ext/dba dba.c /php4/ext/dbase dbase.c /php4/ext/dbplus dbplus.c php_dbplus.h /php4/ext/domxml php_domxml.c /php4/ext/fbsql php_fbsql.c /php4/ext/fdf fdf.c /php4/ext/ftp php_ftp.c /php4/ext/gd gd.c gdt1.h /php4/ext/gmp gmp.c /php4/ext/hyperwave hw.c /php4/ext/icap php_icap.c /php4/ext/imap php_imap.c /php4/ext/ingres_ii ii.c ii.h /php4/ext/interbase interbase.c /php4/ext/java java.c /php4/ext/ldap ldap.c /php4/ext/mcal php_mcal.c /php4/ext/ming ming.c /php4/ext/mnogosearch php_mnogo.c /php4/ext/msql php_msql.c /php4/ext/mssql php_mssql.c /php4/ext/mysql php_mysql.c /php4/ext/ncurses ncurses.c /php4/ext/oci8 oci8.c /php4/ext/odbc php_odbc.c velocis.c /php4/ext/openssl openssl.c /php4/ext/oracle oracle.c /php4/ext/pdf pdf.c /php4/ext/pgsql pgsql.c /php4/ext/printer printer.c /php4/ext/pspell pspell.c /php4/ext/sablot sablot.c /php4/ext/shmop shmop.c /php4/ext/sockets sockets.c /php4/ext/standard dir.c file.c /php4/ext/sybase php_sybase_db.c /php4/ext/sybase_ct php_sybase_ct.c /php4/ext/sysvsem sysvsem.c /php4/ext/sysvshm sysvshm.c /php4/ext/wddx wddx.c /php4/ext/xml xml.c /php4/ext/xslt sablot.c /php4/ext/zip zip.c /php4/ext/zlib zlib.c /php4/main php_ticks.c Log: More TSRMLS_FETCH annihilation

Index: php4/ext/aspell/aspell.c diff -u php4/ext/aspell/aspell.c:1.28 php4/ext/aspell/aspell.c:1.29 --- php4/ext/aspell/aspell.c:1.28 Wed Jun 6 09:05:41 2001 +++ php4/ext/aspell/aspell.c Tue Jul 31 01:43:47 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: aspell.c,v 1.28 2001/06/06 13:05:41 rasmus Exp $ */ +/* $Id: aspell.c,v 1.29 2001/07/31 05:43:47 zeev Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -60,9 +60,10 @@ /* {{{ php_aspell_close */ -static void php_aspell_close(zend_rsrc_list_entry *rsrc) +static void php_aspell_close(zend_rsrc_list_entry *rsrc TSRMLS_DC) { aspell *sc = (aspell *)rsrc->ptr; + aspell_free(sc); } /* }}} */ Index: php4/ext/bz2/bz2.c diff -u php4/ext/bz2/bz2.c:1.18 php4/ext/bz2/bz2.c:1.19 --- php4/ext/bz2/bz2.c:1.18 Wed Jun 6 09:05:42 2001 +++ php4/ext/bz2/bz2.c Tue Jul 31 01:43:47 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: bz2.c,v 1.18 2001/06/06 13:05:42 rasmus Exp $ */ +/* $Id: bz2.c,v 1.19 2001/07/31 05:43:47 zeev Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -76,7 +76,7 @@ static int le_bz2; -static void php_bz2_close(zend_rsrc_list_entry *); +static void php_bz2_close(zend_rsrc_list_entry *rsrc TSRMLS_DC); static void php_bz2_error(INTERNAL_FUNCTION_PARAMETERS, int); PHP_MINIT_FUNCTION(bz2) @@ -374,9 +374,10 @@ /* {{{ php_bz2_close() Closes a BZip2 file pointer */ -static void php_bz2_close(zend_rsrc_list_entry *rsrc) +static void php_bz2_close(zend_rsrc_list_entry *rsrc TSRMLS_DC) { BZFILE *bz = (BZFILE *) rsrc->ptr; /* The BZip2 File pointer */ + BZ2_bzclose(bz); } /* }}} */ Index: php4/ext/com/COM.c diff -u php4/ext/com/COM.c:1.37 php4/ext/com/COM.c:1.38 --- php4/ext/com/COM.c:1.37 Mon Jul 30 04:24:23 2001 +++ php4/ext/com/COM.c Tue Jul 31 01:43:47 2001 @@ -335,9 +335,10 @@ return clsid_str; } -static void php_comval_destructor(zend_rsrc_list_entry *rsrc) +static void php_comval_destructor(zend_rsrc_list_entry *rsrc TSRMLS_DC) { comval *obj = (comval *)rsrc->ptr; + if(C_ISREFD(obj)) { C_REFCOUNT(obj) = 1; Index: php4/ext/com/VARIANT.c diff -u php4/ext/com/VARIANT.c:1.18 php4/ext/com/VARIANT.c:1.19 --- php4/ext/com/VARIANT.c:1.18 Mon Jul 30 00:57:56 2001 +++ php4/ext/com/VARIANT.c Tue Jul 31 01:43:48 2001 @@ -42,7 +42,7 @@ pval php_VARIANT_get_property_handler(zend_property_reference *property_reference); static int do_VARIANT_propset(VARIANT *var_arg, pval *arg_property, pval *value); void php_register_VARIANT_class(); -static void php_variant_destructor(zend_rsrc_list_entry *rsrc); +static void php_variant_destructor(zend_rsrc_list_entry *rsrc TSRMLS_DC); void php_register_VARIANT_class(); static int le_variant; @@ -423,7 +423,7 @@ return SUCCESS; } -static void php_variant_destructor(zend_rsrc_list_entry *rsrc) +static void php_variant_destructor(zend_rsrc_list_entry *rsrc TSRMLS_DC) { efree(rsrc); } Index: php4/ext/cpdf/cpdf.c diff -u php4/ext/cpdf/cpdf.c:1.29 php4/ext/cpdf/cpdf.c:1.30 --- php4/ext/cpdf/cpdf.c:1.29 Mon Jul 30 02:17:49 2001 +++ php4/ext/cpdf/cpdf.c Tue Jul 31 01:43:48 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: cpdf.c,v 1.29 2001/07/30 06:17:49 zeev Exp $ */ +/* $Id: cpdf.c,v 1.30 2001/07/31 05:43:48 zeev Exp $ */ /* cpdflib.h -- C language API definitions for ClibPDF library * Copyright (C) 1998 FastIO Systems, All Rights Reserved. */ @@ -162,13 +162,14 @@ ZEND_GET_MODULE(cpdf) #endif -static void _free_outline(zend_rsrc_list_entry *rsrc) +static void _free_outline(zend_rsrc_list_entry *rsrc TSRMLS_DC) { } -static void _free_doc(zend_rsrc_list_entry *rsrc) +static void _free_doc(zend_rsrc_list_entry *rsrc TSRMLS_DC) { CPDFdoc *pdf = (CPDFdoc *)rsrc->ptr; + cpdf_close(pdf); } Index: php4/ext/curl/curl.c diff -u php4/ext/curl/curl.c:1.74 php4/ext/curl/curl.c:1.75 --- php4/ext/curl/curl.c:1.74 Mon Jul 30 04:24:24 2001 +++ php4/ext/curl/curl.c Tue Jul 31 01:43:50 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: curl.c,v 1.74 2001/07/30 08:24:24 zeev Exp $ */ +/* $Id: curl.c,v 1.75 2001/07/31 05:43:50 zeev Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -44,7 +44,7 @@ static int le_curl; #define le_curl_name "cURL handle" -static void _php_curl_close(zend_rsrc_list_entry *rsrc); +static void _php_curl_close(zend_rsrc_list_entry *rsrc TSRMLS_DC); #define SAVE_CURL_ERROR(__handle, __err) (__handle)->err.no = (int) __err; @@ -995,7 +995,7 @@ /* {{{ _php_curl_close() List destructor for curl handles */ -static void _php_curl_close(zend_rsrc_list_entry *rsrc) +static void _php_curl_close(zend_rsrc_list_entry *rsrc TSRMLS_DC) { php_curl *ch = (php_curl *) rsrc->ptr; Index: php4/ext/db/db.c diff -u php4/ext/db/db.c:1.56 php4/ext/db/db.c:1.57 --- php4/ext/db/db.c:1.56 Mon Jul 30 04:24:24 2001 +++ php4/ext/db/db.c Tue Jul 31 01:43:51 2001 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: db.c,v 1.56 2001/07/30 08:24:24 zeev Exp $ */ +/* $Id: db.c,v 1.57 2001/07/31 05:43:51 zeev Exp $ */ #define IS_EXT_MODULE #if 1 @@ -440,7 +440,8 @@ /* {{{ php_dbm_close */ -int php_dbm_close(zend_rsrc_list_entry *rsrc) { +int php_dbm_close(zend_rsrc_list_entry *rsrc TSRMLS_DC) +{ int ret = 0; dbm_info *info = (dbm_info *)rsrc->ptr; DBM_TYPE dbf; Index: php4/ext/db/php_db.h diff -u php4/ext/db/php_db.h:1.10 php4/ext/db/php_db.h:1.11 --- php4/ext/db/php_db.h:1.10 Mon Feb 26 01:06:53 2001 +++ php4/ext/db/php_db.h Tue Jul 31 01:43:51 2001 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_db.h,v 1.10 2001/02/26 06:06:53 andi Exp $ */ +/* $Id: php_db.h,v 1.11 2001/07/31 05:43:51 zeev Exp $ */ #ifndef PHP_DB_H @@ -52,7 +52,7 @@ #endif dbm_info *php_find_dbm(pval *id); -int php_dbm_close(zend_rsrc_list_entry *rsrc); +int php_dbm_close(zend_rsrc_list_entry *rsrc TSRMLS_DC); dbm_info *php_dbm_open(char *filename, char *mode); int php_dbm_insert(dbm_info *info, char *key, char *value); char *php_dbm_fetch(dbm_info *info, char *key); Index: php4/ext/dba/dba.c diff -u php4/ext/dba/dba.c:1.34 php4/ext/dba/dba.c:1.35 --- php4/ext/dba/dba.c:1.34 Wed Jun 6 09:05:43 2001 +++ php4/ext/dba/dba.c Tue Jul 31 01:43:51 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: dba.c,v 1.34 2001/06/06 13:05:43 rasmus Exp $ */ +/* $Id: dba.c,v 1.35 2001/07/31 05:43:51 zeev Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -183,9 +183,10 @@ /* {{{ dba_close_rsrc */ -static void dba_close_rsrc(zend_rsrc_list_entry *rsrc) +static void dba_close_rsrc(zend_rsrc_list_entry *rsrc TSRMLS_DC) { dba_info *info = (dba_info *)rsrc->ptr; + dba_close(info); } /* }}} */ Index: php4/ext/dbase/dbase.c diff -u php4/ext/dbase/dbase.c:1.41 php4/ext/dbase/dbase.c:1.42 --- php4/ext/dbase/dbase.c:1.41 Sat Jul 28 07:35:46 2001 +++ php4/ext/dbase/dbase.c Tue Jul 31 01:43:51 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: dbase.c,v 1.41 2001/07/28 11:35:46 zeev Exp $ */ +/* $Id: dbase.c,v 1.42 2001/07/31 05:43:51 zeev Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -61,9 +61,10 @@ #include <errno.h> -static void _close_dbase(zend_rsrc_list_entry *rsrc) +static void _close_dbase(zend_rsrc_list_entry *rsrc TSRMLS_DC) { dbhead_t *dbhead = (dbhead_t *)rsrc->ptr; + close(dbhead->db_fd); free_dbf_head(dbhead); } Index: php4/ext/dbplus/dbplus.c diff -u php4/ext/dbplus/dbplus.c:1.3 php4/ext/dbplus/dbplus.c:1.4 --- php4/ext/dbplus/dbplus.c:1.3 Mon Jul 30 02:17:51 2001 +++ php4/ext/dbplus/dbplus.c Tue Jul 31 01:43:51 2001 @@ -36,12 +36,16 @@ int le_dbplus_relation; int le_dbplus_tupel; -void dbplus_destruct_relation(zend_rsrc_list_entry *rsrc) { +void dbplus_destruct_relation(zend_rsrc_list_entry *rsrc TSRMLS_DC) +{ relf *conn = (relf *)(rsrc->ptr); + cdb_close(conn); } -void dbplus_destruct_tupel(zend_rsrc_list_entry *rsrc) { + +void dbplus_destruct_tupel(zend_rsrc_list_entry *rsrc TSRMLS_DC) +{ tuple *t = (tuple *)(rsrc->ptr); efree(t); Index: php4/ext/dbplus/php_dbplus.h diff -u php4/ext/dbplus/php_dbplus.h:1.2 php4/ext/dbplus/php_dbplus.h:1.3 --- php4/ext/dbplus/php_dbplus.h:1.2 Sat Jul 28 07:35:47 2001 +++ php4/ext/dbplus/php_dbplus.h Tue Jul 31 01:43:52 2001 @@ -114,8 +114,8 @@ int le_dbplus_relation; int le_dbplus_tuple; -void dbplus_destruct_relation(zend_rsrc_list_entry *rsrc); -void dbplus_destruct_tupel(zend_rsrc_list_entry *rsrc); +void dbplus_destruct_relation(zend_rsrc_list_entry *rsrc TSRMLS_DC); +void dbplus_destruct_tupel(zend_rsrc_list_entry *rsrc TSRMLS_DC); #endif /* PHP_DBPLUS_H */ Index: php4/ext/domxml/php_domxml.c diff -u php4/ext/domxml/php_domxml.c:1.44 php4/ext/domxml/php_domxml.c:1.45 --- php4/ext/domxml/php_domxml.c:1.44 Tue Jul 31 00:53:46 2001 +++ php4/ext/domxml/php_domxml.c Tue Jul 31 01:43:52 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_domxml.c,v 1.44 2001/07/31 04:53:46 zeev Exp $ */ +/* $Id: php_domxml.c,v 1.45 2001/07/31 05:43:52 zeev Exp $ */ #ifdef HAVE_CONFIG_H @@ -348,7 +348,7 @@ } } -static void php_free_xml_doc(zend_rsrc_list_entry *rsrc) +static void php_free_xml_doc(zend_rsrc_list_entry *rsrc TSRMLS_DC) { xmlDoc *doc = (xmlDoc *)rsrc->ptr; @@ -360,7 +360,8 @@ } } -static void php_free_xml_node(zend_rsrc_list_entry *rsrc) { +static void php_free_xml_node(zend_rsrc_list_entry *rsrc TSRMLS_DC) +{ xmlNodePtr node = (xmlNodePtr) rsrc->ptr; if (node) { @@ -371,16 +372,17 @@ } #if defined(LIBXML_XPATH_ENABLED) -static void php_free_xpath_context(zend_rsrc_list_entry *rsrc) +static void php_free_xpath_context(zend_rsrc_list_entry *rsrc TSRMLS_DC) { xmlXPathContextPtr ctx = (xmlXPathContextPtr)rsrc->ptr; if(ctx) xmlXPathFreeContext(ctx); } -static void php_free_xpath_object(zend_rsrc_list_entry *rsrc) +static void php_free_xpath_object(zend_rsrc_list_entry *rsrc TSRMLS_DC) { xmlXPathObjectPtr obj = (xmlXPathObjectPtr)rsrc->ptr; + if(obj) xmlXPathFreeObject(obj); } Index: php4/ext/fbsql/php_fbsql.c diff -u php4/ext/fbsql/php_fbsql.c:1.41 php4/ext/fbsql/php_fbsql.c:1.42 --- php4/ext/fbsql/php_fbsql.c:1.41 Mon Jul 30 13:26:55 2001 +++ php4/ext/fbsql/php_fbsql.c Tue Jul 31 01:43:52 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_fbsql.c,v 1.41 2001/07/30 17:26:55 fmk Exp $ */ +/* $Id: php_fbsql.c,v 1.42 2001/07/31 05:43:52 zeev Exp $ */ /* TODO: * @@ -236,14 +236,13 @@ #define CHECK_LINK(link) { if (link==-1) { php_error(E_WARNING,"FrontBase: A link to the server could not be established"); RETURN_FALSE; } } -static void phpfbReleaseResult (zend_rsrc_list_entry *rsrc); -static void phpfbReleaseLink (zend_rsrc_list_entry *rsrc); -static void phpfbReleasePLink (zend_rsrc_list_entry *rsrc); +static void phpfbReleaseResult (zend_rsrc_list_entry *rsrc TSRMLS_DC); +static void phpfbReleaseLink (zend_rsrc_list_entry *rsrc TSRMLS_DC); +static void phpfbReleasePLink (zend_rsrc_list_entry *rsrc TSRMLS_DC); -static void phpfbReleaseResult(zend_rsrc_list_entry *rsrc) +static void phpfbReleaseResult(zend_rsrc_list_entry *rsrc TSRMLS_DC) { PHPFBResult* result = (PHPFBResult *)rsrc->ptr; - TSRMLS_FETCH(); if (result) { @@ -260,10 +259,9 @@ } -static void phpfbReleaseLink(zend_rsrc_list_entry *rsrc) +static void phpfbReleaseLink(zend_rsrc_list_entry *rsrc TSRMLS_DC) { PHPFBLink* link = (PHPFBLink *)rsrc->ptr; - TSRMLS_FETCH(); if (link) { @@ -283,10 +281,9 @@ } } -static void phpfbReleasePLink(zend_rsrc_list_entry *rsrc) +static void phpfbReleasePLink(zend_rsrc_list_entry *rsrc TSRMLS_DC) { PHPFBLink* link = (PHPFBLink *)rsrc->ptr; - TSRMLS_FETCH(); if (link) { Index: php4/ext/fdf/fdf.c diff -u php4/ext/fdf/fdf.c:1.54 php4/ext/fdf/fdf.c:1.55 --- php4/ext/fdf/fdf.c:1.54 Tue Jul 31 00:53:47 2001 +++ php4/ext/fdf/fdf.c Tue Jul 31 01:43:52 2001 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: fdf.c,v 1.54 2001/07/31 04:53:47 zeev Exp $ */ +/* $Id: fdf.c,v 1.55 2001/07/31 05:43:52 zeev Exp $ */ /* FdfTk lib 2.0 is a Complete C/C++ FDF Toolkit available from http://beta1.adobe.com/ada/acrosdk/forms.html. */ @@ -83,9 +83,10 @@ #endif -static void phpi_FDFClose(zend_rsrc_list_entry *rsrc) +static void phpi_FDFClose(zend_rsrc_list_entry *rsrc TSRMLS_DC) { FDFDoc fdf = (FDFDoc)rsrc->ptr; + (void) FDFClose(fdf); } Index: php4/ext/ftp/php_ftp.c diff -u php4/ext/ftp/php_ftp.c:1.37 php4/ext/ftp/php_ftp.c:1.38 --- php4/ext/ftp/php_ftp.c:1.37 Mon Jul 30 02:17:52 2001 +++ php4/ext/ftp/php_ftp.c Tue Jul 31 01:43:53 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_ftp.c,v 1.37 2001/07/30 06:17:52 zeev Exp $ */ +/* $Id: php_ftp.c,v 1.38 2001/07/31 05:43:53 zeev Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -76,9 +76,10 @@ ZEND_GET_MODULE(php_ftp) #endif -static void ftp_destructor_ftpbuf(zend_rsrc_list_entry *rsrc) +static void ftp_destructor_ftpbuf(zend_rsrc_list_entry *rsrc TSRMLS_DC) { ftpbuf_t *ftp = (ftpbuf_t *)rsrc->ptr; + ftp_close(ftp); } Index: php4/ext/gd/gd.c diff -u php4/ext/gd/gd.c:1.145 php4/ext/gd/gd.c:1.146 --- php4/ext/gd/gd.c:1.145 Mon Jul 30 16:27:11 2001 +++ php4/ext/gd/gd.c Tue Jul 31 01:43:53 2001 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: gd.c,v 1.145 2001/07/30 20:27:11 sniper Exp $ */ +/* $Id: gd.c,v 1.146 2001/07/31 05:43:53 zeev Exp $ */ /* gd 1.2 is copyright 1994, 1995, Quest Protein Database Center, Cold Spring Harbor Labs. */ @@ -211,7 +211,7 @@ /* {{{ php_free_gd_image */ -static void php_free_gd_image(zend_rsrc_list_entry *rsrc) +static void php_free_gd_image(zend_rsrc_list_entry *rsrc TSRMLS_DC) { gdImageDestroy((gdImagePtr)rsrc->ptr); } @@ -219,9 +219,10 @@ /* {{{ php_free_gd_font */ -static void php_free_gd_font(zend_rsrc_list_entry *rsrc) +static void php_free_gd_font(zend_rsrc_list_entry *rsrc TSRMLS_DC) { gdFontPtr fp = (gdFontPtr)rsrc->ptr; + if (fp->data) { efree(fp->data); } @@ -2756,9 +2757,10 @@ /* {{{ php_free_ps_font */ -void php_free_ps_font(zend_rsrc_list_entry *rsrc) +void php_free_ps_font(zend_rsrc_list_entry *rsrc TSRMLS_DC) { int *font = (int *)rsrc->ptr; + T1_DeleteFont(*font); efree(font); } @@ -2766,9 +2768,10 @@ /* {{{ php_free_ps_enc */ -void php_free_ps_enc(zend_rsrc_list_entry *rsrc) +void php_free_ps_enc(zend_rsrc_list_entry *rsrc TSRMLS_DC) { char **enc = (char **)rsrc->ptr; + T1_DeleteEncoding(enc); } /* }}} */ Index: php4/ext/gd/gdt1.h diff -u php4/ext/gd/gdt1.h:1.8 php4/ext/gd/gdt1.h:1.9 --- php4/ext/gd/gdt1.h:1.8 Mon Feb 26 01:06:56 2001 +++ php4/ext/gd/gdt1.h Tue Jul 31 01:43:54 2001 @@ -17,14 +17,14 @@ +----------------------------------------------------------------------+ */ -/* $Id: gdt1.h,v 1.8 2001/02/26 06:06:56 andi Exp $ */ +/* $Id: gdt1.h,v 1.9 2001/07/31 05:43:54 zeev Exp $ */ #if HAVE_LIBT1 #include <t1lib.h> -extern void php_free_ps_font(zend_rsrc_list_entry *rsrc); -extern void php_free_ps_enc(zend_rsrc_list_entry *rsrc); +extern void php_free_ps_font(zend_rsrc_list_entry *rsrc TSRMLS_DC); +extern void php_free_ps_enc(zend_rsrc_list_entry *rsrc TSRMLS_DC); #endif Index: php4/ext/gmp/gmp.c diff -u php4/ext/gmp/gmp.c:1.14 php4/ext/gmp/gmp.c:1.15 --- php4/ext/gmp/gmp.c:1.14 Mon Jul 30 02:17:52 2001 +++ php4/ext/gmp/gmp.c Tue Jul 31 01:43:54 2001 @@ -101,7 +101,7 @@ ZEND_GET_MODULE(gmp) #endif -static void _php_gmpnum_free(zend_rsrc_list_entry *rsrc); +static void _php_gmpnum_free(zend_rsrc_list_entry *rsrc TSRMLS_DC); #define GMP_RESOURCE_NAME "GMP integer" @@ -1195,9 +1195,10 @@ /* {{{ _php_gmpnum_free */ -static void _php_gmpnum_free(zend_rsrc_list_entry *rsrc) +static void _php_gmpnum_free(zend_rsrc_list_entry *rsrc TSRMLS_DC) { mpz_t *gmpnum = (mpz_t *)rsrc->ptr; + FREE_GMP_NUM(gmpnum); } /* }}} */ Index: php4/ext/hyperwave/hw.c diff -u php4/ext/hyperwave/hw.c:1.87 php4/ext/hyperwave/hw.c:1.88 --- php4/ext/hyperwave/hw.c:1.87 Mon Jul 30 02:17:53 2001 +++ php4/ext/hyperwave/hw.c Tue Jul 31 01:43:54 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: hw.c,v 1.87 2001/07/30 06:17:53 zeev Exp $ */ +/* $Id: hw.c,v 1.88 2001/07/31 05:43:54 zeev Exp $ */ #include <stdlib.h> #include <errno.h> @@ -148,10 +148,9 @@ void print_msg(hg_msg *msg, char *str, int txt); -void _close_hw_link(zend_rsrc_list_entry *rsrc) +void _close_hw_link(zend_rsrc_list_entry *rsrc TSRMLS_DC) { hw_connection *conn = (hw_connection *)rsrc->ptr; - TSRMLS_FETCH(); if(conn->hostname) free(conn->hostname); @@ -162,10 +161,9 @@ HwSG(num_links)--; } -void _close_hw_plink(zend_rsrc_list_entry *rsrc) +void _close_hw_plink(zend_rsrc_list_entry *rsrc TSRMLS_DC) { hw_connection *conn = (hw_connection *)rsrc->ptr; - TSRMLS_FETCH(); if(conn->hostname) free(conn->hostname); @@ -177,7 +175,7 @@ HwSG(num_persistent)--; } -void _free_hw_document(zend_rsrc_list_entry *rsrc) +void _free_hw_document(zend_rsrc_list_entry *rsrc TSRMLS_DC) { hw_document *doc = (hw_document *)rsrc->ptr; if(doc->data) Index: php4/ext/icap/php_icap.c diff -u php4/ext/icap/php_icap.c:1.25 php4/ext/icap/php_icap.c:1.26 --- php4/ext/icap/php_icap.c:1.25 Sun Jul 29 21:56:26 2001 +++ php4/ext/icap/php_icap.c Tue Jul 31 01:43:55 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_icap.c,v 1.25 2001/07/30 01:56:26 zeev Exp $ */ +/* $Id: php_icap.c,v 1.26 2001/07/31 05:43:55 zeev Exp $ */ #define ICAP1 @@ -110,10 +110,11 @@ char icap_user[80]=""; char icap_password[80]=""; -CALSTREAM *cal_close_it (zend_rsrc_list_entry *rsrc) +CALSTREAM *cal_close_it (zend_rsrc_list_entry *rsrc TSRMLS_DC) { pils *icap_le_struct = (pils *)rsrc->ptr; CALSTREAM *ret; + ret = cal_close (icap_le_struct->icap_stream,0); efree(icap_le_struct); return ret; Index: php4/ext/imap/php_imap.c diff -u php4/ext/imap/php_imap.c:1.89 php4/ext/imap/php_imap.c:1.90 --- php4/ext/imap/php_imap.c:1.89 Mon Jul 30 04:24:27 2001 +++ php4/ext/imap/php_imap.c Tue Jul 31 01:43:55 2001 @@ -25,7 +25,7 @@ | PHP 4.0 updates: Zeev Suraski <zeev@zend.com> | +----------------------------------------------------------------------+ */ -/* $Id: php_imap.c,v 1.89 2001/07/30 08:24:27 zeev Exp $ */ +/* $Id: php_imap.c,v 1.90 2001/07/31 05:43:55 zeev Exp $ */ #define IMAP41 @@ -75,11 +75,11 @@ int imap_mail(char *to, char *subject, char *message, char *headers, char *cc, char *bcc, char *rpath); -void mail_close_it (zend_rsrc_list_entry *rsrc); +void mail_close_it(zend_rsrc_list_entry *rsrc TSRMLS_DC); #ifdef OP_RELOGIN /* AJS: close persistent connection */ -void mail_userlogout_it(zend_rsrc_list_entry *rsrc); -void mail_nuke_chain(zend_rsrc_list_entry *rsrc); +void mail_userlogout_it(zend_rsrc_list_entry *rsrc TSRMLS_DC); +void mail_nuke_chain(zend_rsrc_list_entry *rsrc TSRMLS_DC); #endif /* {{{ imap_functions[] @@ -186,10 +186,9 @@ #endif -void mail_close_it(zend_rsrc_list_entry *rsrc) +void mail_close_it(zend_rsrc_list_entry *rsrc TSRMLS_DC) { pils *imap_le_struct = (pils *)rsrc->ptr; - TSRMLS_FETCH(); mail_close_full(imap_le_struct->imap_stream, imap_le_struct->flags); @@ -207,9 +206,10 @@ #ifdef OP_RELOGIN /* AJS: stream close functions for persistent connections */ -void mail_userlogout_it(zend_rsrc_list_entry *rsrc) +void mail_userlogout_it(zend_rsrc_list_entry *rsrc TSRMLS_DC) { pils *imap_le_struct = (pils *)rsrc->ptr; + /* Close this user's session, putting the stream back * into AUTHENTICATE state. (Note that IMAP does not * support this behavior... yet) @@ -218,7 +218,7 @@ mail_close_full(imap_le_struct->imap_stream, imap_le_struct->flags | CL_HALF); } -void mail_nuke_chain(zend_rsrc_list_entry *rsrc) +void mail_nuke_chain(zend_rsrc_list_entry *rsrc TSRMLS_DC) { pils **headp = (pils **)rsrc->ptr; pils *node, *next; Index: php4/ext/ingres_ii/ii.c diff -u php4/ext/ingres_ii/ii.c:1.22 php4/ext/ingres_ii/ii.c:1.23 --- php4/ext/ingres_ii/ii.c:1.22 Mon Jul 30 17:02:25 2001 +++ php4/ext/ingres_ii/ii.c Tue Jul 31 01:43:56 2001 @@ -19,7 +19,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: ii.c,v 1.22 2001/07/30 21:02:25 sniper Exp $ */ +/* $Id: ii.c,v 1.23 2001/07/31 05:43:56 zeev Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -167,19 +167,19 @@ and releasing associated resources after rolling back the active transaction (if any) */ -static void php_close_ii_link(zend_rsrc_list_entry *rsrc) +static void php_close_ii_link(zend_rsrc_list_entry *rsrc TSRMLS_DC) { II_LINK *link = (II_LINK *)rsrc->ptr; + _close_ii_link(link); } /* closes the given persistent link, see _close_ii_link */ -static void _close_ii_plink(zend_rsrc_list_entry *rsrc) +static void _close_ii_plink(zend_rsrc_list_entry *rsrc TSRMLS_DC) { II_LINK *link = (II_LINK *)rsrc->ptr; - TSRMLS_FETCH(); _close_ii_link(link); IIG(num_persistent)--; @@ -189,7 +189,7 @@ used when the request ends to 'refresh' the link for use by the next request */ -static void _clean_ii_plink(zend_rsrc_list_entry *rsrc) +static void _clean_ii_plink(zend_rsrc_list_entry *rsrc TSRMLS_DC) { II_LINK *link = (II_LINK *)rsrc->ptr; IIAPI_AUTOPARM autoParm; Index: php4/ext/ingres_ii/ii.h diff -u php4/ext/ingres_ii/ii.h:1.8 php4/ext/ingres_ii/ii.h:1.9 --- php4/ext/ingres_ii/ii.h:1.8 Mon Jul 30 17:02:26 2001 +++ php4/ext/ingres_ii/ii.h Tue Jul 31 01:43:56 2001 @@ -19,7 +19,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: ii.h,v 1.8 2001/07/30 21:02:26 sniper Exp $ */ +/* $Id: ii.h,v 1.9 2001/07/31 05:43:56 zeev Exp $ */ #ifndef II_H #define II_H @@ -45,7 +45,7 @@ static int _close_statement(II_LINK *link); static int _rollback_transaction(II_LINK *link); static void _close_ii_link(II_LINK *link); -static void _close_ii_plink(zend_rsrc_list_entry *link); +static void _close_ii_plink(zend_rsrc_list_entry *link TSRMLS_DC); static int php_ii_get_default_link(INTERNAL_FUNCTION_PARAMETERS); static void php_ii_set_default_link(int id); static void php_ii_do_connect(INTERNAL_FUNCTION_PARAMETERS, int persistent); Index: php4/ext/interbase/interbase.c diff -u php4/ext/interbase/interbase.c:1.62 php4/ext/interbase/interbase.c:1.63 --- php4/ext/interbase/interbase.c:1.62 Mon Jul 30 02:17:55 2001 +++ php4/ext/interbase/interbase.c Tue Jul 31 01:43:56 2001 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: interbase.c,v 1.62 2001/07/30 06:17:55 zeev Exp $ */ +/* $Id: interbase.c,v 1.63 2001/07/31 05:43:56 zeev Exp $ */ /* TODO: Arrays, roles? @@ -328,17 +328,17 @@ } /* }}} */ -static void php_ibase_commit_link_rsrc(zend_rsrc_list_entry *rsrc) +static void php_ibase_commit_link_rsrc(zend_rsrc_list_entry *rsrc TSRMLS_DC) { ibase_db_link *link = (ibase_db_link *)rsrc->ptr; + _php_ibase_commit_link(link); } /* {{{ _php_ibase_close_link() */ -static void _php_ibase_close_link(zend_rsrc_list_entry *rsrc) +static void _php_ibase_close_link(zend_rsrc_list_entry *rsrc TSRMLS_DC) { ibase_db_link *link = (ibase_db_link *)rsrc->ptr; - TSRMLS_FETCH(); _php_ibase_commit_link(link); IBDEBUG("Closing normal link..."); @@ -349,10 +349,9 @@ /* }}} */ /* {{{ _php_ibase_close_plink() */ -static void _php_ibase_close_plink(zend_rsrc_list_entry *rsrc) +static void _php_ibase_close_plink(zend_rsrc_list_entry *rsrc TSRMLS_DC) { ibase_db_link *link = (ibase_db_link *)rsrc->ptr; - TSRMLS_FETCH(); _php_ibase_commit_link(link); IBDEBUG("Closing permanent link..."); @@ -364,10 +363,9 @@ /* }}} */ /* {{{ _php_ibase_free_result() */ -static void _php_ibase_free_result(zend_rsrc_list_entry *rsrc) +static void _php_ibase_free_result(zend_rsrc_list_entry *rsrc TSRMLS_DC) { ibase_result *ib_result = (ibase_result *)rsrc->ptr; - TSRMLS_FETCH(); IBDEBUG("Freeing result..."); if (ib_result){ @@ -427,17 +425,17 @@ } /* }}} */ -static void php_ibase_free_query_rsrc(zend_rsrc_list_entry *rsrc) +static void php_ibase_free_query_rsrc(zend_rsrc_list_entry *rsrc TSRMLS_DC) { ibase_query *query = (ibase_query *)rsrc->ptr; + _php_ibase_free_query(query); } /* {{{ _php_ibase_free_blob() */ -static void _php_ibase_free_blob(zend_rsrc_list_entry *rsrc) +static void _php_ibase_free_blob(zend_rsrc_list_entry *rsrc TSRMLS_DC) { ibase_blob_handle *ib_blob = (ibase_blob_handle *)rsrc->ptr; - TSRMLS_FETCH(); if (ib_blob->bl_handle != NULL) { /* blob open*/ if (isc_cancel_blob(IB_STATUS, &ib_blob->bl_handle)) { @@ -449,11 +447,10 @@ /* }}} */ /* {{{ _php_ibase_free_trans() */ -static void _php_ibase_free_trans(zend_rsrc_list_entry *rsrc) +static void _php_ibase_free_trans(zend_rsrc_list_entry *rsrc TSRMLS_DC) { ibase_tr_link *ib_trans = (ibase_tr_link *)rsrc->ptr; ibase_db_link *ib_link; - TSRMLS_FETCH(); ib_link = (ibase_db_link *) zend_fetch_resource(NULL TSRMLS_CC, ib_trans->link_rsrc, "InterBase link", NULL, 2, le_link, le_plink); @@ -581,7 +578,7 @@ php_info_print_table_start(); php_info_print_table_row(2, "Interbase Support", "enabled"); - php_info_print_table_row(2, "Revision", "$Revision: 1.62 $"); + php_info_print_table_row(2, "Revision", "$Revision: 1.63 $"); #ifdef COMPILE_DL_INTERBASE php_info_print_table_row(2, "Dynamic Module", "yes"); #endif Index: php4/ext/java/java.c diff -u php4/ext/java/java.c:1.51 php4/ext/java/java.c:1.52 --- php4/ext/java/java.c:1.51 Mon Jul 30 02:17:56 2001 +++ php4/ext/java/java.c Tue Jul 31 01:43:56 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: java.c,v 1.51 2001/07/30 06:17:56 zeev Exp $ */ +/* $Id: java.c,v 1.52 2001/07/31 05:43:56 zeev Exp $ */ /* * This module implements Zend OO syntax overloading support for Java @@ -592,15 +592,17 @@ /***************************************************************************/ -static void _php_java_destructor(zend_rsrc_list_entry *rsrc) +static void _php_java_destructor(zend_rsrc_list_entry *rsrc TSRMLS_DC) { void *jobject = (void *)rsrc->ptr; - JG_FETCH(); - if (JG(jenv)) (*JG(jenv))->DeleteGlobalRef(JG(jenv), jobject); + + JG_FETCH(); + if (JG(jenv)) (*JG(jenv))->DeleteGlobalRef(JG(jenv), jobject); } #ifdef ZTS -static void alloc_java_globals_ctor(php_java_globals *java_globals TSRMLS_DC) { +static void alloc_java_globals_ctor(php_java_globals *java_globals TSRMLS_DC) +{ memset(java_globals, 0, sizeof(php_java_globals)); } #endif Index: php4/ext/ldap/ldap.c diff -u php4/ext/ldap/ldap.c:1.91 php4/ext/ldap/ldap.c:1.92 --- php4/ext/ldap/ldap.c:1.91 Sat Jul 28 07:35:57 2001 +++ php4/ext/ldap/ldap.c Tue Jul 31 01:43:57 2001 @@ -22,7 +22,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: ldap.c,v 1.91 2001/07/28 11:35:57 zeev Exp $ */ +/* $Id: ldap.c,v 1.92 2001/07/31 05:43:57 zeev Exp $ */ #define IS_EXT_MODULE #ifdef HAVE_CONFIG_H @@ -136,17 +136,16 @@ #endif -static void _close_ldap_link(zend_rsrc_list_entry *rsrc) +static void _close_ldap_link(zend_rsrc_list_entry *rsrc TSRMLS_DC) { LDAP *ld = (LDAP *)rsrc->ptr; - TSRMLS_FETCH(); ldap_unbind_s(ld); LDAPG(num_links)--; } -static void _free_ldap_result(zend_rsrc_list_entry *rsrc) +static void _free_ldap_result(zend_rsrc_list_entry *rsrc TSRMLS_DC) { LDAPMessage *result = (LDAPMessage *)rsrc->ptr; ldap_msgfree(result); @@ -252,7 +251,7 @@ php_info_print_table_start(); php_info_print_table_row(2, "LDAP Support", "enabled" ); - php_info_print_table_row(2, "RCS Version", "$Id: ldap.c,v 1.91 2001/07/28 11:35:57 zeev Exp $" ); + php_info_print_table_row(2, "RCS Version", "$Id: ldap.c,v 1.92 2001/07/31 05:43:57 zeev Exp $" ); php_info_print_table_row(2, "Total Links", maxl ); #ifdef LDAP_API_VERSION Index: php4/ext/mcal/php_mcal.c diff -u php4/ext/mcal/php_mcal.c:1.43 php4/ext/mcal/php_mcal.c:1.44 --- php4/ext/mcal/php_mcal.c:1.43 Mon Jul 30 02:17:56 2001 +++ php4/ext/mcal/php_mcal.c Tue Jul 31 01:43:57 2001 @@ -45,7 +45,7 @@ #include "winsock.h" #endif -void cal_close_it(zend_rsrc_list_entry *rsrc); +void cal_close_it(zend_rsrc_list_entry *rsrc TSRMLS_DC); typedef struct _php_mcal_le_struct { CALSTREAM *mcal_stream; @@ -127,10 +127,11 @@ char *mcal_user; char *mcal_password; -void cal_close_it (zend_rsrc_list_entry *rsrc) +void cal_close_it (zend_rsrc_list_entry *rsrc TSRMLS_DC) { pils *mcal_le_struct = (pils *)rsrc->ptr; - cal_close (mcal_le_struct->mcal_stream,0); + + cal_close(mcal_le_struct->mcal_stream,0); efree(mcal_le_struct); } Index: php4/ext/ming/ming.c diff -u php4/ext/ming/ming.c:1.10 php4/ext/ming/ming.c:1.11 --- php4/ext/ming/ming.c:1.10 Sun Jul 29 21:56:29 2001 +++ php4/ext/ming/ming.c Tue Jul 31 01:43:57 2001 @@ -305,7 +305,7 @@ add_property_resource(getThis(), "bitmap", ret); zend_list_addref(ret); } -static void destroy_SWFBitmap_resource(zend_rsrc_list_entry *resource) +static void destroy_SWFBitmap_resource(zend_rsrc_list_entry *resource TSRMLS_DC) { destroySWFBitmap((SWFBitmap)resource->ptr); } @@ -377,7 +377,7 @@ add_property_resource(getThis(), "button", ret); zend_list_addref(ret); } -static void destroy_SWFButton_resource(zend_rsrc_list_entry *resource) +static void destroy_SWFButton_resource(zend_rsrc_list_entry *resource TSRMLS_DC) { destroySWFButton((SWFButton)resource->ptr); } @@ -943,7 +943,7 @@ { php_error(E_ERROR, "Instantiating SWFFill won't do any good- use SWFShape::addFill() instead!"); } -static void destroy_SWFFill_resource(zend_rsrc_list_entry *resource) +static void destroy_SWFFill_resource(zend_rsrc_list_entry *resource TSRMLS_DC) { /* this only destroys the shallow wrapper for SWFFillStyle, which SWFShape destroys. So everything's okay. I hope. */ @@ -1126,7 +1126,7 @@ add_property_resource(getThis(), "font", ret); zend_list_addref(ret); } -static void destroy_SWFFont_resource(zend_rsrc_list_entry *resource) +static void destroy_SWFFont_resource(zend_rsrc_list_entry *resource TSRMLS_DC) { destroySWFBlock((SWFBlock)resource->ptr); } @@ -1209,7 +1209,9 @@ add_property_resource(getThis(), "gradient", ret); zend_list_addref(ret); } -static void destroy_SWFGradient_resource(zend_rsrc_list_entry *resource) + + +static void destroy_SWFGradient_resource(zend_rsrc_list_entry *resource TSRMLS_DC) { destroySWFGradient((SWFGradient)resource->ptr); } @@ -1288,7 +1290,9 @@ add_property_resource(getThis(), "morph", ret); zend_list_addref(ret); } -static void destroy_SWFMorph_resource(zend_rsrc_list_entry *resource) + + +static void destroy_SWFMorph_resource(zend_rsrc_list_entry *resource TSRMLS_DC) { destroySWFMorph((SWFMorph)resource->ptr); } @@ -1385,7 +1389,9 @@ add_property_resource(getThis(), "movie", ret); zend_list_addref(ret); } -static void destroy_SWFMovie_resource(zend_rsrc_list_entry *resource) + + +static void destroy_SWFMovie_resource(zend_rsrc_list_entry *resource TSRMLS_DC) { destroySWFMovie((SWFMovie)resource->ptr); } @@ -1691,7 +1697,9 @@ add_property_resource(getThis(), "shape", ret); zend_list_addref(ret); } -static void destroy_SWFShape_resource(zend_rsrc_list_entry *resource) + + +static void destroy_SWFShape_resource(zend_rsrc_list_entry *resource TSRMLS_DC) { destroySWFShape((SWFShape)resource->ptr); } @@ -2268,7 +2276,9 @@ add_property_resource(getThis(), "sprite", ret); zend_list_addref(ret); } -static void destroy_SWFSprite_resource(zend_rsrc_list_entry *resource) + + +static void destroy_SWFSprite_resource(zend_rsrc_list_entry *resource TSRMLS_DC) { destroySWFMovieClip((SWFMovieClip)resource->ptr); } @@ -2412,7 +2422,9 @@ add_property_resource(getThis(), "text", ret); zend_list_addref(ret); } -static void destroy_SWFText_resource(zend_rsrc_list_entry *resource) + + +static void destroy_SWFText_resource(zend_rsrc_list_entry *resource TSRMLS_DC) { destroySWFText((SWFText)resource->ptr); } @@ -2658,7 +2670,9 @@ SWFTextField_setFlags(field, Z_LVAL_PP(flags)); } } -static void destroy_SWFTextField_resource(zend_rsrc_list_entry *resource) + + +static void destroy_SWFTextField_resource(zend_rsrc_list_entry *resource TSRMLS_DC) { destroySWFTextField((SWFTextField)resource->ptr); } Index: php4/ext/mnogosearch/php_mnogo.c diff -u php4/ext/mnogosearch/php_mnogo.c:1.30 php4/ext/mnogosearch/php_mnogo.c:1.31 --- php4/ext/mnogosearch/php_mnogo.c:1.30 Mon Jun 25 07:36:40 2001 +++ php4/ext/mnogosearch/php_mnogo.c Tue Jul 31 01:43:58 2001 @@ -1,5 +1,5 @@ /* $Source: /usr/repository/php4/ext/mnogosearch/php_mnogo.c,v $ */ -/* $Id: php_mnogo.c,v 1.30 2001/06/25 11:36:40 gluke Exp $ */ +/* $Id: php_mnogo.c,v 1.31 2001/07/31 05:43:58 zeev Exp $ */ /* +----------------------------------------------------------------------+ @@ -160,13 +160,15 @@ ZEND_GET_MODULE(mnogosearch) #endif -static void _free_udm_agent(zend_rsrc_list_entry *rsrc){ +static void _free_udm_agent(zend_rsrc_list_entry *rsrc TSRMLS_DC) +{ UDM_AGENT * Agent = (UDM_AGENT *)rsrc->ptr; UdmFreeEnv(Agent->Conf); UdmFreeAgent(Agent); } -static void _free_udm_res(zend_rsrc_list_entry *rsrc){ +static void _free_udm_res(zend_rsrc_list_entry *rsrc TSRMLS_DC) +{ UDM_RESULT * Res = (UDM_RESULT *)rsrc->ptr; UdmFreeResult(Res); } Index: php4/ext/msql/php_msql.c diff -u php4/ext/msql/php_msql.c:1.37 php4/ext/msql/php_msql.c:1.38 --- php4/ext/msql/php_msql.c:1.37 Sat Jul 28 07:35:59 2001 +++ php4/ext/msql/php_msql.c Tue Jul 31 01:43:58 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_msql.c,v 1.37 2001/07/28 11:35:59 zeev Exp $ */ +/* $Id: php_msql.c,v 1.38 2001/07/31 05:43:58 zeev Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -121,7 +121,7 @@ ZEND_FETCH_RESOURCE(msql_query, m_query *, &res, -1, "mSQL result", msql_globals.le_query); \ msql_result = msql_query->result -static void _delete_query(zend_rsrc_list_entry *rsrc) +static void _delete_query(zend_rsrc_list_entry *rsrc TSRMLS_DC) { m_query *query = (m_query *)rsrc->ptr; @@ -139,17 +139,19 @@ return query; } -static void _close_msql_link(zend_rsrc_list_entry *rsrc) +static void _close_msql_link(zend_rsrc_list_entry *rsrc TSRMLS_DC) { int link = (int)rsrc->ptr; + msqlClose(link); msql_globals.num_links--; } -static void _close_msql_plink(zend_rsrc_list_entry *rsrc) +static void _close_msql_plink(zend_rsrc_list_entry *rsrc TSRMLS_DC) { int link = (int)rsrc->ptr; + msqlClose(link); msql_globals.num_persistent--; msql_globals.num_links--; Index: php4/ext/mssql/php_mssql.c diff -u php4/ext/mssql/php_mssql.c:1.63 php4/ext/mssql/php_mssql.c:1.64 --- php4/ext/mssql/php_mssql.c:1.63 Tue Jul 31 00:53:47 2001 +++ php4/ext/mssql/php_mssql.c Tue Jul 31 01:43:59 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_mssql.c,v 1.63 2001/07/31 04:53:47 zeev Exp $ */ +/* $Id: php_mssql.c,v 1.64 2001/07/31 05:43:59 zeev Exp $ */ #ifdef COMPILE_DL_MSSQL #define HAVE_MSSQL 1 @@ -206,9 +206,10 @@ efree(statement); } -static void _free_mssql_result(zend_rsrc_list_entry *rsrc) +static void _free_mssql_result(zend_rsrc_list_entry *rsrc TSRMLS_DC) { mssql_result *result = (mssql_result *)rsrc->ptr; + _free_result(result, 1); efree(result); } @@ -222,10 +223,9 @@ zend_list_addref(id); } -static void _close_mssql_link(zend_rsrc_list_entry *rsrc) +static void _close_mssql_link(zend_rsrc_list_entry *rsrc TSRMLS_DC) { mssql_link *mssql_ptr = (mssql_link *)rsrc->ptr; - TSRMLS_FETCH(); mssql_ptr->valid = 0; zend_hash_apply(&EG(regular_list),(apply_func_t) _clean_invalid_results TSRMLS_CC); @@ -236,10 +236,9 @@ } -static void _close_mssql_plink(zend_rsrc_list_entry *rsrc) +static void _close_mssql_plink(zend_rsrc_list_entry *rsrc TSRMLS_DC) { mssql_link *mssql_ptr = (mssql_link *)rsrc->ptr; - TSRMLS_FETCH(); dbclose(mssql_ptr->link); dbfreelogin(mssql_ptr->login); Index: php4/ext/mysql/php_mysql.c diff -u php4/ext/mysql/php_mysql.c:1.93 php4/ext/mysql/php_mysql.c:1.94 --- php4/ext/mysql/php_mysql.c:1.93 Mon Jul 30 04:24:30 2001 +++ php4/ext/mysql/php_mysql.c Tue Jul 31 01:43:59 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_mysql.c,v 1.93 2001/07/30 08:24:30 zeev Exp $ */ +/* $Id: php_mysql.c,v 1.94 2001/07/31 05:43:59 zeev Exp $ */ /* TODO: @@ -201,7 +201,7 @@ * This wrapper is required since mysql_free_result() returns an integer, and * thus, cannot be used directly */ -static void _free_mysql_result(zend_rsrc_list_entry *rsrc) +static void _free_mysql_result(zend_rsrc_list_entry *rsrc TSRMLS_DC) { MYSQL_RES *mysql_result = (MYSQL_RES *)rsrc->ptr; @@ -223,11 +223,10 @@ /* {{{ _close_mysql_link */ -static void _close_mysql_link(zend_rsrc_list_entry *rsrc) +static void _close_mysql_link(zend_rsrc_list_entry *rsrc TSRMLS_DC) { php_mysql_conn *link = (php_mysql_conn *)rsrc->ptr; void (*handler) (int); - TSRMLS_FETCH(); handler = signal(SIGPIPE, SIG_IGN); mysql_close(&link->conn); @@ -239,11 +238,10 @@ /* {{{ _close_mysql_plink */ -static void _close_mysql_plink(zend_rsrc_list_entry *rsrc) +static void _close_mysql_plink(zend_rsrc_list_entry *rsrc TSRMLS_DC) { php_mysql_conn *link = (php_mysql_conn *)rsrc->ptr; void (*handler) (int); - TSRMLS_FETCH(); handler = signal(SIGPIPE, SIG_IGN); mysql_close(&link->conn); Index: php4/ext/ncurses/ncurses.c diff -u php4/ext/ncurses/ncurses.c:1.4 php4/ext/ncurses/ncurses.c:1.5 --- php4/ext/ncurses/ncurses.c:1.4 Mon Jul 30 13:35:45 2001 +++ php4/ext/ncurses/ncurses.c Tue Jul 31 01:44:00 2001 @@ -34,7 +34,8 @@ int le_ncurses; -static void ncurses_destruct(zend_rsrc_list_entry *rsrc) { +static void ncurses_destruct(zend_rsrc_list_entry *rsrc TSRMLS_DC) +{ WINDOW **pwin = (WINDOW **)rsrc->ptr; delwin(*pwin); Index: php4/ext/oci8/oci8.c diff -u php4/ext/oci8/oci8.c:1.142 php4/ext/oci8/oci8.c:1.143 --- php4/ext/oci8/oci8.c:1.142 Tue Jul 31 00:53:48 2001 +++ php4/ext/oci8/oci8.c Tue Jul 31 01:44:01 2001 @@ -20,7 +20,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: oci8.c,v 1.142 2001/07/31 04:53:48 zeev Exp $ */ +/* $Id: oci8.c,v 1.143 2001/07/31 05:44:01 zeev Exp $ */ /* TODO list: * @@ -131,14 +131,14 @@ static void oci_debug(const char *format, ...); static void _oci_conn_list_dtor(oci_connection *connection); -static void _oci_stmt_list_dtor(zend_rsrc_list_entry *rsrc); -static void _oci_descriptor_list_dtor(zend_rsrc_list_entry *rsrc); +static void _oci_stmt_list_dtor(zend_rsrc_list_entry *rsrc TSRMLS_DC); +static void _oci_descriptor_list_dtor(zend_rsrc_list_entry *rsrc TSRMLS_DC); #ifdef WITH_COLLECTIONS -static void _oci_coll_list_dtor(zend_rsrc_list_entry *rsrc); +static void _oci_coll_list_dtor(zend_rsrc_list_entry *rsrc TSRMLS_DC); #endif -static void _oci_server_list_dtor(zend_rsrc_list_entry *rsrc); -static void _oci_session_list_dtor(zend_rsrc_list_entry *rsrc); -static void php_oci_free_conn_list(zend_rsrc_list_entry *rsrc); +static void _oci_server_list_dtor(zend_rsrc_list_entry *rsrc TSRMLS_DC); +static void _oci_session_list_dtor(zend_rsrc_list_entry *rsrc TSRMLS_DC); +static void php_oci_free_conn_list(zend_rsrc_list_entry *rsrc TSRMLS_DC); static void _oci_column_hash_dtor(void *data); static void _oci_define_hash_dtor(void *data); @@ -577,7 +577,7 @@ php_info_print_table_start(); php_info_print_table_row(2, "OCI8 Support", "enabled"); - php_info_print_table_row(2, "Revision", "$Revision: 1.142 $"); + php_info_print_table_row(2, "Revision", "$Revision: 1.143 $"); #ifndef PHP_WIN32 php_info_print_table_row(2, "Oracle Version", PHP_OCI8_VERSION ); php_info_print_table_row(2, "Compile-time ORACLE_HOME", PHP_OCI8_DIR ); @@ -687,7 +687,7 @@ /* {{{ _oci_stmt_list_dtor() */ static void -_oci_stmt_list_dtor(zend_rsrc_list_entry *rsrc) +_oci_stmt_list_dtor(zend_rsrc_list_entry *rsrc TSRMLS_DC) { oci_statement *statement = (oci_statement *)rsrc->ptr; oci_debug("START _oci_stmt_list_dtor: id=%d last_query=\"%s\"",statement->id,SAFE_STRING(statement->last_query)); @@ -772,7 +772,7 @@ /* {{{ php_oci_free_conn_list */ -static void php_oci_free_conn_list(zend_rsrc_list_entry *rsrc) +static void php_oci_free_conn_list(zend_rsrc_list_entry *rsrc TSRMLS_DC) { oci_connection *conn = (oci_connection *)rsrc->ptr; _oci_conn_list_dtor(conn); @@ -785,7 +785,7 @@ */ static void -_oci_coll_list_dtor(zend_rsrc_list_entry *rsrc) +_oci_coll_list_dtor(zend_rsrc_list_entry *rsrc TSRMLS_DC) { oci_collection *coll = (oci_collection *)rsrc->ptr; oci_debug("START _oci_coll_list_dtor: %d",coll->id); @@ -806,7 +806,7 @@ */ static void -_oci_descriptor_list_dtor(zend_rsrc_list_entry *rsrc) +_oci_descriptor_list_dtor(zend_rsrc_list_entry *rsrc TSRMLS_DC) { oci_descriptor *descr = (oci_descriptor *)rsrc->ptr; oci_debug("START _oci_descriptor_list_dtor: %d",descr->id); @@ -825,7 +825,7 @@ */ static void -_oci_server_list_dtor(zend_rsrc_list_entry *rsrc) +_oci_server_list_dtor(zend_rsrc_list_entry *rsrc TSRMLS_DC) { oci_server *server = (oci_server *)rsrc->ptr; if (server->persistent) @@ -839,7 +839,7 @@ */ static void -_oci_session_list_dtor(zend_rsrc_list_entry *rsrc) +_oci_session_list_dtor(zend_rsrc_list_entry *rsrc TSRMLS_DC) { oci_session *session = (oci_session *)rsrc->ptr; if (session->persistent) Index: php4/ext/odbc/php_odbc.c diff -u php4/ext/odbc/php_odbc.c:1.101 php4/ext/odbc/php_odbc.c:1.102 --- php4/ext/odbc/php_odbc.c:1.101 Tue Jul 31 00:53:49 2001 +++ php4/ext/odbc/php_odbc.c Tue Jul 31 01:44:02 2001 @@ -20,7 +20,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_odbc.c,v 1.101 2001/07/31 04:53:49 zeev Exp $ */ +/* $Id: php_odbc.c,v 1.102 2001/07/31 05:44:02 zeev Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -158,7 +158,7 @@ /* {{{ _free_odbc_result */ -static void _free_odbc_result(zend_rsrc_list_entry *rsrc) +static void _free_odbc_result(zend_rsrc_list_entry *rsrc TSRMLS_DC) { odbc_result *res = (odbc_result *)rsrc->ptr; int i; @@ -206,12 +206,10 @@ /* {{{ _close_odbc_conn */ -static void _close_odbc_conn(zend_rsrc_list_entry *rsrc) +static void _close_odbc_conn(zend_rsrc_list_entry *rsrc TSRMLS_DC) { odbc_connection *conn = (odbc_connection *)rsrc->ptr; - TSRMLS_FETCH(); - safe_odbc_disconnect(conn->hdbc); SQLFreeConnect(conn->hdbc); SQLFreeEnv(conn->henv); @@ -220,10 +218,9 @@ } /* }}} */ -static void _close_odbc_pconn(zend_rsrc_list_entry *rsrc) +static void _close_odbc_pconn(zend_rsrc_list_entry *rsrc TSRMLS_DC) { odbc_connection *conn = (odbc_connection *)rsrc->ptr; - TSRMLS_FETCH(); safe_odbc_disconnect(conn->hdbc); SQLFreeConnect(conn->hdbc); Index: php4/ext/odbc/velocis.c diff -u php4/ext/odbc/velocis.c:1.26 php4/ext/odbc/velocis.c:1.27 --- php4/ext/odbc/velocis.c:1.26 Sun Jul 29 21:56:33 2001 +++ php4/ext/odbc/velocis.c Tue Jul 31 01:44:02 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: velocis.c,v 1.26 2001/07/30 01:56:33 zeev Exp $ */ +/* $Id: velocis.c,v 1.27 2001/07/31 05:44:02 zeev Exp $ */ /* * TODO: @@ -77,17 +77,19 @@ THREAD_LS velocis_module php_velocis_module; THREAD_LS static HENV henv; -static void _close_velocis_link(zend_rsrc_list_entry *rsrc) +static void _close_velocis_link(zend_rsrc_list_entry *rsrc TSRMLS_DC) { VConn *conn = (VConn *)rsrc->ptr; + if ( conn ) { efree(conn); } } -static void _free_velocis_result(zend_rsrc_list_entry *rsrc) +static void _free_velocis_result(zend_rsrc_list_entry *rsrc TSRMLS_DC) { Vresult *res = (Vresult *)rsrc->ptr; + if ( res && res->values ) { register int i; for ( i=0; i < res->numcols; i++ ) { Index: php4/ext/openssl/openssl.c diff -u php4/ext/openssl/openssl.c:1.21 php4/ext/openssl/openssl.c:1.22 --- php4/ext/openssl/openssl.c:1.21 Mon Jul 30 04:24:31 2001 +++ php4/ext/openssl/openssl.c Tue Jul 31 01:44:02 2001 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: openssl.c,v 1.21 2001/07/30 08:24:31 zeev Exp $ */ +/* $Id: openssl.c,v 1.22 2001/07/31 05:44:02 zeev Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -97,10 +97,10 @@ ZEND_GET_MODULE(openssl) #endif -static void _php_pkey_free(zend_rsrc_list_entry *rsrc); +static void _php_pkey_free(zend_rsrc_list_entry *rsrc TSRMLS_DC); static int le_key; -static void _php_x509_free(zend_rsrc_list_entry *rsrc); +static void _php_x509_free(zend_rsrc_list_entry *rsrc TSRMLS_DC); static int le_x509; static X509 * php_openssl_x509_from_zval(zval ** val, int makeresource, long * resourceval); @@ -1856,7 +1856,7 @@ /* }}} */ /* {{{ _php_pkey_free() */ -static void _php_pkey_free(zend_rsrc_list_entry *rsrc) +static void _php_pkey_free(zend_rsrc_list_entry *rsrc TSRMLS_DC) { EVP_PKEY *pkey = (EVP_PKEY *)rsrc->ptr; EVP_PKEY_free(pkey); @@ -1864,7 +1864,7 @@ /* }}} */ /* {{{ _php_x509_free() */ -static void _php_x509_free(zend_rsrc_list_entry *rsrc) +static void _php_x509_free(zend_rsrc_list_entry *rsrc TSRMLS_DC) { X509 *x509 = (X509 *)rsrc->ptr; X509_free(x509); Index: php4/ext/oracle/oracle.c diff -u php4/ext/oracle/oracle.c:1.69 php4/ext/oracle/oracle.c:1.70 --- php4/ext/oracle/oracle.c:1.69 Mon Jul 30 02:18:00 2001 +++ php4/ext/oracle/oracle.c Tue Jul 31 01:44:02 2001 @@ -20,7 +20,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: oracle.c,v 1.69 2001/07/30 06:18:00 zeev Exp $ */ +/* $Id: oracle.c,v 1.70 2001/07/31 05:44:02 zeev Exp $ */ /* comment out the next line if you're on Oracle 7.x and don't have the olog call. */ @@ -71,7 +71,7 @@ static oraCursor *ora_get_cursor(HashTable *, pval **); static char *ora_error(Cda_Def *); static int ora_describe_define(oraCursor *); -static int _close_oraconn(zend_rsrc_list_entry *rsrc); +static int _close_oraconn(zend_rsrc_list_entry *rsrc TSRMLS_DC); static int _close_oracur(oraCursor *cur); static int _ora_ping(oraConnection *conn); int ora_set_param_values(oraCursor *cursor, int isout); @@ -201,10 +201,9 @@ /* {{{ _close_oraconn */ -static int _close_oraconn(zend_rsrc_list_entry *rsrc) +static int _close_oraconn(zend_rsrc_list_entry *rsrc TSRMLS_DC) { oraConnection *conn = (oraConnection *)rsrc->ptr; - TSRMLS_FETCH(); conn->open = 0; @@ -277,7 +276,7 @@ /* {{{ php_close_ora_cursor */ -static void php_close_ora_cursor(zend_rsrc_list_entry *rsrc) +static void php_close_ora_cursor(zend_rsrc_list_entry *rsrc TSRMLS_DC) { oraCursor *cur = (oraCursor *)rsrc->ptr; _close_oracur(cur); Index: php4/ext/pdf/pdf.c diff -u php4/ext/pdf/pdf.c:1.90 php4/ext/pdf/pdf.c:1.91 --- php4/ext/pdf/pdf.c:1.90 Tue Jul 3 10:35:06 2001 +++ php4/ext/pdf/pdf.c Tue Jul 31 01:44:02 2001 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: pdf.c,v 1.90 2001/07/03 14:35:06 rjs Exp $ */ +/* $Id: pdf.c,v 1.91 2001/07/31 05:44:02 zeev Exp $ */ /* pdflib 2.02 ... 3.0x is subject to the ALADDIN FREE PUBLIC LICENSE. Copyright (C) 1997-1999 Thomas Merz. 2000-2001 PDFlib GmbH */ @@ -253,7 +253,7 @@ /* {{{ _free_pdf_doc */ -static void _free_pdf_doc(zend_rsrc_list_entry *rsrc) +static void _free_pdf_doc(zend_rsrc_list_entry *rsrc TSRMLS_DC) { /* RJS: TODO: PDF *pdf = (PDF *)rsrc->ptr; @@ -346,7 +346,7 @@ #else php_info_print_table_row(2, "PDFlib GmbH Version", tmp ); #endif - php_info_print_table_row(2, "Revision", "$Revision: 1.90 $" ); + php_info_print_table_row(2, "Revision", "$Revision: 1.91 $" ); php_info_print_table_end(); } Index: php4/ext/pgsql/pgsql.c diff -u php4/ext/pgsql/pgsql.c:1.120 php4/ext/pgsql/pgsql.c:1.121 --- php4/ext/pgsql/pgsql.c:1.120 Tue Jul 31 00:53:49 2001 +++ php4/ext/pgsql/pgsql.c Tue Jul 31 01:44:03 2001 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: pgsql.c,v 1.120 2001/07/31 04:53:49 zeev Exp $ */ +/* $Id: pgsql.c,v 1.121 2001/07/31 05:44:03 zeev Exp $ */ #include <stdlib.h> @@ -142,10 +142,9 @@ /* {{{ _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 @@ /* {{{ _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 @@ /* {{{ _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 @@ /* {{{ _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); } Index: php4/ext/printer/printer.c diff -u php4/ext/printer/printer.c:1.16 php4/ext/printer/printer.c:1.17 --- php4/ext/printer/printer.c:1.16 Mon Jul 30 02:18:01 2001 +++ php4/ext/printer/printer.c Tue Jul 31 01:44:03 2001 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: printer.c,v 1.16 2001/07/30 06:18:01 zeev Exp $ */ +/* $Id: printer.c,v 1.17 2001/07/31 05:44:03 zeev Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -48,8 +48,8 @@ COLORREF hex_to_rgb(char * hex); char *rgb_to_hex(COLORREF rgb); -static void printer_close(zend_rsrc_list_entry *resource); -static void object_close(zend_rsrc_list_entry *resource); +static void printer_close(zend_rsrc_list_entry *resource TSRMLS_DC); +static void object_close(zend_rsrc_list_entry *resource TSRMLS_DC); char *get_default_printer(void); function_entry printer_functions[] = { @@ -109,7 +109,7 @@ php_info_print_table_row(2, "Printer Support", "enabled"); php_info_print_table_row(2, "Default printing device", PRINTERG(default_printer) ? PRINTERG(default_printer) : "<b>not detected</b>"); php_info_print_table_row(2, "Module state", "working"); - php_info_print_table_row(2, "RCS Version", "$Id: printer.c,v 1.16 2001/07/30 06:18:01 zeev Exp $"); + php_info_print_table_row(2, "RCS Version", "$Id: printer.c,v 1.17 2001/07/31 05:44:03 zeev Exp $"); php_info_print_table_end(); DISPLAY_INI_ENTRIES(); } @@ -1314,13 +1314,14 @@ return string; } -static void printer_close(zend_rsrc_list_entry *resource) +static void printer_close(zend_rsrc_list_entry *resource TSRMLS_DC) { printer *p = (printer*)resource->ptr; + ClosePrinter(p->handle); efree(p); } -static void object_close(zend_rsrc_list_entry *resource) +static void object_close(zend_rsrc_list_entry *resource TSRMLS_DC) { HGDIOBJ p = (HGDIOBJ)resource->ptr; DeleteObject(p); Index: php4/ext/pspell/pspell.c diff -u php4/ext/pspell/pspell.c:1.18 php4/ext/pspell/pspell.c:1.19 --- php4/ext/pspell/pspell.c:1.18 Wed Jun 6 09:05:49 2001 +++ php4/ext/pspell/pspell.c Tue Jul 31 01:44:03 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: pspell.c,v 1.18 2001/06/06 13:05:49 rasmus Exp $ */ +/* $Id: pspell.c,v 1.19 2001/07/31 05:44:03 zeev Exp $ */ #define IS_EXT_MODULE @@ -78,15 +78,17 @@ ZEND_GET_MODULE(pspell) #endif -static void php_pspell_close(zend_rsrc_list_entry *rsrc) +static void php_pspell_close(zend_rsrc_list_entry *rsrc TSRMLS_DC) { PspellManager *manager = (PspellManager *)rsrc->ptr; + delete_pspell_manager(manager); } -static void php_pspell_close_config(zend_rsrc_list_entry *rsrc) +static void php_pspell_close_config(zend_rsrc_list_entry *rsrc TSRMLS_DC) { PspellConfig *config = (PspellConfig *)rsrc->ptr; + delete_pspell_config(config); } Index: php4/ext/sablot/sablot.c diff -u php4/ext/sablot/sablot.c:1.46 php4/ext/sablot/sablot.c:1.47 --- php4/ext/sablot/sablot.c:1.46 Mon Jul 30 04:24:34 2001 +++ php4/ext/sablot/sablot.c Tue Jul 31 01:44:04 2001 @@ -38,7 +38,7 @@ static int le_sablot; /* Functions related to PHP's list handling */ -static void _php_sablot_free_processor(zend_rsrc_list_entry *rsrc); +static void _php_sablot_free_processor(zend_rsrc_list_entry *rsrc TSRMLS_DC); /* SAX Handlers */ static void _php_sablot_handler_pair(php_sablot *, zval **, zval **, zval **); @@ -1570,9 +1570,10 @@ /* {{{ _php_sablot_free_processor() Free a Sablot handle */ -static void _php_sablot_free_processor(zend_rsrc_list_entry *rsrc) +static void _php_sablot_free_processor(zend_rsrc_list_entry *rsrc TSRMLS_DC) { php_sablot *handle = (php_sablot *)rsrc->ptr; + if (handle->p) { SablotUnregHandler(handle->p, HLR_MESSAGE, NULL, NULL); SablotUnregHandler(handle->p, HLR_SAX, NULL, NULL); Index: php4/ext/shmop/shmop.c diff -u php4/ext/shmop/shmop.c:1.14 php4/ext/shmop/shmop.c:1.15 --- php4/ext/shmop/shmop.c:1.14 Sun Jul 29 21:56:36 2001 +++ php4/ext/shmop/shmop.c Tue Jul 31 01:44:04 2001 @@ -16,7 +16,7 @@ | Ilia Alshanetsky (iliaa@home.com) | +----------------------------------------------------------------------+ */ -/* $Id: shmop.c,v 1.14 2001/07/30 01:56:36 zeev Exp $ */ +/* $Id: shmop.c,v 1.15 2001/07/31 05:44:04 zeev Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -73,7 +73,7 @@ /* {{{ rsclean */ -static void rsclean(zend_rsrc_list_entry *rsrc) +static void rsclean(zend_rsrc_list_entry *rsrc TSRMLS_DC) { struct php_shmop *shmop = (struct php_shmop *)rsrc->ptr; Index: php4/ext/sockets/sockets.c diff -u php4/ext/sockets/sockets.c:1.58 php4/ext/sockets/sockets.c:1.59 --- php4/ext/sockets/sockets.c:1.58 Mon Jul 30 04:24:34 2001 +++ php4/ext/sockets/sockets.c Tue Jul 31 01:44:05 2001 @@ -19,7 +19,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: sockets.c,v 1.58 2001/07/30 08:24:34 zeev Exp $ */ +/* $Id: sockets.c,v 1.59 2001/07/31 05:44:05 zeev Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -173,13 +173,14 @@ /* inet_ntop should be used instead of inet_ntoa */ int inet_ntoa_lock = 0; -static void destroy_fd_sets(zend_rsrc_list_entry *rsrc) +static void destroy_fd_sets(zend_rsrc_list_entry *rsrc TSRMLS_DC) { php_fd_set *php_fd = (php_fd_set*)rsrc->ptr; + efree(php_fd); } -static void destroy_iovec(zend_rsrc_list_entry *rsrc) +static void destroy_iovec(zend_rsrc_list_entry *rsrc TSRMLS_DC) { unsigned int i; php_iovec_t *iov = (php_iovec_t *) rsrc->ptr; @@ -194,7 +195,7 @@ } } -static void destroy_socket(zend_rsrc_list_entry *rsrc) +static void destroy_socket(zend_rsrc_list_entry *rsrc TSRMLS_DC) { php_socket *php_sock = (php_socket *) rsrc->ptr; Index: php4/ext/standard/dir.c diff -u php4/ext/standard/dir.c:1.74 php4/ext/standard/dir.c:1.75 --- php4/ext/standard/dir.c:1.74 Sun Jul 29 21:56:37 2001 +++ php4/ext/standard/dir.c Tue Jul 31 01:44:06 2001 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: dir.c,v 1.74 2001/07/30 01:56:37 zeev Exp $ */ +/* $Id: dir.c,v 1.75 2001/07/31 05:44:06 zeev Exp $ */ /* {{{ includes/startup/misc */ @@ -101,9 +101,10 @@ } -static void _dir_dtor(zend_rsrc_list_entry *rsrc) +static void _dir_dtor(zend_rsrc_list_entry *rsrc TSRMLS_DC) { php_dir *dirp = (php_dir *)rsrc->ptr; + closedir(dirp->dir); efree(dirp); } Index: php4/ext/standard/file.c diff -u php4/ext/standard/file.c:1.173 php4/ext/standard/file.c:1.174 --- php4/ext/standard/file.c:1.173 Mon Jul 30 04:24:35 2001 +++ php4/ext/standard/file.c Tue Jul 31 01:44:06 2001 @@ -21,7 +21,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: file.c,v 1.173 2001/07/30 08:24:35 zeev Exp $ */ +/* $Id: file.c,v 1.174 2001/07/31 05:44:06 zeev Exp $ */ /* Synced with php 3.0 revision 1.218 1999-06-16 [ssb] */ @@ -112,18 +112,18 @@ /* }}} */ /* {{{ Module-Stuff */ -static void _file_popen_dtor(zend_rsrc_list_entry *rsrc) +static void _file_popen_dtor(zend_rsrc_list_entry *rsrc TSRMLS_DC) { FILE *pipe = (FILE *)rsrc->ptr; - TSRMLS_FETCH(); FG(pclose_ret) = pclose(pipe); } -static void _file_socket_dtor(zend_rsrc_list_entry *rsrc) +static void _file_socket_dtor(zend_rsrc_list_entry *rsrc TSRMLS_DC) { int *sock = (int *)rsrc->ptr; + SOCK_FCLOSE(*sock); #if HAVE_SHUTDOWN shutdown(*sock, 0); @@ -132,9 +132,10 @@ } #if HAVE_PHP_STREAM -static void _file_stream_dtor(zend_rsrc_list_entry * rsrc) +static void _file_stream_dtor(zend_rsrc_list_entry *rsrc TSRMLS_DC) { - php_stream * stream = (php_stream*)rsrc->ptr; + php_stream *stream = (php_stream*)rsrc->ptr; + php_stream_close(stream); } #endif @@ -144,9 +145,10 @@ return le_stream; } -static void _file_fopen_dtor(zend_rsrc_list_entry *rsrc) +static void _file_fopen_dtor(zend_rsrc_list_entry *rsrc TSRMLS_DC) { FILE *fp = (FILE *)rsrc->ptr; + fclose(fp); } Index: php4/ext/sybase/php_sybase_db.c diff -u php4/ext/sybase/php_sybase_db.c:1.25 php4/ext/sybase/php_sybase_db.c:1.26 --- php4/ext/sybase/php_sybase_db.c:1.25 Tue Jul 31 00:53:50 2001 +++ php4/ext/sybase/php_sybase_db.c Tue Jul 31 01:44:07 2001 @@ -20,7 +20,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_sybase_db.c,v 1.25 2001/07/31 04:53:50 zeev Exp $ */ +/* $Id: php_sybase_db.c,v 1.26 2001/07/31 05:44:07 zeev Exp $ */ #ifdef HAVE_CONFIG_H @@ -138,7 +138,7 @@ } -static void _free_sybase_result(zend_rsrc_list_entry *rsrc) +static void _free_sybase_result(zend_rsrc_list_entry *rsrc TSRMLS_DC) { sybase_result *result = (sybase_result *)rsrc->ptr; int i,j; @@ -164,10 +164,9 @@ } -static void _close_sybase_link(zend_rsrc_list_entry *rsrc) +static void _close_sybase_link(zend_rsrc_list_entry *rsrc TSRMLS_DC) { sybase_link *sybase_ptr = (sybase_link *)rsrc->ptr; - TSRMLS_FETCH(); sybase_ptr->valid = 0; @@ -185,9 +184,10 @@ } -static void _close_sybase_plink(zend_rsrc_list_entry *rsrc) +static void _close_sybase_plink(zend_rsrc_list_entry *rsrc TSRMLS_DC) { sybase_link *sybase_ptr = (sybase_link *)rsrc->ptr; + dbclose(sybase_ptr->link); dbloginfree(sybase_ptr->login); free(sybase_ptr); Index: php4/ext/sybase_ct/php_sybase_ct.c diff -u php4/ext/sybase_ct/php_sybase_ct.c:1.57 php4/ext/sybase_ct/php_sybase_ct.c:1.58 --- php4/ext/sybase_ct/php_sybase_ct.c:1.57 Tue Jul 31 00:53:51 2001 +++ php4/ext/sybase_ct/php_sybase_ct.c Tue Jul 31 01:44:07 2001 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_sybase_ct.c,v 1.57 2001/07/31 04:53:51 zeev Exp $ */ +/* $Id: php_sybase_ct.c,v 1.58 2001/07/31 05:44:07 zeev Exp $ */ #ifdef HAVE_CONFIG_H @@ -133,17 +133,17 @@ efree(result); } -static void php_free_sybase_result(zend_rsrc_list_entry *rsrc) +static void php_free_sybase_result(zend_rsrc_list_entry *rsrc TSRMLS_DC) { sybase_result *result = (sybase_result *)rsrc->ptr; + _free_sybase_result(result); } -static void _close_sybase_link(zend_rsrc_list_entry *rsrc) +static void _close_sybase_link(zend_rsrc_list_entry *rsrc TSRMLS_DC) { sybase_link *sybase_ptr = (sybase_link *)rsrc->ptr; CS_INT con_status; - TSRMLS_FETCH(); sybase_ptr->valid = 0; @@ -171,11 +171,10 @@ } -static void _close_sybase_plink(zend_rsrc_list_entry *rsrc) +static void _close_sybase_plink(zend_rsrc_list_entry *rsrc TSRMLS_DC) { sybase_link *sybase_ptr = (sybase_link *)rsrc->ptr; CS_INT con_status; - TSRMLS_FETCH(); /* Persistent connections may have been closed before a failed * reopen attempt. Index: php4/ext/sysvsem/sysvsem.c diff -u php4/ext/sysvsem/sysvsem.c:1.32 php4/ext/sysvsem/sysvsem.c:1.33 --- php4/ext/sysvsem/sysvsem.c:1.32 Sun Jul 29 21:56:39 2001 +++ php4/ext/sysvsem/sysvsem.c Tue Jul 31 01:44:08 2001 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: sysvsem.c,v 1.32 2001/07/30 01:56:39 zeev Exp $ */ +/* $Id: sysvsem.c,v 1.33 2001/07/31 05:44:08 zeev Exp $ */ /* Latest update build anc tested on Linux 2.2.14 * @@ -102,7 +102,7 @@ /* {{{ release_sysvsem_sem */ -static void release_sysvsem_sem(zend_rsrc_list_entry *rsrc) +static void release_sysvsem_sem(zend_rsrc_list_entry *rsrc TSRMLS_DC) { sysvsem_sem *sem_ptr = (sysvsem_sem *)rsrc->ptr; struct sembuf sop[2]; Index: php4/ext/sysvshm/sysvshm.c diff -u php4/ext/sysvshm/sysvshm.c:1.40 php4/ext/sysvshm/sysvshm.c:1.41 --- php4/ext/sysvshm/sysvshm.c:1.40 Wed Jun 6 09:05:52 2001 +++ php4/ext/sysvshm/sysvshm.c Tue Jul 31 01:44:08 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: sysvshm.c,v 1.40 2001/06/06 13:05:52 rasmus Exp $ */ +/* $Id: sysvshm.c,v 1.41 2001/07/31 05:44:08 zeev Exp $ */ /* This has been built and tested on Linux 2.2.14 * @@ -71,7 +71,7 @@ /* {{{ php_release_sysvshm */ -static void php_release_sysvshm(zend_rsrc_list_entry *rsrc) +static void php_release_sysvshm(zend_rsrc_list_entry *rsrc) { sysvshm_shm *shm_ptr = (sysvshm_shm *)rsrc->ptr; shmdt((void*)shm_ptr->ptr); Index: php4/ext/wddx/wddx.c diff -u php4/ext/wddx/wddx.c:1.75 php4/ext/wddx/wddx.c:1.76 --- php4/ext/wddx/wddx.c:1.75 Mon Jul 30 04:24:37 2001 +++ php4/ext/wddx/wddx.c Tue Jul 31 01:44:08 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: wddx.c,v 1.75 2001/07/30 08:24:37 zeev Exp $ */ +/* $Id: wddx.c,v 1.76 2001/07/31 05:44:08 zeev Exp $ */ #include "php.h" #include "php_wddx.h" @@ -200,7 +200,7 @@ /* {{{ release_wddx_packet_rsrc */ -static void release_wddx_packet_rsrc(zend_rsrc_list_entry *rsrc) +static void release_wddx_packet_rsrc(zend_rsrc_list_entry *rsrc TSRMLS_DC) { smart_str *str = (smart_str *)rsrc->ptr; smart_str_free(str); Index: php4/ext/xml/xml.c diff -u php4/ext/xml/xml.c:1.89 php4/ext/xml/xml.c:1.90 --- php4/ext/xml/xml.c:1.89 Mon Jul 30 04:24:38 2001 +++ php4/ext/xml/xml.c Tue Jul 31 01:44:09 2001 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: xml.c,v 1.89 2001/07/30 08:24:38 zeev Exp $ */ +/* $Id: xml.c,v 1.90 2001/07/31 05:44:09 zeev Exp $ */ #define IS_EXT_MODULE #ifdef HAVE_CONFIG_H @@ -74,7 +74,7 @@ PHP_RSHUTDOWN_FUNCTION(xml); PHP_MINFO_FUNCTION(xml); -static void xml_parser_dtor(zend_rsrc_list_entry *rsrc); +static void xml_parser_dtor(zend_rsrc_list_entry *rsrc TSRMLS_DC); static void xml_set_handler(zval **, zval **); inline static unsigned short xml_encode_iso_8859_1(unsigned char); inline static char xml_decode_iso_8859_1(unsigned short); @@ -288,7 +288,7 @@ /* {{{ xml_parser_dtor() */ static void -xml_parser_dtor(zend_rsrc_list_entry *rsrc) +xml_parser_dtor(zend_rsrc_list_entry *rsrc TSRMLS_DC) { xml_parser *parser = (xml_parser *)rsrc->ptr; Index: php4/ext/xslt/sablot.c diff -u php4/ext/xslt/sablot.c:1.15 php4/ext/xslt/sablot.c:1.16 --- php4/ext/xslt/sablot.c:1.15 Sun Jul 29 21:56:40 2001 +++ php4/ext/xslt/sablot.c Tue Jul 31 01:44:09 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: sablot.c,v 1.15 2001/07/30 01:56:40 zeev Exp $ */ +/* $Id: sablot.c,v 1.16 2001/07/31 05:44:09 zeev Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -41,7 +41,7 @@ static void register_sax_handler_pair(zval *, zval *, zval **); /* Free processor */ -static void free_processor(zend_rsrc_list_entry *); +static void free_processor(zend_rsrc_list_entry *rsrc TSRMLS_DC); /* Scheme handler functions */ static int scheme_getall(void *, SablotHandle, const char *, const char *, char **, int *); @@ -602,7 +602,7 @@ /* {{{ free_processor() Free an XSLT processor */ -static void free_processor(zend_rsrc_list_entry *rsrc) +static void free_processor(zend_rsrc_list_entry *rsrc TSRMLS_DC) { php_xslt *handle = (php_xslt *) rsrc->ptr; /* A PHP-XSLT processor */ Index: php4/ext/zip/zip.c diff -u php4/ext/zip/zip.c:1.9 php4/ext/zip/zip.c:1.10 --- php4/ext/zip/zip.c:1.9 Sun Jul 29 21:56:41 2001 +++ php4/ext/zip/zip.c Tue Jul 31 01:44:10 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zip.c,v 1.9 2001/07/30 01:56:41 zeev Exp $ */ +/* $Id: zip.c,v 1.10 2001/07/31 05:44:10 zeev Exp $ */ #include "php.h" #include "php_ini.h" @@ -73,16 +73,17 @@ /* {{{ php_zip_free_dir */ -static void php_zip_free_dir(zend_rsrc_list_entry *rsrc) +static void php_zip_free_dir(zend_rsrc_list_entry *rsrc TSRMLS_DC) { ZZIP_DIR *z_dir = (ZZIP_DIR *) rsrc->ptr; + zzip_closedir(z_dir); } /* }}} */ /* {{{ php_zip_free_entry */ -static void php_zip_free_entry(zend_rsrc_list_entry *rsrc) +static void php_zip_free_entry(zend_rsrc_list_entry *rsrc TSRMLS_DC) { php_zzip_dirent *entry = (php_zzip_dirent *) rsrc->ptr; Index: php4/ext/zlib/zlib.c diff -u php4/ext/zlib/zlib.c:1.88 php4/ext/zlib/zlib.c:1.89 --- php4/ext/zlib/zlib.c:1.88 Mon Jul 30 15:39:26 2001 +++ php4/ext/zlib/zlib.c Tue Jul 31 01:44:10 2001 @@ -16,7 +16,7 @@ | Stefan Röhrich <sr@linux.de> | +----------------------------------------------------------------------+ */ -/* $Id: zlib.c,v 1.88 2001/07/30 19:39:26 sniper Exp $ */ +/* $Id: zlib.c,v 1.89 2001/07/31 05:44:10 zeev Exp $ */ #define IS_EXT_MODULE #ifdef HAVE_CONFIG_H @@ -133,9 +133,10 @@ /* {{{ phpi_destructor_gzclose */ -static void phpi_destructor_gzclose(zend_rsrc_list_entry *rsrc) +static void phpi_destructor_gzclose(zend_rsrc_list_entry *rsrc TSRMLS_DC) { gzFile *zp = (gzFile *)rsrc->ptr; + (void)gzclose(zp); } /* }}} */ Index: php4/main/php_ticks.c diff -u php4/main/php_ticks.c:1.9 php4/main/php_ticks.c:1.10 --- php4/main/php_ticks.c:1.9 Tue Jul 31 00:53:52 2001 +++ php4/main/php_ticks.c Tue Jul 31 01:44:11 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_ticks.c,v 1.9 2001/07/31 04:53:52 zeev Exp $ */ +/* $Id: php_ticks.c,v 1.10 2001/07/31 05:44:11 zeev Exp $ */ #include "php.h" #include "php_ticks.h" @@ -62,7 +62,6 @@ memcpy(&func, data, sizeof(void(*)(int))); func(*((int *)arg)); - return SUCCESS; } void php_run_ticks(int count)