From owner-p4-projects@FreeBSD.ORG  Fri May 11 18:26:53 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id D5C4C16A405; Fri, 11 May 2007 18:26:52 +0000 (UTC)
X-Original-To: perforce@FreeBSD.org
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id A7C7116A400
	for <perforce@FreeBSD.org>; Fri, 11 May 2007 18:26:52 +0000 (UTC)
	(envelope-from fli@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.freebsd.org (Postfix) with ESMTP id 96F7213C457
	for <perforce@FreeBSD.org>; Fri, 11 May 2007 18:26:52 +0000 (UTC)
	(envelope-from fli@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l4BIQqRm011718
	for <perforce@FreeBSD.org>; Fri, 11 May 2007 18:26:52 GMT
	(envelope-from fli@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4BIQqrU011714
	for perforce@freebsd.org; Fri, 11 May 2007 18:26:52 GMT
	(envelope-from fli@FreeBSD.org)
Date: Fri, 11 May 2007 18:26:52 GMT
Message-Id: <200705111826.l4BIQqrU011714@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	fli@FreeBSD.org using -f
From: Fredrik Lindberg <fli@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 119680 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 11 May 2007 18:26:53 -0000

http://perforce.freebsd.org/chv.cgi?CH=119680

Change 119680 by fli@fli_genesis on 2007/05/11 18:26:40

	Fix faulty assert logic.

Affected files ...

.. //depot/projects/soc2007/fli-mdns_sd/mdnsd/stack_buf.c#4 edit
.. //depot/projects/soc2007/fli-mdns_sd/mdnsd/stack_packet.c#4 edit

Differences ...

==== //depot/projects/soc2007/fli-mdns_sd/mdnsd/stack_buf.c#4 (text+ko) ====

@@ -44,9 +44,7 @@
 {
 	struct mdns_bufpool *bp;
 
-	assert((lock != NULL && unlock == NULL) ||
-		(lock == NULL && unlock != NULL) ||
-		(lock == NULL && unlock == NULL));
+	assert((lock == NULL && unlock == NULL) || (lock != unlock));
 
 	bp = malloc(sizeof(struct mdns_bufpool));
 	bzero(bp, sizeof(struct mdns_bufpool));

==== //depot/projects/soc2007/fli-mdns_sd/mdnsd/stack_packet.c#4 (text+ko) ====

@@ -121,9 +121,7 @@
 	int flags, md_lock lock, md_unlock unlock, void *arg)
 {
 
-	assert((lock != NULL && unlock == NULL) ||
-		(lock == NULL && unlock != NULL) ||
-		(lock == NULL && unlock == NULL));
+	assert((lock == NULL && unlock == NULL) || (lock != unlock));
 
 	pc->pc_md = md;
 	pc->pc_lock = lock;