r3672 - branches/2.0/varnish-cache/bin/varnishd

[tfheen at projects.linpro.no]

Author: tfheen
Date: 2009-02-06 14:47:53 +0100 (Fri, 06 Feb 2009)
New Revision: 3672

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



Modified: branches/2.0/varnish-cache/bin/varnishd/cache_panic.c
===================================================================
--- branches/2.0/varnish-cache/bin/varnishd/cache_panic.c	2009-02-06 13:44:13 UTC (rev 3671)
+++ branches/2.0/varnish-cache/bin/varnishd/cache_panic.c	2009-02-06 13:47:53 UTC (rev 3672)
@@ -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