Killing some unused variable warnings

diff --git a/ext/standard/exec.c b/ext/standard/exec.c
index df59f58782924f1b0ad83a726f0ed23e3e54ac09..943d436af57059c11feafa8ee2089b30951a9182 100644 (file)
--- 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 4fce9179bcbd1a27aed5eaa8f13742c497205859..12c6b0bef65a7d2336b4d4725236406a5a2f68c5 100644 (file)
--- 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 299a56c5d6a18e8db05f63c8f338437a30b3db87..72af588d6334ba53448f58f4656cf6a7b9cb1bbf 100644 (file)
--- 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 b7110c9189cc2ee46d0c471cae4da2965eba78f3..0c7baf0f73e7e10ac482200fe95257abf5eb461e 100644 (file)
--- 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 7c917584c42ced4fea86e0cbbb2f796f5c123ab8..08a1ba65bb8adb870f7c62c251dae204ef44d320 100644 (file)
--- 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