fixups for remaining current warnings

Submitted by:	Chuck Murcko

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

diff --git a/modules/proxy/proxy_connect.c b/modules/proxy/proxy_connect.c
index db7d3a09669097bdb779cf381928761d420eaf65..bc2b101806640fb15eeecfbbbe36433da2ede58f 100644 (file)
--- a/modules/proxy/proxy_connect.c
+++ b/modules/proxy/proxy_connect.c
@@ -115,15 +115,15 @@ int ap_proxy_connect_handler(request_rec *r, ap_cache_el  *c, char *url,
               const char *proxyhost, int proxyport)
 {
     struct in_addr destaddr;
-    const char *host, *err;
+    const char *host;
     char *p;
     int port;
     ap_socket_t *sock;
     char buffer[HUGE_STRING_LEN];
-    int nbytes, i, j;
+    int nbytes, i;
 
     BUFF *sock_buff;
-    ap_socket_t *client_sock;
+    ap_socket_t *client_sock=NULL;
     ap_pollfd_t *pollfd;
     ap_int32_t pollcnt;
     ap_int16_t pollevent;

diff --git a/modules/proxy/proxy_ftp.c b/modules/proxy/proxy_ftp.c
index e4cac26ba1ba93b66af12271dd8aa31457ab646d..7bf446d43b5db453e6e19d2c993c83a9eb5da7d6 100644 (file)
--- a/modules/proxy/proxy_ftp.c
+++ b/modules/proxy/proxy_ftp.c
@@ -460,12 +460,11 @@ static int ftp_unauthorized (request_rec *r, int log_it)
  */
 int ap_proxy_ftp_handler(request_rec *r, ap_cache_el  *c, char *url)
 {
-    char *host, *path, *strp, *parms, *server_addr;
+    char *host, *path, *strp, *parms;
     char *cwd = NULL;
     char *user = NULL;
 /*    char *account = NULL; how to supply an account in a URL? */
     const char *password = NULL;
-    const char *err;
     ap_socket_t *sock, *dsock, *inc;
     int port, i, j, len, rc, nocache = 0;
     ap_socket_t *csd;
@@ -485,9 +484,7 @@ int ap_proxy_ftp_handler(request_rec *r, ap_cache_el  *c, char *url)
 
 /* stuff for PASV mode */
     unsigned int presult, h0, h1, h2, h3, p0, p1;
-    unsigned int paddr;
     unsigned short pport;
-    struct sockaddr_in data_addr;
     int pasvmode = 0;
     char pasv[64];
     char *pstr, dates[AP_RFC822_DATE_LEN];

diff --git a/modules/proxy/proxy_http.c b/modules/proxy/proxy_http.c
index 712c86f1f8d5da026c6aa7a47770787ff110af5d..800734f5c4b9f33692b3307fdc7764ca289791f9 100644 (file)
--- a/modules/proxy/proxy_http.c
+++ b/modules/proxy/proxy_http.c
@@ -172,15 +172,14 @@ int ap_proxy_http_handler(request_rec *r, ap_cache_el  *c, char *url,
 {
     const char *strp;
     char *strp2;
-    const char *err, *desthost;
+    const char *desthost;
     ap_socket_t *sock;
-    int i, j, len, backasswards, content_length=-1;
+    int i, len, backasswards, content_length=-1;
     ap_array_header_t *reqhdrs_arr;
-    ap_table_t *resp_hdrs;
+    ap_table_t *resp_hdrs=NULL;
     ap_table_entry_t *reqhdrs;
     struct sockaddr_in server;
     struct in_addr destaddr;
-    struct hostent server_hp;
     BUFF *f, *cachefp=NULL;
     char buffer[HUGE_STRING_LEN];
     char portstr[32];
@@ -456,7 +455,8 @@ int ap_proxy_http_handler(request_rec *r, ap_cache_el  *c, char *url,
         ap_bwrite(r->connection->client, buffer, len, &cntr);
         if (cachefp && ap_bwrite(cachefp, buffer, len, &cntr) != len) {
             ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
-                          "proxy: error writing extra data to cache");
+                          "proxy: error writing extra data to cache %ld",
+                          (long)cachefp);
             ap_proxy_cache_error(&c);
         }
     }

diff --git a/modules/proxy/proxy_util.c b/modules/proxy/proxy_util.c
index b2fb14db170b3573173bf6af313f54f65ca2cf62..0e68a72fe8cbbe8181442f2fcf0f6350a004474e 100644 (file)
--- a/modules/proxy/proxy_util.c
+++ b/modules/proxy/proxy_util.c
@@ -496,9 +496,8 @@ long int ap_proxy_send_fb(proxy_completion *completion, BUFF *f, request_rec *r,
     int  ok;
     char buf[IOBUFSIZE];
     long total_bytes_rcvd, in_buffer;
-    proxy_server_conf *conf = (proxy_server_conf *) ap_get_module_config(r->server->module_config, &proxy_module);
     ap_ssize_t cntr;
-    register int n, o, w;
+    register int n, o;
     conn_rec *con = r->connection;
     int alternate_timeouts = 1;    /* 1 if we alternate between soft & hard timeouts */
     BUFF *cachefp = NULL;