]> git.ipfire.org Git - thirdparty/squid.git/commitdiff
Kill one goto
authorAmos Jeffries <squid3@treenet.co.nz>
Thu, 4 Aug 2011 06:27:17 +0000 (18:27 +1200)
committerAmos Jeffries <squid3@treenet.co.nz>
Thu, 4 Aug 2011 06:27:17 +0000 (18:27 +1200)
src/cache_cf.cc

index 7aa27ef049b0d623b3a45239e4acfab10782e7e1..40f3eb8e2bd7937ae71d8088e265851021b1a4d2 100644 (file)
@@ -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)