cvs: /php4 main.c request_info.c /php4/ext/standard exec.c file.c info.c

sas Wed Nov 24 12:57:02 1999 EDT Modified files: /php4 main.c request_info.c /php4/ext/standard exec.c file.c info.c Log: Killing some unused variable warnings Index: php4/main.c diff -u php4/main.c:1.137 php4/main.c:1.138 --- php4/main.c:1.137 Mon Nov 22 22:10:45 1999 +++ php4/main.c Wed Nov 24 12:56:30 1999 @@ -19,7 +19,7 @@ */ -/* $Id: main.c,v 1.137 1999/11/23 03:10:45 rubys Exp $ */ +/* $Id: main.c,v 1.138 1999/11/24 17:56:30 sas Exp $ */ #include <stdio.h> @@ -293,7 +293,9 @@ { FILE *log_file; PLS_FETCH(); +#if APACHE SLS_FETCH(); +#endif /* Try to use the specified logging location. */ if (PG(error_log) != NULL) { @@ -626,7 +628,6 @@ case ZMSG_MEMORY_LEAK_DETECTED: case ZMSG_MEMORY_LEAK_REPEATED: { ELS_FETCH(); - SLS_FETCH(); if (EG(error_reporting)&E_WARNING) { #if ZEND_DEBUG @@ -786,7 +787,6 @@ { CLS_FETCH(); ELS_FETCH(); - PLS_FETCH(); SLS_FETCH(); sapi_send_headers(); @@ -967,8 +967,6 @@ void php_module_shutdown() { int module_number=0; /* for UNREGISTER_INI_ENTRIES() */ - CLS_FETCH(); - ELS_FETCH(); if (!module_initialized) { return; Index: php4/request_info.c diff -u php4/request_info.c:1.19 php4/request_info.c:1.20 --- php4/request_info.c:1.19 Thu Oct 7 09:23:33 1999 +++ php4/request_info.c Wed Nov 24 12:56:30 1999 @@ -26,8 +26,6 @@ #if CGI_BINARY int php3_init_request_info(void *conf) { - SLS_FETCH(); - request_info.current_user = NULL; request_info.current_user_length = 0; request_info.script_name = getenv("SCRIPT_NAME"); @@ -56,8 +54,10 @@ php3_destroy_request_info()! */ #if DISCARD_PATH if (request_info.script_filename) { + SLS_FETCH(); SG(request_info).path_translated = estrdup(request_info.script_filename); } else { + SLS_FETCH(); SG(request_info).path_translated = NULL; } #endif Index: php4/ext/standard/exec.c diff -u php4/ext/standard/exec.c:1.16 php4/ext/standard/exec.c:1.17 --- php4/ext/standard/exec.c:1.16 Wed Oct 13 10:01:47 1999 +++ php4/ext/standard/exec.c Wed Nov 24 12:56:31 1999 @@ -15,7 +15,7 @@ | Author: Rasmus Lerdorf | +----------------------------------------------------------------------+ */ -/* $Id: exec.c,v 1.16 1999/10/13 14:01:47 thies Exp $ */ +/* $Id: exec.c,v 1.17 1999/11/24 17:56:31 sas Exp $ */ #include <stdio.h> #include "php.h" @@ -145,7 +145,9 @@ if (type == 1) { +#if APACHE SLS_FETCH(); +#endif if (output) PUTS(buf); #if APACHE Index: php4/ext/standard/file.c diff -u php4/ext/standard/file.c:1.42 php4/ext/standard/file.c:1.43 --- php4/ext/standard/file.c:1.42 Wed Nov 24 01:16:37 1999 +++ php4/ext/standard/file.c Wed Nov 24 12:56:31 1999 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: file.c,v 1.42 1999/11/24 06:16:37 evan Exp $ */ +/* $Id: file.c,v 1.43 1999/11/24 17:56:31 sas Exp $ */ /* Synced with php3 revision 1.218 1999-06-16 [ssb] */ @@ -1695,7 +1695,6 @@ } else { pval ***args = (pval ***) emalloc(sizeof(pval **) * ARG_COUNT(ht)); - pval **max, result; int i; if(getParametersArrayEx(ARG_COUNT(ht), args) == FAILURE) { efree(args); Index: php4/ext/standard/info.c diff -u php4/ext/standard/info.c:1.42 php4/ext/standard/info.c:1.43 --- php4/ext/standard/info.c:1.42 Mon Nov 22 14:10:14 1999 +++ php4/ext/standard/info.c Wed Nov 24 12:56:31 1999 @@ -66,7 +66,6 @@ DWORD dwWindowsMinorVersion = (DWORD)(HIBYTE(LOWORD(dwVersion))); #endif ELS_FETCH(); - PLS_FETCH(); SLS_FETCH();