From owner-p4-projects@FreeBSD.ORG  Wed Jan 31 11:05:18 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 169EE16A402; Wed, 31 Jan 2007 11:05:18 +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 D71D316A416
	for <perforce@freebsd.org>; Wed, 31 Jan 2007 11:05:17 +0000 (UTC)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.freebsd.org (Postfix) with ESMTP id C4E6C13C467
	for <perforce@freebsd.org>; Wed, 31 Jan 2007 11:05:17 +0000 (UTC)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l0VB5HP9020005
	for <perforce@freebsd.org>; Wed, 31 Jan 2007 11:05:17 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0VB5Hhj020002
	for perforce@freebsd.org; Wed, 31 Jan 2007 11:05:17 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Wed, 31 Jan 2007 11:05:17 GMT
Message-Id: <200701311105.l0VB5Hhj020002@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 113754 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: Wed, 31 Jan 2007 11:05:18 -0000

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

Change 113754 by rwatson@rwatson_cinnamon on 2007/01/31 11:04:54

	When testing the setzbuf ioctl and a failure is supposed to have
	occurred, check that the setzbuf ioctl didn't set the buffer, rather
	than that it did set the buffer.

Affected files ...

.. //depot/projects/zcopybpf/utils/zbuf_ioctl/zbuf_ioctl.c#3 edit

Differences ...

==== //depot/projects/zcopybpf/utils/zbuf_ioctl/zbuf_ioctl.c#3 (text+ko) ====

@@ -151,11 +151,19 @@
 	if (ret < 0)
 		err(-1, "bpf_test_setzbuf(%s): bpf_getzbuf() to confirm "
 		    "results failed", desc);
-	if (bufa_check != bufa || bufb_check != bufb ||
-	    buflen != buflen_check)
-		errx(-1, "bpf_test_setzbuf(%s): getzbuf returned "
-		    "(0x%x, 0x%x, %d)", desc, (uintptr_t)bufa_check,
-		    (uintptr_t)bufb_check, buflen_check);
+	if (error == 0) {
+		if (bufa_check != bufa || bufb_check != bufb ||
+		    buflen != buflen_check)
+			errx(-1, "bpf_test_setzbuf(%s): getzbuf returned "
+			    "(0x%x, 0x%x, %d)", desc, (uintptr_t)bufa_check,
+			    (uintptr_t)bufb_check, buflen_check);
+	} else {
+		if (bufa_check != NULL || bufb_check != NULL ||
+		    buflen_check != 0)
+			errx(-1, "bpf_test_setzbuf(%s): getzbuf returned "
+			    "(0x%x, 0x%x, %d)", desc, (uintptr_t)bufa_check,
+			    (uintptr_t)bufb_check, buflen_check);
+	}
 out:
 	close(fd);
 }