From owner-svn-src-head@FreeBSD.ORG  Mon Nov 12 22:28:32 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 9B848C7C;
 Mon, 12 Nov 2012 22:28:32 +0000 (UTC) (envelope-from dim@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 7F7BB8FC16;
 Mon, 12 Nov 2012 22:28:32 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qACMSW3q020518;
 Mon, 12 Nov 2012 22:28:32 GMT (envelope-from dim@svn.freebsd.org)
Received: (from dim@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qACMSWbs020517;
 Mon, 12 Nov 2012 22:28:32 GMT (envelope-from dim@svn.freebsd.org)
Message-Id: <201211122228.qACMSWbs020517@svn.freebsd.org>
From: Dimitry Andric <dim@FreeBSD.org>
Date: Mon, 12 Nov 2012 22:28:32 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r242934 - head/sys/dev/xen/netback
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 12 Nov 2012 22:28:32 -0000

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)
+	})
 
 
 /**