cvs: /php4 SAPI.c main.c rfc1867.c /php4/ext/pcre php_pcre.c /php4/ext/pgsql pgsql.c /php4/ext/session session.c /php4/ext/standard dir.c file.c
fsock.c lcg.c reg.c /php4/sapi/cgi cgi_main.c

sas Sun Dec 5 11:26:02 1999 EDT Modified files: /php4 SAPI.c main.c rfc1867.c /php4/ext/pcre php_pcre.c /php4/ext/pgsql pgsql.c /php4/ext/session session.c /php4/ext/standard dir.c file.c fsock.c lcg.c reg.c /php4/sapi/cgi cgi_main.c Log: Fix some warnings Index: php4/SAPI.c diff -u php4/SAPI.c:1.34 php4/SAPI.c:1.35 --- php4/SAPI.c:1.34 Wed Oct 6 01:26:25 1999 +++ php4/SAPI.c Sun Dec 5 11:25:28 1999 @@ -79,7 +79,7 @@ module_global_startup_modules(); } -SAPI_API void sapi_shutdown() +SAPI_API void sapi_shutdown(void) { module_global_shutdown_modules(); zend_hash_destroy(&known_post_content_types); Index: php4/main.c diff -u php4/main.c:1.151 php4/main.c:1.152 --- php4/main.c:1.151 Sun Dec 5 09:16:35 1999 +++ php4/main.c Sun Dec 5 11:25:28 1999 @@ -19,7 +19,7 @@ */ -/* $Id: main.c,v 1.151 1999/12/05 14:16:35 rasmus Exp $ */ +/* $Id: main.c,v 1.152 1999/12/05 16:25:28 sas Exp $ */ #include <stdio.h> @@ -523,7 +523,7 @@ } -static void php_unset_timeout() +static void php_unset_timeout(void) { #if WIN32|WINNT #else @@ -778,7 +778,7 @@ } -int return_one(void *p) +static int return_one(void *p) { return 1; } @@ -817,7 +817,7 @@ } -static int php3_config_ini_startup() +static int php3_config_ini_startup(void) { if (php3_init_config() == FAILURE) { php_printf("PHP: Unable to parse configuration file.\n"); @@ -826,7 +826,7 @@ return SUCCESS; } -static void php3_config_ini_shutdown() +static void php3_config_ini_shutdown(void) { php3_shutdown_config(); } @@ -895,7 +895,7 @@ #ifdef ZTS tsrm_set_new_thread_end_handler(php_new_thread_end_handler); executor_globals = ts_resource(executor_globals_id); - core_globals_id = ts_allocate_id(sizeof(php_core_globals), core_globals_ctor, NULL); + core_globals_id = ts_allocate_id(sizeof(php_core_globals), (ts_allocate_ctor) core_globals_ctor, NULL); core_globals = ts_resource(core_globals_id); #endif EG(error_reporting) = E_ALL & ~E_NOTICE; Index: php4/rfc1867.c diff -u php4/rfc1867.c:1.14 php4/rfc1867.c:1.15 --- php4/rfc1867.c:1.14 Sat Dec 4 14:15:41 1999 +++ php4/rfc1867.c Sun Dec 5 11:25:28 1999 @@ -15,7 +15,7 @@ | Authors: Rasmus Lerdorf <rasmus@lerdorf.on.ca> | +----------------------------------------------------------------------+ */ -/* $Id: rfc1867.c,v 1.14 1999/12/04 19:15:41 sas Exp $ */ +/* $Id: rfc1867.c,v 1.15 1999/12/05 16:25:28 sas Exp $ */ #include <stdio.h> #include "php.h" @@ -32,7 +32,7 @@ /* * Split raw mime stream up into appropriate components */ -void php_mime_split(char *buf, int cnt, char *boundary) +static void php_mime_split(char *buf, int cnt, char *boundary) { char *ptr, *loc, *loc2, *s, *name, *filename, *u, *fn; int len, state = 0, Done = 0, rem, urem; Index: php4/ext/pcre/php_pcre.c diff -u php4/ext/pcre/php_pcre.c:1.29 php4/ext/pcre/php_pcre.c:1.30 --- php4/ext/pcre/php_pcre.c:1.29 Sat Dec 4 14:15:59 1999 +++ php4/ext/pcre/php_pcre.c Sun Dec 5 11:25:28 1999 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_pcre.c,v 1.29 1999/12/04 19:15:59 sas Exp $ */ +/* $Id: php_pcre.c,v 1.30 1999/12/05 16:25:28 sas Exp $ */ /* TODO: @@ -102,8 +102,8 @@ #ifdef ZTS pcre_globals_id = ts_allocate_id( sizeof(php_pcre_globals), - _php_pcre_init_globals, - _php_pcre_shutdown_globals); + (ts_allocate_ctor) _php_pcre_init_globals, + (ts_allocate_dtor) _php_pcre_shutdown_globals); #else zend_hash_init(&PCRE_G(pcre_cache), 0, NULL, _php_free_pcre_cache, 1); #endif Index: php4/ext/pgsql/pgsql.c diff -u php4/ext/pgsql/pgsql.c:1.28 php4/ext/pgsql/pgsql.c:1.29 --- php4/ext/pgsql/pgsql.c:1.28 Sat Dec 4 14:16:00 1999 +++ php4/ext/pgsql/pgsql.c Sun Dec 5 11:25:29 1999 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: pgsql.c,v 1.28 1999/12/04 19:16:00 sas Exp $ */ +/* $Id: pgsql.c,v 1.29 1999/12/05 16:25:29 sas Exp $ */ #include <stdlib.h> @@ -140,7 +140,7 @@ ELS_FETCH(); #ifdef ZTS - pgsql_globals_id = ts_allocate_id(sizeof(php_pgsql_globals), php_pgsql_init_globals, NULL); + pgsql_globals_id = ts_allocate_id(sizeof(php_pgsql_globals), (ts_allocate_ctor) php_pgsql_init_globals, NULL); #else php_pgsql_init_globals(PGLS_C); #endif @@ -633,7 +633,6 @@ PGresult *pgsql_result; pgsql_result_handle *pg_result; int type; - PGLS_FETCH(); if (ARG_COUNT(ht)!=1 || getParameters(ht, 1, &result)==FAILURE) { WRONG_PARAM_COUNT; @@ -701,7 +700,6 @@ char hashed_oid_key[32]; list_entry *field_type; char *ret=NULL; - PGLS_FETCH(); /* try to lookup the type in the resource list */ snprintf(hashed_oid_key,31,"pgsql_oid_%d",(int) oid); @@ -752,7 +750,6 @@ PGresult *pgsql_result; pgsql_result_handle *pg_result; int type; - PGLS_FETCH(); if (ARG_COUNT(ht)!=2 || getParameters(ht, 2, &result, &field)==FAILURE) { WRONG_PARAM_COUNT; @@ -827,7 +824,6 @@ PGresult *pgsql_result; pgsql_result_handle *pg_result; int type; - PGLS_FETCH(); if (ARG_COUNT(ht)!=2 || getParameters(ht, 2, &result, &field)==FAILURE) { WRONG_PARAM_COUNT; @@ -856,7 +852,6 @@ PGresult *pgsql_result; pgsql_result_handle *pg_result; int type,field_offset; - PGLS_FETCH(); if (ARG_COUNT(ht)!=3 || getParameters(ht, 3, &result, &row, &field)==FAILURE) { WRONG_PARAM_COUNT; @@ -908,7 +903,6 @@ char *element,*field_name; uint element_len; PLS_FETCH(); - PGLS_FETCH(); switch (ARG_COUNT(ht)) { case 2: @@ -1017,7 +1011,6 @@ PGresult *pgsql_result; pgsql_result_handle *pg_result; int type,field_offset; - PGLS_FETCH(); if (ARG_COUNT(ht)!=3 || getParameters(ht, 3, &result, &row, &field)==FAILURE) { WRONG_PARAM_COUNT; @@ -1085,7 +1078,6 @@ pval *result; pgsql_result_handle *pg_result; int type; - PGLS_FETCH(); if (ARG_COUNT(ht)!=1 || getParameters(ht, 1, &result)==FAILURE) { WRONG_PARAM_COUNT; @@ -1114,7 +1106,6 @@ PGresult *pgsql_result; pgsql_result_handle *pg_result; int type; - PGLS_FETCH(); if (ARG_COUNT(ht)!=1 || getParameters(ht, 1, &result)==FAILURE) { WRONG_PARAM_COUNT; @@ -1348,7 +1339,6 @@ pval *pgsql_lofp; int id, type; pgLofp *pgsql; - PGLS_FETCH(); switch(ARG_COUNT(ht)) { case 1: @@ -1388,7 +1378,6 @@ int id, buf_len, type, nbytes; char *buf; pgLofp *pgsql; - PGLS_FETCH(); switch(ARG_COUNT(ht)) { case 2: @@ -1431,7 +1420,6 @@ int id, buf_len, nbytes, type; char *buf; pgLofp *pgsql; - PGLS_FETCH(); switch(ARG_COUNT(ht)) { case 2: @@ -1473,7 +1461,6 @@ char buf[8192]; pgLofp *pgsql; int output=1; - PGLS_FETCH(); switch(ARG_COUNT(ht)) { case 1: Index: php4/ext/session/session.c diff -u php4/ext/session/session.c:1.76 php4/ext/session/session.c:1.77 --- php4/ext/session/session.c:1.76 Sun Dec 5 05:29:05 1999 +++ php4/ext/session/session.c Sun Dec 5 11:25:30 1999 @@ -968,8 +968,6 @@ static void php_rinit_session_globals(PSLS_D) { - ELS_FETCH(); - PS(mod) = _php_find_ps_module(INI_STR("session.save_handler") PSLS_CC); PS(serializer) = \ _php_find_ps_serializer(INI_STR("session.serialize_handler") PSLS_CC); @@ -1016,7 +1014,6 @@ PHP_RINIT_FUNCTION(session) { PSLS_FETCH(); - PLS_FETCH(); php_rinit_session_globals(PSLS_C); Index: php4/ext/standard/dir.c diff -u php4/ext/standard/dir.c:1.17 php4/ext/standard/dir.c:1.18 --- php4/ext/standard/dir.c:1.17 Sat Dec 4 14:16:03 1999 +++ php4/ext/standard/dir.c Sun Dec 5 11:25:31 1999 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: dir.c,v 1.17 1999/12/04 19:16:03 sas Exp $ */ +/* $Id: dir.c,v 1.18 1999/12/05 16:25:31 sas Exp $ */ /* {{{ includes/startup/misc */ @@ -129,7 +129,7 @@ dir_class_entry_ptr = register_internal_class(&dir_class_entry); #ifdef ZTS - dir_globals_id = ts_allocate_id(sizeof(php_dir_globals), php_dir_init_globals, NULL); + dir_globals_id = ts_allocate_id(sizeof(php_dir_globals), (ts_allocate_ctor) php_dir_init_globals, NULL); #else DIR(default_dir) = 0; #endif Index: php4/ext/standard/file.c diff -u php4/ext/standard/file.c:1.45 php4/ext/standard/file.c:1.46 --- php4/ext/standard/file.c:1.45 Sat Dec 4 14:16:03 1999 +++ php4/ext/standard/file.c Sun Dec 5 11:25:31 1999 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: file.c,v 1.45 1999/12/04 19:16:03 sas Exp $ */ +/* $Id: file.c,v 1.46 1999/12/05 16:25:31 sas Exp $ */ /* Synced with php3 revision 1.218 1999-06-16 [ssb] */ @@ -325,7 +325,7 @@ le_uploads = register_list_destructors(_file_upload_dtor, NULL); #ifdef ZTS - file_globals_id = ts_allocate_id(sizeof(php_file_globals), php_file_init_globals, NULL); + file_globals_id = ts_allocate_id(sizeof(php_file_globals), (ts_allocate_ctor) php_file_init_globals, NULL); #else FIL(fgetss_state) = 0; FIL(pclose_ret) = 0; Index: php4/ext/standard/fsock.c diff -u php4/ext/standard/fsock.c:1.29 php4/ext/standard/fsock.c:1.30 --- php4/ext/standard/fsock.c:1.29 Fri Dec 3 09:57:28 1999 +++ php4/ext/standard/fsock.c Sun Dec 5 11:25:31 1999 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: fsock.c,v 1.29 1999/12/03 14:57:28 sas Exp $ */ +/* $Id: fsock.c,v 1.30 1999/12/05 16:25:31 sas Exp $ */ /* Synced with php3 revision 1.121 1999-06-18 [ssb] */ /* Synced with php3 revision 1.133 1999-07-21 [sas] */ @@ -731,7 +731,7 @@ PHP_MINIT_FUNCTION(fsock) { #ifdef ZTS - fsock_globals_id = ts_allocate_id(sizeof(php_fsock_globals), fsock_globals_ctor, fsock_globals_dtor); + fsock_globals_id = ts_allocate_id(sizeof(php_fsock_globals), (ts_allocate_ctor) fsock_globals_ctor, (ts_allocate_dtor) fsock_globals_dtor); #else fsock_globals_ctor(FLS_C); #endif Index: php4/ext/standard/lcg.c diff -u php4/ext/standard/lcg.c:1.4 php4/ext/standard/lcg.c:1.5 --- php4/ext/standard/lcg.c:1.4 Sun Dec 5 09:16:36 1999 +++ php4/ext/standard/lcg.c Sun Dec 5 11:25:31 1999 @@ -72,7 +72,7 @@ static int php_minit_lcg(INIT_FUNC_ARGS) { #ifdef ZTS - lcg_globals_id = ts_allocate_id(sizeof(php_lcg_globals), lcg_init_globals, NULL); + lcg_globals_id = ts_allocate_id(sizeof(php_lcg_globals), (ts_allocate_ctor) lcg_init_globals, NULL); #else lcg_init_globals(); #endif Index: php4/ext/standard/reg.c diff -u php4/ext/standard/reg.c:1.24 php4/ext/standard/reg.c:1.25 --- php4/ext/standard/reg.c:1.24 Sat Dec 4 14:16:06 1999 +++ php4/ext/standard/reg.c Sun Dec 5 11:25:31 1999 @@ -17,7 +17,7 @@ | Jaakko Hyvätti <jaakko@hyvatti.iki.fi> | +----------------------------------------------------------------------+ */ -/* $Id: reg.c,v 1.24 1999/12/04 19:16:06 sas Exp $ */ +/* $Id: reg.c,v 1.25 1999/12/05 16:25:31 sas Exp $ */ #include <stdio.h> #include "php.h" @@ -105,7 +105,7 @@ static PHP_MINIT_FUNCTION(regex) { #ifdef ZTS - reg_globals_id = ts_allocate_id(sizeof(php_reg_globals), php_reg_init_globals, NULL); + reg_globals_id = ts_allocate_id(sizeof(php_reg_globals), (ts_allocate_ctor) php_reg_init_globals, NULL); #else php_reg_init_globals(&reg_globals); #endif Index: php4/sapi/cgi/cgi_main.c diff -u php4/sapi/cgi/cgi_main.c:1.8 php4/sapi/cgi/cgi_main.c:1.9 --- php4/sapi/cgi/cgi_main.c:1.8 Sat Dec 4 14:16:12 1999 +++ php4/sapi/cgi/cgi_main.c Sun Dec 5 11:25:32 1999 @@ -188,7 +188,7 @@ } -void define_command_line_ini_entry(char *arg) +static void define_command_line_ini_entry(char *arg) { char *name, *value;