From: Amos Jeffries <squid3@treenet.co.nz>
Date: Sat, 27 Aug 2011 04:02:57 +0000 (-0600)
Subject: Kill one goto
X-Git-Tag: SQUID_3_1_15~21
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9fd7980205996e991306ca881bdb71d5f9d3d4f2;p=thirdparty%2Fsquid.git

Kill one goto
---

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