------------------------------------------------------------ revno: 14033 revision-id: squidadm@squid-cache.org-20160420061412-mx9inl21ujvoqqv9 parent: squid3@treenet.co.nz-20160420035404-xvzqgwv3lylr7ook committer: Source Maintenance branch nick: 3.5 timestamp: Wed 2016-04-20 06:14:12 +0000 message: SourceFormat Enforcement ------------------------------------------------------------ # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: squidadm@squid-cache.org-20160420061412-\ # mx9inl21ujvoqqv9 # target_branch: http://bzr.squid-cache.org/bzr/squid3/3.5 # testament_sha1: e95f512c0bd0c32de6f36125281377fcbf688d8b # timestamp: 2016-04-20 06:51:03 +0000 # source_branch: http://bzr.squid-cache.org/bzr/squid3/3.5 # base_revision_id: squid3@treenet.co.nz-20160420035404-\ # xvzqgwv3lylr7ook # # Begin patch === modified file 'tools/cachemgr.cc' --- tools/cachemgr.cc 2016-04-20 03:54:04 +0000 +++ tools/cachemgr.cc 2016-04-20 06:14:12 +0000 @@ -461,12 +461,12 @@ /* disable link if authentication is required and we have no password */ if (!strcmp(p, "protected") && !req->passwd) out.Printf("
  • %s (requires authentication).\n", - d, menu_url(req, "authenticate"), a_url); + d, menu_url(req, "authenticate"), a_url); else /* highlight protected but probably available entries */ if (!strcmp(p, "protected")) out.Printf("
  • %s\n", - a_url, d); + a_url, d); /* public entry or unknown type of protection */ else @@ -529,9 +529,9 @@ } out.Printf("<%s colspan=\"%d\" align=\"%s\">%s", - ttag, column_span, - is_header ? "center" : is_number(cell) ? "right" : "left", - html_quote(cell), ttag); + ttag, column_span, + is_header ? "center" : is_number(cell) ? "right" : "left", + html_quote(cell), ttag); } xfree(buf_copy);