[master] 50002cc Namespace cleanup: vas_fail -> VAS_Fail

[Poul-Henning Kamp]

commit 50002cc1fcff62d3a0d4366e4a33c93cd8271d58
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Tue May 31 09:30:47 2011 +0000

    Namespace cleanup:  vas_fail -> VAS_Fail

diff --git a/bin/varnishd/cache_panic.c b/bin/varnishd/cache_panic.c
index 66e13c0..22a7fff 100644
--- a/bin/varnishd/cache_panic.c
+++ b/bin/varnishd/cache_panic.c
@@ -364,7 +364,7 @@ void
 PAN_Init(void)
 {
 
-	vas_fail = pan_ic;
+	VAS_Fail = pan_ic;
 	vsp = &vsps;
 	AN(VSB_new(vsp, vsm_head->panicstr, sizeof vsm_head->panicstr,
 	    VSB_FIXEDLEN));
diff --git a/bin/varnishd/cache_vrt.c b/bin/varnishd/cache_vrt.c
index 91f995f..293b072 100644
--- a/bin/varnishd/cache_vrt.c
+++ b/bin/varnishd/cache_vrt.c
@@ -386,7 +386,7 @@ VRT_panic(const struct sess *sp, const char *str, ...)
 	va_start(ap, str);
 	b = VRT_String(sp->http->ws, "PANIC: ", str, ap);
 	va_end(ap);
-	vas_fail("VCL", "", 0, b, 0, 2);
+	VAS_Fail("VCL", "", 0, b, 0, 2);
 }
 
 /*--------------------------------------------------------------------*/
diff --git a/bin/varnishtest/vtc_log.c b/bin/varnishtest/vtc_log.c
index 8ad19e0..c92f13e 100644
--- a/bin/varnishtest/vtc_log.c
+++ b/bin/varnishtest/vtc_log.c
@@ -274,7 +274,7 @@ vtc_hexdump(struct vtclog *vl, unsigned lvl, const char *pfx, const unsigned cha
 /**********************************************************************/
 
 static void
-vtc_log_vas_fail(const char *func, const char *file, int line,
+vtc_log_VAS_Fail(const char *func, const char *file, int line,
     const char *cond, int err, int xxx)
 {
 	struct vtclog *vl;
@@ -293,4 +293,4 @@ vtc_log_vas_fail(const char *func, const char *file, int line,
 	}
 }
 
-vas_f *vas_fail = vtc_log_vas_fail;
+vas_f *VAS_Fail = vtc_log_VAS_Fail;
diff --git a/include/vas.h b/include/vas.h
index 6a4891f..dc2a835 100644
--- a/include/vas.h
+++ b/include/vas.h
@@ -42,7 +42,7 @@
 
 typedef void vas_f(const char *, const char *, int, const char *, int, int);
 
-extern vas_f *vas_fail;
+extern vas_f *VAS_Fail;
 
 #ifdef WITHOUT_ASSERTS
 #define assert(e)	((void)(e))
@@ -50,14 +50,14 @@ extern vas_f *vas_fail;
 #define assert(e)							\
 do {									\
 	if (!(e))							\
-		vas_fail(__func__, __FILE__, __LINE__, #e, errno, 0);	\
+		VAS_Fail(__func__, __FILE__, __LINE__, #e, errno, 0);	\
 } while (0)
 #endif
 
 #define xxxassert(e)							\
 do {									\
 	if (!(e))							\
-		vas_fail(__func__, __FILE__, __LINE__, #e, errno, 1);	\
+		VAS_Fail(__func__, __FILE__, __LINE__, #e, errno, 1);	\
 } while (0)
 
 /* Assert zero return value */
@@ -68,7 +68,7 @@ do {									\
 #define diagnostic(foo)	assert(foo)
 #define WRONG(expl)							\
 do {									\
-	vas_fail(__func__, __FILE__, __LINE__, expl, errno, 3);		\
+	VAS_Fail(__func__, __FILE__, __LINE__, expl, errno, 3);		\
 	abort();							\
 } while (0)
 
diff --git a/lib/libvarnish/assert.c b/lib/libvarnish/assert.c
index 2b74e80..9422cfc 100644
--- a/lib/libvarnish/assert.c
+++ b/lib/libvarnish/assert.c
@@ -38,7 +38,7 @@
 #include "libvarnish.h"
 
 static void
-vas_fail_default(const char *func, const char *file, int line,
+VAS_Fail_default(const char *func, const char *file, int line,
     const char *cond, int err, int xxx)
 {
 
@@ -59,4 +59,4 @@ vas_fail_default(const char *func, const char *file, int line,
 	abort();
 }
 
-vas_f *vas_fail = vas_fail_default;
+vas_f *VAS_Fail = VAS_Fail_default;