From owner-p4-projects@FreeBSD.ORG  Wed Jun 22 23:45:25 2005
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 ACF4416A420; Wed, 22 Jun 2005 23:45:24 +0000 (GMT)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 6DCC816A41C
	for <perforce@freebsd.org>; Wed, 22 Jun 2005 23:45:24 +0000 (GMT)
	(envelope-from peter@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 5C7ED43D48
	for <perforce@freebsd.org>; Wed, 22 Jun 2005 23:45:24 +0000 (GMT)
	(envelope-from peter@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j5MNjOaC081147
	for <perforce@freebsd.org>; Wed, 22 Jun 2005 23:45:24 GMT
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j5MNjOkL081144
	for perforce@freebsd.org; Wed, 22 Jun 2005 23:45:24 GMT
	(envelope-from peter@freebsd.org)
Date: Wed, 22 Jun 2005 23:45:24 GMT
Message-Id: <200506222345.j5MNjOkL081144@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	peter@freebsd.org using -f
From: Peter Wemm <peter@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 78831 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, 22 Jun 2005 23:45:26 -0000

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

Change 78831 by peter@peter_melody on 2005/06/22 23:45:03

	do two different kread's so we can differentiate the error.

Affected files ...

.. //depot/projects/hammer/sbin/dmesg/dmesg.c#11 edit

Differences ...

==== //depot/projects/hammer/sbin/dmesg/dmesg.c#11 (text+ko) ====

@@ -125,8 +125,10 @@
 		if (nl[X_MSGBUF].n_type == 0)
 			errx(1, "%s: msgbufp not found",
 			    nlistf ? nlistf : "namelist");
-		if (KREAD(nl[X_MSGBUF].n_value, bufp) || KREAD((long)bufp, cur))
-			errx(1, "kvm_read: %s", kvm_geterr(kd));
+		if (KREAD(nl[X_MSGBUF].n_value, bufp))
+			errx(1, "kvm_read: msgbufp: %s", kvm_geterr(kd));
+		if (KREAD((long)bufp, cur))
+			errx(1, "kvm_read: msgbuf: %s", kvm_geterr(kd));
 		if (cur.msg_magic != MSG_MAGIC)
 			errx(1, "kernel message buffer has different magic "
 			    "number");