From owner-svn-src-stable@FreeBSD.ORG  Thu Nov 15 07:48:44 2012
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id D48FD221;
 Thu, 15 Nov 2012 07:48:44 +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 B9BE58FC13;
 Thu, 15 Nov 2012 07:48:44 +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 qAF7mioA045796;
 Thu, 15 Nov 2012 07:48:44 GMT (envelope-from dim@svn.freebsd.org)
Received: (from dim@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qAF7miGp045795;
 Thu, 15 Nov 2012 07:48:44 GMT (envelope-from dim@svn.freebsd.org)
Message-Id: <201211150748.qAF7miGp045795@svn.freebsd.org>
From: Dimitry Andric <dim@FreeBSD.org>
Date: Thu, 15 Nov 2012 07:48:44 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
Subject: svn commit: r243068 - stable/9/sys/dev/xen/netback
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 15 Nov 2012 07:48:44 -0000

Author: dim
Date: Thu Nov 15 07:48:44 2012
New Revision: 243068
URL: http://svnweb.freebsd.org/changeset/base/243068

Log:
  MFC r242889 (by rdivacky):
  
    Change the XNB_ASSERT from a statement expression to do-while(0) as its
    result is never used.
  
  MFC r242934:
  
    Redo r242889, now using the method from projects/amd64_xen_pv r240747.
  
    Reminded by:	kib

Modified:
  stable/9/sys/dev/xen/netback/netback_unit_tests.c
Directory Properties:
  stable/9/sys/   (props changed)
  stable/9/sys/dev/   (props changed)

Modified: stable/9/sys/dev/xen/netback/netback_unit_tests.c
==============================================================================
--- stable/9/sys/dev/xen/netback/netback_unit_tests.c	Thu Nov 15 07:36:38 2012	(r243067)
+++ stable/9/sys/dev/xen/netback/netback_unit_tests.c	Thu Nov 15 07:48:44 2012	(r243068)
@@ -58,8 +58,8 @@ __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) ({						\
@@ -71,7 +71,7 @@ __FBSDID("$FreeBSD$");
 		strlcat(_buffer, ":" TOSTRING(__LINE__) 		\
 		  " Assertion Error: " #cond "\n", _buflen);		\
 	}								\
- ! passed; })
+	})
 
 
 /**