Improvements found by cppcheck:

remove some unused variables and dead assignments, reduce the scope of some
variables, add some parens to improve readability


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

9 files changed, 7 insertions, 16 deletions

diff --git a/modules/aaa/mod_auth_digest.c b/modules/aaa/mod_auth_digest.c
index 81b884f5f9..f9f0227233 100644
--- a/modules/aaa/mod_auth_digest.c
+++ b/modules/aaa/mod_auth_digest.c
@@ -1260,10 +1260,8 @@ static void note_digest_auth_failure(request_rec *r,
                                      digest_header_rec *resp, int stale)
 {
     const char   *qop, *opaque, *opaque_param, *domain, *nonce;
-    int           cnt;
 
     /* Setup qop */
-
     if (conf->qop_list[0] == NULL) {
         qop = ", qop=\"auth\"";
     }
@@ -1271,6 +1269,7 @@ static void note_digest_auth_failure(request_rec *r,
         qop = "";
     }
     else {
+        int cnt;
         qop = apr_pstrcat(r->pool, ", qop=\"", conf->qop_list[0], NULL);
         for (cnt = 1; conf->qop_list[cnt] != NULL; cnt++) {
             qop = apr_pstrcat(r->pool, qop, ",", conf->qop_list[cnt], NULL);
diff --git a/modules/cache/mod_socache_shmcb.c b/modules/cache/mod_socache_shmcb.c
index ddc6d147d9..648a38fbbb 100644
--- a/modules/cache/mod_socache_shmcb.c
+++ b/modules/cache/mod_socache_shmcb.c
@@ -561,7 +561,7 @@ static void socache_shmcb_status(ap_socache_instance_t *ctx,
     server_rec *s = r->server;
     SHMCBHeader *header = ctx->header;
     unsigned int loop, total = 0, cache_total = 0, non_empty_subcaches = 0;
-    apr_time_t idx_expiry, min_expiry = 0, max_expiry = 0, average_expiry = 0;
+    apr_time_t idx_expiry, min_expiry = 0, max_expiry = 0;
     apr_time_t now = apr_time_now();
     double expiry_total = 0;
     int index_pct, cache_pct;
@@ -599,7 +599,7 @@ static void socache_shmcb_status(ap_socache_instance_t *ctx,
     ap_rprintf(r, "subcaches: <b>%d</b>, indexes per subcache: <b>%d</b><br>",
                header->subcache_num, header->index_num);
     if (non_empty_subcaches) {
-        average_expiry = (apr_time_t)(expiry_total / (double)non_empty_subcaches);
+        apr_time_t average_expiry = (apr_time_t)(expiry_total / (double)non_empty_subcaches);
         ap_rprintf(r, "time left on oldest entries' objects: ");
         if (now < average_expiry)
             ap_rprintf(r, "avg: <b>%d</b> seconds, (range: %d...%d)<br>",
diff --git a/modules/dav/main/mod_dav.c b/modules/dav/main/mod_dav.c
index 42d3abaa75..1b18cb2833 100644
--- a/modules/dav/main/mod_dav.c
+++ b/modules/dav/main/mod_dav.c
@@ -2342,7 +2342,7 @@ static int dav_method_proppatch(request_rec *r)
 
         /* Ignore children that are not set/remove */
         if (child->ns != APR_XML_NS_DAV_ID
-            || (!(is_remove = strcmp(child->name, "remove") == 0)
+            || (!(is_remove = (strcmp(child->name, "remove") == 0))
                 && strcmp(child->name, "set") != 0)) {
             continue;
         }
diff --git a/modules/debugging/mod_dumpio.c b/modules/debugging/mod_dumpio.c
index 901e34085f..3a6a329325 100644
--- a/modules/debugging/mod_dumpio.c
+++ b/modules/debugging/mod_dumpio.c
@@ -69,14 +69,13 @@ static void dumpit(ap_filter_t *f, apr_bucket *b, dumpio_conf_t *ptr)
 #endif
         const char *buf;
         apr_size_t nbytes;
-        apr_size_t logbytes;
         apr_status_t rv = apr_bucket_read(b, &buf, &nbytes, APR_BLOCK_READ);
 
         if (rv == APR_SUCCESS)
         {
             while (nbytes)
             {
-                logbytes = nbytes;
+                apr_size_t logbytes = nbytes;
                 if (logbytes > dumpio_MAX_STRING_LEN)
                     logbytes = dumpio_MAX_STRING_LEN;
                 nbytes -= logbytes;
diff --git a/modules/filters/mod_filter.c b/modules/filters/mod_filter.c
index eb81bffb67..5dd394332a 100644
--- a/modules/filters/mod_filter.c
+++ b/modules/filters/mod_filter.c
@@ -135,11 +135,11 @@ static int filter_lookup(ap_filter_t *f, ap_filter_rec_t *filter)
     ap_filter_provider_t *provider;
     int match;
     const char *err = NULL;
-    unsigned int proto_flags;
     request_rec *r = f->r;
     harness_ctx *ctx = f->ctx;
     provider_ctx *pctx;
 #ifndef NO_PROTOCOL
+    unsigned int proto_flags;
     mod_filter_ctx *rctx = ap_get_module_config(r->request_config,
                                                 &filter_module);
 #endif
diff --git a/modules/mappers/mod_rewrite.c b/modules/mappers/mod_rewrite.c
index 27b7cd7d23..a5bd3520e8 100644
--- a/modules/mappers/mod_rewrite.c
+++ b/modules/mappers/mod_rewrite.c
@@ -1333,7 +1333,7 @@ static char *lookup_map_dbd(request_rec *r, char *key, const char *label)
                       "rewritemap: error %s querying for %s", errmsg, key);
         return NULL;
     }
-    while (rv = apr_dbd_get_row(db->driver, r->pool, res, &row, -1), rv == 0) {
+    while ((rv = apr_dbd_get_row(db->driver, r->pool, res, &row, -1)) == 0) {
         ++n;
         if (ret == NULL) {
             ret = apr_dbd_get_entry(db->driver, row, 0);
diff --git a/support/ab.c b/support/ab.c
index 601fadc8cc..903bb2b2cb 100644
--- a/support/ab.c
+++ b/support/ab.c
@@ -509,7 +509,6 @@ static int ssl_rand_choosenum(int l, int h)
 
 static void ssl_rand_seed(void)
 {
-    int nDone = 0;
     int n, l;
     time_t t;
     pid_t pid;
@@ -521,7 +520,6 @@ static void ssl_rand_seed(void)
     t = time(NULL);
     l = sizeof(time_t);
     RAND_seed((unsigned char *)&t, l);
-    nDone += l;
 
     /*
      * seed in the current process id (usually just 4 bytes)
@@ -529,14 +527,12 @@ static void ssl_rand_seed(void)
     pid = getpid();
     l = sizeof(pid_t);
     RAND_seed((unsigned char *)&pid, l);
-    nDone += l;
 
     /*
      * seed in some current state of the run-time stack (128 bytes)
      */
     n = ssl_rand_choosenum(0, sizeof(stackdata)-128-1);
     RAND_seed(stackdata+n, 128);
-    nDone += 128;
 }
 
 static int ssl_print_connection_info(BIO *bio, SSL *ssl)
diff --git a/support/suexec.c b/support/suexec.c
index d25ca8430e..ae17a77fcc 100644
--- a/support/suexec.c
+++ b/support/suexec.c
@@ -239,7 +239,6 @@ int main(int argc, char *argv[])
     char *target_homedir;   /* target home directory     */
     char *actual_uname;     /* actual user name          */
     char *actual_gname;     /* actual group name         */
-    char *prog;             /* name of this program      */
     char *cmd;              /* command to be executed    */
     char cwd[AP_MAXPATH];   /* current working directory */
     char dwd[AP_MAXPATH];   /* docroot working directory */
@@ -253,7 +252,6 @@ int main(int argc, char *argv[])
      */
     clean_env();
 
-    prog = argv[0];
     /*
      * Check existence/validity of the UID of the user
      * running this program.  Error out if invalid.
diff --git a/support/win32/ApacheMonitor.c b/support/win32/ApacheMonitor.c
index 96beb17b28..0e8a23ebe7 100644
--- a/support/win32/ApacheMonitor.c
+++ b/support/win32/ApacheMonitor.c
@@ -1299,7 +1299,6 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT message,
 
         case WM_TIMER_REFRESH:
         {
-            int nPrev = 0, nNew = 0;
             EnterCriticalSection(&g_stcSection);
             if (g_bRescanServices)
             {