[5.2] 7304e20 Actually use the configured VUT error callback

PÃ¥l Hermunn Johansen hermunn at varnish-software.com
Fri Sep 15 11:17:28 UTC 2017


commit 7304e20cde2870898f3cc4493828203e2ab7299c
Author: Dridi Boukelmoune <dridi.boukelmoune at gmail.com>
Date:   Thu Sep 14 01:23:03 2017 +0200

    Actually use the configured VUT error callback

diff --git a/lib/libvarnishapi/vut.c b/lib/libvarnishapi/vut.c
index 9845470..1438195 100644
--- a/lib/libvarnishapi/vut.c
+++ b/lib/libvarnishapi/vut.c
@@ -118,9 +118,12 @@ VUT_Error(struct VUT *vut, int status, const char *fmt, ...)
 {
 	va_list ap;
 
-	assert(status != 0);
+	CHECK_OBJ_NOTNULL(vut, VUT_MAGIC);
+	AN(vut->error_f);
+	AN(status);
+
 	va_start(ap, fmt);
-	vut_error(vut, status, fmt, ap);
+	vut->error_f(vut, status, fmt, ap);
 	va_end(ap);
 }
 


More information about the varnish-commit mailing list