From: Eric Covener <covener@apache.org>
Date: Thu, 5 Jan 2017 18:55:24 +0000 (+0000)
Subject: Fix trivial compiler warnings
X-Git-Tag: 2.2.32~26
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0debbf5faea1b78b6e2b8e5584cce1ca12384b25;p=thirdparty%2Fapache%2Fhttpd.git

Fix trivial compiler warnings

2.2.x patch: http://home.apache.org/~ylavic/patches/httpd-2.2.x-fix_trivial_warnings.patch

Reviewed by: ylavic, covener, wrowe



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1777492 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/modules/cache/mod_cache.c b/modules/cache/mod_cache.c
index 8492374298a..0ee51d5c4d9 100644
--- a/modules/cache/mod_cache.c
+++ b/modules/cache/mod_cache.c
@@ -691,7 +691,6 @@ static int cache_save_filter(ap_filter_t *f, apr_bucket_brigade *in)
          * buckets and use their length to calculate the size
          */
         int all_buckets_here=0;
-        int unresolved_length = 0;
         size=0;
         for (e = APR_BRIGADE_FIRST(in);
              e != APR_BRIGADE_SENTINEL(in);
@@ -702,7 +701,6 @@ static int cache_save_filter(ap_filter_t *f, apr_bucket_brigade *in)
                 break;
             }
             if (APR_BUCKET_IS_FLUSH(e)) {
-                unresolved_length = 1;
                 continue;
             }
             if (e->length == (apr_size_t)-1) {
diff --git a/modules/dav/main/mod_dav.c b/modules/dav/main/mod_dav.c
index 4c5d8924f42..d35dd256277 100644
--- a/modules/dav/main/mod_dav.c
+++ b/modules/dav/main/mod_dav.c
@@ -2473,7 +2473,6 @@ static int dav_method_mkcol(request_rec *r)
     dav_error *err;
     dav_error *err2;
     int result;
-    dav_dir_conf *conf;
     dav_response *multi_status;
 
     /* handle the request body */
@@ -2482,9 +2481,6 @@ static int dav_method_mkcol(request_rec *r)
         return result;
     }
 
-    conf = (dav_dir_conf *)ap_get_module_config(r->per_dir_config,
-                                                &dav_module);
-
     /* Ask repository module to resolve the resource */
     err = dav_get_resource(r, 0 /* label_allowed */, 0 /* use_checked_in */,
                            &resource);
diff --git a/modules/ssl/ssl_engine_kernel.c b/modules/ssl/ssl_engine_kernel.c
index 7c564556b94..a64f707c3ea 100644
--- a/modules/ssl/ssl_engine_kernel.c
+++ b/modules/ssl/ssl_engine_kernel.c
@@ -1796,7 +1796,6 @@ void ssl_callback_DelSessionCacheEntry(SSL_CTX *ctx,
                                        SSL_SESSION *session)
 {
     server_rec *s;
-    SSLSrvConfigRec *sc;
     unsigned char *id;
     unsigned int idlen;
 
@@ -1807,8 +1806,6 @@ void ssl_callback_DelSessionCacheEntry(SSL_CTX *ctx,
         return; /* on server shutdown Apache is already gone */
     }
 
-    sc = mySrvConfig(s);
-
     /*
      * Remove the SSL_SESSION from the inter-process cache
      */