Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 12 Nov 2012 22:28:32 +0000 (UTC)
From:      Dimitry Andric <dim@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r242934 - head/sys/dev/xen/netback
Message-ID:  <201211122228.qACMSWbs020517@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: dim
Date: Mon Nov 12 22:28:32 2012
New Revision: 242934
URL: http://svnweb.freebsd.org/changeset/base/242934

Log:
  Redo r242889, now using the method from projects/amd64_xen_pv r240747.
  
  Reminded by:	kib
  MFC after:	3 days

Modified:
  head/sys/dev/xen/netback/netback_unit_tests.c

Modified: head/sys/dev/xen/netback/netback_unit_tests.c
==============================================================================
--- head/sys/dev/xen/netback/netback_unit_tests.c	Mon Nov 12 22:01:29 2012	(r242933)
+++ head/sys/dev/xen/netback/netback_unit_tests.c	Mon Nov 12 22:28:32 2012	(r242934)
@@ -58,11 +58,11 @@ __FBSDID("$FreeBSD$");
 #define	TOSTRING(x) STRINGIFY(x)
 
 /**
- * Writes an error message to buffer if cond is false, and returns true
- * iff the assertion failed.  Note the implied parameters buffer and
+ * Writes an error message to buffer if cond is false
+ * Note the implied parameters buffer and
  * buflen
  */
-#define	XNB_ASSERT(cond) do {						\
+#define	XNB_ASSERT(cond) ({						\
 	int passed = (cond);						\
 	char *_buffer = (buffer);					\
 	size_t _buflen = (buflen);					\
@@ -71,7 +71,7 @@ __FBSDID("$FreeBSD$");
 		strlcat(_buffer, ":" TOSTRING(__LINE__) 		\
 		  " Assertion Error: " #cond "\n", _buflen);		\
 	}								\
-	} while (0)
+	})
 
 
 /**



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201211122228.qACMSWbs020517>