From d462115341636fdf70e786a7d46657d710af3b9e Mon Sep 17 00:00:00 2001
From: Sascha Schumann <sas@php.net>
Date: Wed, 24 Nov 1999 17:56:31 +0000
Subject: [PATCH] Killing some unused variable warnings

---
 ext/standard/exec.c | 2 ++
 ext/standard/file.c | 1 -
 ext/standard/info.c | 1 -
 main/main.c         | 6 ++----
 request_info.c      | 4 ++--
 5 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/ext/standard/exec.c b/ext/standard/exec.c
index df59f58782..943d436af5 100644
--- a/ext/standard/exec.c
+++ b/ext/standard/exec.c
@@ -145,7 +145,9 @@ static int _Exec(int type, char *cmd, pval *array, pval *return_value)
 
 		
 			if (type == 1) {
+#if APACHE
 				SLS_FETCH();
+#endif
 				
 				if (output) PUTS(buf);
 #if APACHE
diff --git a/ext/standard/file.c b/ext/standard/file.c
index 4fce9179bc..12c6b0bef6 100644
--- a/ext/standard/file.c
+++ b/ext/standard/file.c
@@ -1695,7 +1695,6 @@ PHP_FUNCTION(fd_set)
         }
         else {
                 pval ***args = (pval ***) emalloc(sizeof(pval **) * ARG_COUNT(ht));
-                pval **max, result;
                 int i;
                 if(getParametersArrayEx(ARG_COUNT(ht), args) == FAILURE) {
                         efree(args);
diff --git a/ext/standard/info.c b/ext/standard/info.c
index 299a56c5d6..72af588d63 100644
--- a/ext/standard/info.c
+++ b/ext/standard/info.c
@@ -66,7 +66,6 @@ PHPAPI void php_print_info(int flag)
 	DWORD dwWindowsMinorVersion =  (DWORD)(HIBYTE(LOWORD(dwVersion)));
 #endif
 	ELS_FETCH();
-	PLS_FETCH();
 	SLS_FETCH();
 
 	
diff --git a/main/main.c b/main/main.c
index b7110c9189..0c7baf0f73 100644
--- a/main/main.c
+++ b/main/main.c
@@ -293,7 +293,9 @@ void php3_log_err(char *log_message)
 {
 	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 @@ static void php_message_handler_for_zend(long message, void *data)
 		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 @@ void php_request_shutdown(void *dummy)
 {
 	CLS_FETCH();
 	ELS_FETCH();
-	PLS_FETCH();
 	SLS_FETCH();
 
 	sapi_send_headers();
@@ -967,8 +967,6 @@ int php_module_shutdown_wrapper(sapi_module_struct *sapi_globals)
 void php_module_shutdown()
 {
 	int module_number=0;	/* for UNREGISTER_INI_ENTRIES() */
-	CLS_FETCH();
-	ELS_FETCH();
 
 	if (!module_initialized) {
 		return;
diff --git a/request_info.c b/request_info.c
index 7c917584c4..08a1ba65bb 100644
--- a/request_info.c
+++ b/request_info.c
@@ -26,8 +26,6 @@ PHPAPI php3_request_info request_info;
 #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 @@ int php3_init_request_info(void *conf)
 	   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
-- 
2.40.0