clean up a bunch of -Wall/etc warnings

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84698 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/modules/http/http_protocol.c b/modules/http/http_protocol.c
index bf6ee4aaf623e8e5020e450b557c058c9aaeba48..6de0aada38dcc0931526c33ca7d2d6e157142a7c 100644 (file)
--- a/modules/http/http_protocol.c
+++ b/modules/http/http_protocol.c
@@ -2015,10 +2015,10 @@ API_EXPORT(int) ap_discard_request_body(request_rec *r)
  */
 API_EXPORT(long) ap_send_fd(ap_file_t *fd, request_rec *r)
 {
-    ap_status_t rv;
     long len = r->finfo.size;
 #ifdef HAVE_SENDFILE
     if (!r->chunked) {
+       ap_status_t rv;
         ap_bsetopt(r->connection->client, BO_TIMEOUT,
                    r->connection->keptalive
                    ? &r->server->keep_alive_timeout

diff --git a/server/log.c b/server/log.c
index 52c84743a8c32647e85d6bfcfb1179ed45b2de8e..ccac63bbfbb691f3ebbbc531360326956629a6a3 100644 (file)
--- a/server/log.c
+++ b/server/log.c
@@ -67,6 +67,7 @@
 #include "ap_config.h"
 #include "apr_lib.h"
 #include "apr_portable.h"
+#include "apr_config.h"                /* XXX for ap_signal?? */
 #include "httpd.h"
 #include "http_config.h"
 #include "http_core.h"

diff --git a/server/mpm/prefork/prefork.c b/server/mpm/prefork/prefork.c
index cfa45341e0a2373739788844b001cca5d50ab081..7369755a7ba81340c8bc0a21e6944ab8e2e29c11 100644 (file)
--- a/server/mpm/prefork/prefork.c
+++ b/server/mpm/prefork/prefork.c
@@ -89,6 +89,7 @@
 
 #include "ap_config.h"
 #include "apr_portable.h"
+#include "apr_config.h"                /* XXX: for ap_signal?? */
 #include "httpd.h"
 #include "mpm_default.h"
 #include "mpm_status.h"
@@ -909,9 +910,10 @@ static ap_shmem_t *scoreboard_shm = NULL;
 
 static ap_status_t cleanup_shared_mem(void *d)
 {
-    mm_free(scoreboard_shm, ap_scoreboard_image);
+    ap_shm_free(scoreboard_shm, ap_scoreboard_image);
     ap_scoreboard_image = NULL;
     ap_shm_destroy(scoreboard_shm);
+    return APR_SUCCESS;
 }
 
 static void setup_shared_mem(ap_context_t *p)
@@ -1379,7 +1381,7 @@ static void restart(int sig)
        return;
     }
     restart_pending = 1;
-    if (is_graceful = sig == SIGUSR1) {
+    if ((is_graceful = (sig == SIGUSR1))) {
         ap_kill_cleanup(pconf, NULL, cleanup_shared_mem);
     }
 }

diff --git a/server/util.c b/server/util.c
index 19cdecf93dc58ab671badab31235f776a6c45ae7..3acf2bb9fe8d4d25758b923912d51f3c608a0cae 100644 (file)
--- a/server/util.c
+++ b/server/util.c
@@ -71,6 +71,7 @@
 #define CORE_PRIVATE
 
 #include "ap_config.h"
+#include "ap.h"
 #include "httpd.h"
 #include "http_main.h"
 #include "http_log.h"