r2387 - trunk/varnish-cache/lib/libvarnish

des at projects.linpro.no des at projects.linpro.no
Fri Jan 25 17:00:42 CET 2008


Author: des
Date: 2008-01-25 17:00:42 +0100 (Fri, 25 Jan 2008)
New Revision: 2387

Modified:
   trunk/varnish-cache/lib/libvarnish/assert.c
Log:
Don't print strerror(errno) unless errno != 0.


Modified: trunk/varnish-cache/lib/libvarnish/assert.c
===================================================================
--- trunk/varnish-cache/lib/libvarnish/assert.c	2008-01-25 15:38:18 UTC (rev 2386)
+++ trunk/varnish-cache/lib/libvarnish/assert.c	2008-01-25 16:00:42 UTC (rev 2387)
@@ -42,8 +42,11 @@
 
 	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));
+	    "  Condition(%s) not true.\n",
+	    func, file, line, cond);
+	if (err)
+		fprintf(stderr,
+		    "  errno = %d (%s)\n", err, strerror(err));
 	abort();
 }
 
@@ -53,7 +56,10 @@
 
 	fprintf(stderr,
 	    "Assert error in %s(), %s line %d:\n"
-	    "  Condition(%s) not true.\n"
-	    "  errno = %d (%s)\n", func, file, line, cond, err, strerror(err));
+	    "  Condition(%s) not true.\n",
+	    func, file, line, cond);
+	if (err)
+		fprintf(stderr,
+		    "  errno = %d (%s)\n", err, strerror(err));
 	abort();
 }




More information about the varnish-commit mailing list