Add parenthesis for legibility and correcting association,

and axe an unused variable

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

diff --git a/modules/cache/cache_util.c b/modules/cache/cache_util.c
index ad838db1b14b6c903ce50a2b55e7d9d7aa4c608c..81ce371d28b9b2e2804de969324bb02d15523e6f 100644 (file)
--- a/modules/cache/cache_util.c
+++ b/modules/cache/cache_util.c
@@ -246,8 +246,8 @@ CACHE_DECLARE(apr_status_t) ap_cache_try_lock(cache_server_conf *conf,
                      lockname);
         return status;
     }
-    if (APR_SUCCESS == status && ((now - finfo.mtime) > conf->lockmaxage)
-            || (now < finfo.mtime)) {
+    if ((status == APR_SUCCESS) && (((now - finfo.mtime) > conf->lockmaxage)
+                                  || (now < finfo.mtime))) {
         ap_log_error(APLOG_MARK, APLOG_INFO, status, r->server,
                      "Cache lock file for '%s' too old, removing: %s",
                      r->uri, lockname);
@@ -311,7 +311,6 @@ CACHE_DECLARE(apr_status_t) ap_cache_remove_lock(cache_server_conf *conf,
     apr_pool_userdata_get(&dummy, CACHE_LOCKNAME_KEY, r->pool);
     lockname = (const char *)dummy;
     if (!lockname) {
-        const char *path;
         char dir[5];
 
         /* create the key if it doesn't exist */