cvs: php4 /ext/ingres_ii ii.c ii.h /ext/mcal php_mcal.c php_mcal.h /ext/standard dl.c dl.h /main php_ini.c

sniper Tue Aug 7 16:13:54 2001 EDT Modified files: /php4/ext/ingres_ii ii.c ii.h /php4/ext/mcal php_mcal.c php_mcal.h /php4/ext/standard dl.c dl.h /php4/main php_ini.c Log: Yet another TSRM fix.

Index: php4/ext/ingres_ii/ii.c diff -u php4/ext/ingres_ii/ii.c:1.24 php4/ext/ingres_ii/ii.c:1.25 --- php4/ext/ingres_ii/ii.c:1.24 Sun Aug 5 23:50:46 2001 +++ php4/ext/ingres_ii/ii.c Tue Aug 7 16:13:52 2001 @@ -19,7 +19,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: ii.c,v 1.24 2001/08/06 03:50:46 sas Exp $ */ +/* $Id: ii.c,v 1.25 2001/08/07 20:13:52 sniper Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -143,10 +143,9 @@ return 0; } -static void _close_ii_link(II_LINK *link) +static void _close_ii_link(II_LINK *link TSRMLS_DC) { IIAPI_DISCONNPARM disconnParm; - TSRMLS_FETCH(); if(link->tranHandle && _rollback_transaction(link)) { php_error(E_WARNING,"Ingres II: Unable to rollback transaction !!"); @@ -171,7 +170,7 @@ { II_LINK *link = (II_LINK *)rsrc->ptr; - _close_ii_link(link); + _close_ii_link(link TSRMLS_CC); } @@ -181,7 +180,7 @@ { II_LINK *link = (II_LINK *)rsrc->ptr; - _close_ii_link(link); + _close_ii_link(link TSRMLS_CC); IIG(num_persistent)--; } @@ -223,9 +222,8 @@ /* sets the default link */ -static void php_ii_set_default_link(int id) +static void php_ii_set_default_link(int id TSRMLS_DC) { - TSRMLS_FETCH(); if (IIG(default_link)!=-1) { zend_list_delete(IIG(default_link)); @@ -531,7 +529,7 @@ zend_list_addref((int) link); return_value->value.lval = (int) link; - php_ii_set_default_link((int) link); + php_ii_set_default_link((int) link TSRMLS_CC); return_value->type = IS_RESOURCE; efree(hashed_details); @@ -588,7 +586,7 @@ } efree(hashed_details); - php_ii_set_default_link(return_value->value.lval); + php_ii_set_default_link(return_value->value.lval TSRMLS_CC); } /* {{{ proto resource ingres_connect([string database [, string username [, string password]]]) @@ -836,6 +834,7 @@ fun_name = "ii_field_scale"; break; default: + fun_name = "foobar"; break; } php_error(E_WARNING,"Ingres II: %s() called with wrong index (%d)",fun_name,index); @@ -990,15 +989,15 @@ /* Fetch a row of result */ -static void php_ii_fetch(INTERNAL_FUNCTION_PARAMETERS, II_LINK *ii_link, int result_type TSRMLS_DC) +static void php_ii_fetch(INTERNAL_FUNCTION_PARAMETERS, II_LINK *ii_link, int result_type) { IIAPI_GETCOLPARM getColParm; IIAPI_DATAVALUE *columnData; IIAPI_CONVERTPARM convertParm; int i,j,k; int more; - double value_double; - long value_long; + double value_double=0; + long value_long=0; char *value_char_p; int len, should_copy, correct_length; @@ -1197,8 +1196,7 @@ ZEND_FETCH_RESOURCE2(ii_link, II_LINK *, link, link_id, "Ingres II Link", le_ii_link, le_ii_plink); - php_ii_fetch(INTERNAL_FUNCTION_PARAM_PASSTHRU, ii_link, - (argc == 0 ? II_BOTH : Z_LVAL_PP(result_type)) TSRMLS_CC); + php_ii_fetch(INTERNAL_FUNCTION_PARAM_PASSTHRU, ii_link, (argc == 0 ? II_BOTH : Z_LVAL_PP(result_type))); } /* }}} */ @@ -1222,7 +1220,7 @@ ZEND_FETCH_RESOURCE2(ii_link, II_LINK *, link, link_id, "Ingres II Link", le_ii_link, le_ii_plink); - php_ii_fetch(INTERNAL_FUNCTION_PARAM_PASSTHRU, ii_link, II_NUM TSRMLS_CC); + php_ii_fetch(INTERNAL_FUNCTION_PARAM_PASSTHRU, ii_link, II_NUM); } /* }}} */ @@ -1250,8 +1248,7 @@ ZEND_FETCH_RESOURCE2(ii_link, II_LINK *, link, link_id, "Ingres II Link", le_ii_link, le_ii_plink); - php_ii_fetch(INTERNAL_FUNCTION_PARAM_PASSTHRU, ii_link, - (argc == 0 ? II_BOTH : Z_LVAL_PP(result_type)) TSRMLS_CC); + php_ii_fetch(INTERNAL_FUNCTION_PARAM_PASSTHRU, ii_link, (argc == 0 ? II_BOTH : Z_LVAL_PP(result_type))); if(Z_TYPE_P(return_value)==IS_ARRAY) { convert_to_object(return_value); } Index: php4/ext/ingres_ii/ii.h diff -u php4/ext/ingres_ii/ii.h:1.9 php4/ext/ingres_ii/ii.h:1.10 --- php4/ext/ingres_ii/ii.h:1.9 Tue Jul 31 01:43:56 2001 +++ php4/ext/ingres_ii/ii.h Tue Aug 7 16:13:52 2001 @@ -19,7 +19,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: ii.h,v 1.9 2001/07/31 05:43:56 zeev Exp $ */ +/* $Id: ii.h,v 1.10 2001/08/07 20:13:52 sniper Exp $ */ #ifndef II_H #define II_H @@ -44,10 +44,10 @@ #define II_NO_DATA 2 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_link(II_LINK *link TSRMLS_DC); 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_set_default_link(int id TSRMLS_DC); static void php_ii_do_connect(INTERNAL_FUNCTION_PARAMETERS, int persistent); static char *php_ii_field_name(II_LINK *ii_link, int index); static void php_ii_field_info(INTERNAL_FUNCTION_PARAMETERS, int info_type); Index: php4/ext/mcal/php_mcal.c diff -u php4/ext/mcal/php_mcal.c:1.44 php4/ext/mcal/php_mcal.c:1.45 --- php4/ext/mcal/php_mcal.c:1.44 Tue Jul 31 01:43:57 2001 +++ php4/ext/mcal/php_mcal.c Tue Aug 7 16:13:52 2001 @@ -45,7 +45,7 @@ #include "winsock.h" #endif -void cal_close_it(zend_rsrc_list_entry *rsrc TSRMLS_DC); +static void cal_close_it(zend_rsrc_list_entry *rsrc TSRMLS_DC); typedef struct _php_mcal_le_struct { CALSTREAM *mcal_stream; @@ -123,11 +123,12 @@ and nothing will link to this module, we can use the simple thread local_ storage */ -int le_mcal; +static int le_mcal; char *mcal_user; char *mcal_password; -void cal_close_it (zend_rsrc_list_entry *rsrc TSRMLS_DC) + +static void cal_close_it (zend_rsrc_list_entry *rsrc TSRMLS_DC) { pils *mcal_le_struct = (pils *)rsrc->ptr; @@ -209,7 +210,7 @@ return zend_hash_update(symtable, key, strlen(key)+1, (void *)&tmp, sizeof(zval *), NULL); } -void php_mcal_do_open(INTERNAL_FUNCTION_PARAMETERS, int persistent) +static void php_mcal_do_open(INTERNAL_FUNCTION_PARAMETERS, int persistent) { zval **calendar, **user, **passwd, **options; CALSTREAM *mcal_stream; @@ -248,13 +249,13 @@ RETURN_LONG(ind); } -void php_mcal_event_init(struct _php_mcal_le_struct *mystruct) +static void php_mcal_event_init(struct _php_mcal_le_struct *mystruct) { calevent_free(mystruct->event); mystruct->event=calevent_new(); } -void _php_make_event_object(zval *myzvalue, CALEVENT *event) +static void _php_make_event_object(zval *myzvalue, CALEVENT *event TSRMLS_DC) { zval *start, *end, *recurend, *attrlist; CALATTR *attr; @@ -469,7 +470,7 @@ } calevent_free(mcal_le_struct->event); mcal_le_struct->event = myevent; - _php_make_event_object(return_value, mcal_le_struct->event); + _php_make_event_object(return_value, mcal_le_struct->event TSRMLS_CC); } /* }}} */ @@ -492,7 +493,7 @@ php_error(E_WARNING, "Unable to find stream pointer"); RETURN_FALSE; } - _php_make_event_object(return_value, mcal_le_struct->event); + _php_make_event_object(return_value, mcal_le_struct->event TSRMLS_CC); } /* }}} */ Index: php4/ext/mcal/php_mcal.h diff -u php4/ext/mcal/php_mcal.h:1.10 php4/ext/mcal/php_mcal.h:1.11 --- php4/ext/mcal/php_mcal.h:1.10 Sun Jul 29 21:56:29 2001 +++ php4/ext/mcal/php_mcal.h Tue Aug 7 16:13:52 2001 @@ -1,4 +1,4 @@ -/* $Id: php_mcal.h,v 1.10 2001/07/30 01:56:29 zeev Exp $ */ +/* $Id: php_mcal.h,v 1.11 2001/08/07 20:13:52 sniper Exp $ */ #ifndef PHP_MCAL_H #define PHP_MCAL_H @@ -10,24 +10,14 @@ #endif /* Functions accessable to PHP */ -/* extern zend_module_entry php_mcal_module_entry; */ extern zend_module_entry php_mcal_module_entry; #define php_mcal_module_ptr &php_mcal_module_entry -#define phpext_mcal_ptr php_mcal_module_ptr - -#ifdef ZEND_VERSION -PHP_MINIT_FUNCTION(mcal); -PHP_MINFO_FUNCTION(mcal); -#else -int PHP_MINIT_FUNCTION(INIT_FUNC_ARGS); -void PHP_MINFO_FUNCTION(void); -#endif - extern int mcal_init_request(INIT_FUNC_ARGS); extern int mcal_end_request(void); -void make_event_object(); -void php_mcal_event_init(); + +PHP_MINIT_FUNCTION(mcal); +PHP_MINFO_FUNCTION(mcal); PHP_FUNCTION(mcal_open); PHP_FUNCTION(mcal_popen); @@ -69,10 +59,10 @@ PHP_FUNCTION(mcal_event_set_recur_yearly); PHP_FUNCTION(mcal_fetch_current_stream_event); - #else #define php_mcal_module_ptr NULL #endif /* HAVE_MCAL */ +#define phpext_mcal_ptr php_mcal_module_ptr #endif Index: php4/ext/standard/dl.c diff -u php4/ext/standard/dl.c:1.57 php4/ext/standard/dl.c:1.58 --- php4/ext/standard/dl.c:1.57 Mon Jul 30 02:18:05 2001 +++ php4/ext/standard/dl.c Tue Aug 7 16:13:53 2001 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: dl.c,v 1.57 2001/07/30 06:18:05 zeev Exp $ */ +/* $Id: dl.c,v 1.58 2001/08/07 20:13:53 sniper Exp $ */ #include "php.h" #include "dl.h" @@ -75,7 +75,7 @@ } else if (PG(safe_mode)) { php_error(E_ERROR, "Dynamically loaded extensions aren't allowed when running in SAFE MODE."); } else { - php_dl(*file, MODULE_TEMPORARY, return_value); + php_dl(*file, MODULE_TEMPORARY, return_value TSRMLS_CC); } } @@ -92,7 +92,7 @@ /* {{{ php_dl */ -void php_dl(pval *file, int type, pval *return_value) +void php_dl(pval *file, int type, pval *return_value TSRMLS_DC) { void *handle; char *libpath; @@ -100,7 +100,6 @@ zend_module_entry *(*get_module)(void); int error_type; char *extension_dir; - TSRMLS_FETCH(); if (type==MODULE_PERSISTENT) { /* Use the configuration hash directly, the INI mechanism is not yet initialized */ Index: php4/ext/standard/dl.h diff -u php4/ext/standard/dl.h:1.14 php4/ext/standard/dl.h:1.15 --- php4/ext/standard/dl.h:1.14 Mon Feb 26 01:07:17 2001 +++ php4/ext/standard/dl.h Tue Aug 7 16:13:53 2001 @@ -18,12 +18,12 @@ +----------------------------------------------------------------------+ */ -/* $Id: dl.h,v 1.14 2001/02/26 06:07:17 andi Exp $ */ +/* $Id: dl.h,v 1.15 2001/08/07 20:13:53 sniper Exp $ */ #ifndef DL_H #define DL_H -void php_dl(pval *file,int type,pval *return_value); +void php_dl(pval *file,int type,pval *return_value TSRMLS_DC); /* dynamic loading functions */ Index: php4/main/php_ini.c diff -u php4/main/php_ini.c:1.69 php4/main/php_ini.c:1.70 --- php4/main/php_ini.c:1.69 Sun Aug 5 11:55:43 2001 +++ php4/main/php_ini.c Tue Aug 7 16:13:53 2001 @@ -182,7 +182,7 @@ zval *extension = (zval *) arg; zval zval; - php_dl(extension, MODULE_PERSISTENT, &zval); + php_dl(extension, MODULE_PERSISTENT, &zval TSRMLS_CC); } /* }}} */