[master] 8790bec16 Move vtc.panic to STRANDS
Dridi Boukelmoune
dridi.boukelmoune at gmail.com
Wed Jul 3 16:50:09 UTC 2019
commit 8790bec16d68c2098dc99d9ed27819d24759648c
Author: Dridi Boukelmoune <dridi.boukelmoune at gmail.com>
Date: Wed Jul 3 17:57:12 2019 +0200
Move vtc.panic to STRANDS
diff --git a/lib/libvmod_vtc/vmod.vcc b/lib/libvmod_vtc/vmod.vcc
index ccff7b654..51154f366 100644
--- a/lib/libvmod_vtc/vmod.vcc
+++ b/lib/libvmod_vtc/vmod.vcc
@@ -70,7 +70,7 @@ $Function IP no_ip()
Returns a null IP address, not even a bogo_ip.
-$Function VOID panic(STRING_LIST)
+$Function VOID panic(STRANDS)
It can be useful to crash the child process in order to test the robustness
of a VMOD.
diff --git a/lib/libvmod_vtc/vmod_vtc.c b/lib/libvmod_vtc/vmod_vtc.c
index c67b115eb..d349e565f 100644
--- a/lib/libvmod_vtc/vmod_vtc.c
+++ b/lib/libvmod_vtc/vmod_vtc.c
@@ -99,16 +99,13 @@ vmod_no_ip(VRT_CTX)
/*--------------------------------------------------------------------*/
VCL_VOID v_matchproto_(td_vtc_panic)
-vmod_panic(VRT_CTX, const char *str, ...)
+vmod_panic(VRT_CTX, VCL_STRANDS str)
{
- va_list ap;
const char *b;
CHECK_OBJ_NOTNULL(ctx, VRT_CTX_MAGIC);
- va_start(ap, str);
- b = VRT_String(ctx->ws, "PANIC: ", str, ap);
- va_end(ap);
+ b = VRT_StrandsWS(ctx->ws, "PANIC:", str);
VAS_Fail("VCL", "", 0, b, VAS_VCL);
}
More information about the varnish-commit
mailing list