r912 - in trunk/varnish-cache: include lib/libvarnish

[phk at projects.linpro.no]

Author: phk
Date: 2006-08-24 09:10:35 +0200 (Thu, 24 Aug 2006)
New Revision: 912

Modified:
   trunk/varnish-cache/include/libvarnish.h
   trunk/varnish-cache/lib/libvarnish/assert.c
Log:
Give xxxasserts their own backend with a different message.


Modified: trunk/varnish-cache/include/libvarnish.h
===================================================================
--- trunk/varnish-cache/include/libvarnish.h	2006-08-24 06:58:37 UTC (rev 911)
+++ trunk/varnish-cache/include/libvarnish.h	2006-08-24 07:10:35 UTC (rev 912)
@@ -40,10 +40,11 @@
 #define xxxassert(e)							\
 do { 									\
 	if (!(e))							\
-		lbv_assert("XXX:" __func__, __FILE__, __LINE__, #e, errno); \
+		lbv_xxxassert(__func__, __FILE__, __LINE__, #e, errno); \
 } while (0)
 
 void lbv_assert(const char *, const char *, int, const char *, int);
+void lbv_xxxassert(const char *, const char *, int, const char *, int);
 
 /* Assert zero return value */
 #define AZ(foo)	do { assert((foo) == 0); } while (0)

Modified: trunk/varnish-cache/lib/libvarnish/assert.c
===================================================================
--- trunk/varnish-cache/lib/libvarnish/assert.c	2006-08-24 06:58:37 UTC (rev 911)
+++ trunk/varnish-cache/lib/libvarnish/assert.c	2006-08-24 07:10:35 UTC (rev 912)
@@ -10,6 +10,17 @@
 #include "libvarnish.h"
 
 void
+lbv_xxxassert(const char *func, const char *file, int line, const char *cond, int err)
+{
+
+	fprintf(stderr,
+	    "Missing errorhandling code in %s(), %s line %d:\n"
+	    "  Condition(%s) not true.\n"
+	    "  errno = %d (%s)\n", func, file, line, cond, err, strerror(err));
+	abort();
+}
+
+void
 lbv_assert(const char *func, const char *file, int line, const char *cond, int err)
 {