Commit 9511f5b9 authored by Tollef Fog Heen's avatar Tollef Fog Heen

Merge r3479: Use VCC_Return_Name() instead of rolling our own.



git-svn-id: http://www.varnish-cache.org/svn/branches/2.0@3672 d4fa192b-c00b-0410-8231-f00ffab90ce4
parent 6bdb6128
...@@ -40,6 +40,7 @@ ...@@ -40,6 +40,7 @@
#include "cache.h" #include "cache.h"
#include "cache_backend.h" #include "cache_backend.h"
#include "vcl.h" #include "vcl.h"
#include "libvcl.h"
/* /*
* The panic string is constructed in memory, then copied to the * The panic string is constructed in memory, then copied to the
...@@ -214,16 +215,7 @@ pan_sess(const struct sess *sp) ...@@ -214,16 +215,7 @@ pan_sess(const struct sess *sp)
/*lint -restore */ /*lint -restore */
default: stp = NULL; default: stp = NULL;
} }
switch (sp->handling) { hand = VCC_Return_Name(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;
}
if (stp != NULL) if (stp != NULL)
vsb_printf(vsp, " step = %s,\n", stp); vsb_printf(vsp, " step = %s,\n", stp);
else else
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment