r3479 - trunk/varnish-cache/bin/varnishd

[phk at projects.linpro.no]

Author: phk
Date: 2008-12-21 11:47:09 +0100 (Sun, 21 Dec 2008)
New Revision: 3479

Modified:
   trunk/varnish-cache/bin/varnishd/cache_panic.c
Log:
Use VCC_Return_Name() instead of rolling our own.



Modified: trunk/varnish-cache/bin/varnishd/cache_panic.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_panic.c	2008-12-21 10:46:34 UTC (rev 3478)
+++ trunk/varnish-cache/bin/varnishd/cache_panic.c	2008-12-21 10:47:09 UTC (rev 3479)
@@ -40,6 +40,7 @@
 #include "cache.h"
 #include "cache_backend.h"
 #include "vcl.h"
+#include "libvcl.h"
 
 /*
  * The panic string is constructed in memory, then copied to the
@@ -214,16 +215,7 @@
 /*lint -restore */
 		default: stp = NULL;
 	}
-	switch (sp->handling) {
-/*lint -save -e525 */
-#define VCL_RET_MAC(l, u, b, v) case VCL_RET_##u: hand = #u; break;
-#define VCL_RET_MAC_E(l, u, b, v) case VCL_RET_##u: hand = #u; break;
-#include "vcl_returns.h"
-#undef VCL_RET_MAC
-#undef VCL_RET_MAC_E
-/*lint -restore */
-		default: hand = NULL;
-	}
+	hand = VCC_Return_Name(sp->handling);
 	if (stp != NULL)
 		vsb_printf(vsp, "  step = %s,\n", stp);
 	else