]> git.ipfire.org Git - thirdparty/squid.git/commitdiff
Streamline storeLateRelease
authorFrancesco Chemolli <kinkie@squid-cache.org>
Wed, 12 Feb 2014 09:19:06 +0000 (10:19 +0100)
committerFrancesco Chemolli <kinkie@squid-cache.org>
Wed, 12 Feb 2014 09:19:06 +0000 (10:19 +0100)
src/store.cc

index dc12c284775747633bb1a992fb6495b0e067ce68..c0933b829b5b970f43cd7d2048a90a68d488333a 100644 (file)
@@ -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;
     }