From: Francesco Chemolli <kinkie@squid-cache.org>
Date: Wed, 12 Feb 2014 09:19:06 +0000 (+0100)
Subject: Streamline storeLateRelease
X-Git-Tag: SQUID_3_5_0_1~375^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=24b14da9b488d51602b6d0b3e938e7ae685e5539;p=thirdparty%2Fsquid.git

Streamline storeLateRelease
---

diff --git a/src/store.cc b/src/store.cc
index dc12c28477..c0933b829b 100644
--- a/src/store.cc
+++ b/src/store.cc
@@ -1282,7 +1282,6 @@ static void
 storeLateRelease(void *unused)
 {
     StoreEntry *e;
-    int i;
     static int n = 0;
 
     if (StoreController::store_dirs_rebuilding) {
@@ -1291,20 +1290,15 @@ storeLateRelease(void *unused)
     }
 
     // TODO: this works but looks unelegant.
-    for (i = 0; i < 10; ++i) {
+    for (int i = 0; i < 10; ++i) {
         if (LateReleaseStack.empty()) {
-            e = NULL;
+            debugs(20, DBG_IMPORTANT, "storeLateRelease: released " << n << " objects");
+            return;
         } else {
             e = LateReleaseStack.top();
             LateReleaseStack.pop();
         }
 
-        if (e == NULL) {
-            /* done! */
-            debugs(20, DBG_IMPORTANT, "storeLateRelease: released " << n << " objects");
-            return;
-        }
-
         e->unlock("storeLateRelease");
         ++n;
     }