r3517 - trunk/varnish-cache/bin/varnishd

[phk at projects.linpro.no]

Author: phk
Date: 2009-01-18 16:14:54 +0100 (Sun, 18 Jan 2009)
New Revision: 3517

Modified:
   trunk/varnish-cache/bin/varnishd/cache_ban.c
Log:
Don't list gone bans.

Emit && \ for line continuation.



Modified: trunk/varnish-cache/bin/varnishd/cache_ban.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_ban.c	2009-01-18 14:54:41 UTC (rev 3516)
+++ trunk/varnish-cache/bin/varnishd/cache_ban.c	2009-01-18 15:14:54 UTC (rev 3517)
@@ -518,14 +518,16 @@
 	Lck_Unlock(&ban_mtx);
 
 	VTAILQ_FOREACH(b, &ban_head, list) {
+		if (b->flags & BAN_F_GONE)
+			continue;
 		bt = VTAILQ_FIRST(&b->tests);
-		cli_out(cli, "%5u %4s\t%s\n",
-		    b->refcount, b->flags ? "Gone" : "", bt->test);
+		cli_out(cli, "%5u\t%s", b->refcount, bt->test);
 		do {
 			bt = VTAILQ_NEXT(bt, list);
 			if (bt != NULL)
-				cli_out(cli, "\t\t%s\n", bt->test);
+				cli_out(cli, " && \\\n\t%s", bt->test);
 		} while (bt != NULL);
+		cli_out(cli, "\n");
 	}
 
 	Lck_Lock(&ban_mtx);