From: Amos Jeffries <squid3@treenet.co.nz>
Date: Thu, 4 Aug 2011 06:27:17 +0000 (+1200)
Subject: Kill one goto
X-Git-Tag: take08~55^2~11
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6375a714c18be37dca9f012ddaf0f1b08552423f;p=thirdparty%2Fsquid.git

Kill one goto
---

diff --git a/src/cache_cf.cc b/src/cache_cf.cc
index 7aa27ef049..40f3eb8e2b 100644
--- a/src/cache_cf.cc
+++ b/src/cache_cf.cc
@@ -4108,7 +4108,11 @@ parse_access_log(customlog ** logs)
 
     if (strcmp(filename, "none") == 0) {
         cl->type = Log::Format::CLF_NONE;
-        goto done;
+        aclParseAclList(LegacyParser, &cl->aclList);
+        while (*logs)
+            logs = &(*logs)->next;
+        *logs = cl;
+        return;
     }
 
     if ((logdef_name = strtok(NULL, w_space)) == NULL)
@@ -4156,7 +4160,6 @@ parse_access_log(customlog ** logs)
         return;
     }
 
-done:
     aclParseAclList(LegacyParser, &cl->aclList);
 
     while (*logs)