From owner-p4-projects@FreeBSD.ORG  Tue Sep 16 20:18:54 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 844B816A4C0; Tue, 16 Sep 2003 20:18:54 -0700 (PDT)
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 5E08416A4B3
	for <perforce@freebsd.org>; Tue, 16 Sep 2003 20:18:54 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id D783C43FBD
	for <perforce@freebsd.org>; Tue, 16 Sep 2003 20:18:53 -0700 (PDT)
	(envelope-from marcel@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id h8H3IrXJ004361
	for <perforce@freebsd.org>; Tue, 16 Sep 2003 20:18:53 -0700 (PDT)
	(envelope-from marcel@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.9/8.12.9/Submit) id h8H3IrVR004358
	for perforce@freebsd.org; Tue, 16 Sep 2003 20:18:53 -0700 (PDT)
	(envelope-from marcel@freebsd.org)
Date: Tue, 16 Sep 2003 20:18:53 -0700 (PDT)
Message-Id: <200309170318.h8H3IrVR004358@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	marcel@freebsd.org using -f
From: Marcel Moolenaar <marcel@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 38167 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
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, 17 Sep 2003 03:18:54 -0000

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

Change 38167 by marcel@marcel_nfs on 2003/09/16 20:17:53

	Fix a bad resolve after a merge conflict.

Affected files ...

.. //depot/projects/ia64/usr.sbin/acpi/acpidump/acpi.c#23 edit

Differences ...

==== //depot/projects/ia64/usr.sbin/acpi/acpidump/acpi.c#23 (text+ko) ====

@@ -118,6 +118,7 @@
 static void
 acpi_handle_fadt(struct FADTbody *fadt)
 {
+	struct ACPIsdt	*dsdp;
 	struct FACSbody	*facs;
 
 	acpi_print_fadt(fadt);
@@ -393,7 +394,6 @@
 			break;
 		default:
 			addr = 0;
-			break;
 		}
 		assert(addr != 0);
 		printf("0x%08lx", addr);
@@ -607,8 +607,6 @@
 static void
 acpi_print_rsd_ptr(struct ACPIrsdp *rp)
 {
-	const char *version;
-
 	printf(BEGIN_COMMENT);
 	printf("  RSD PTR: OEM=");
 	acpi_print_string(rp->oem, 6);
@@ -619,8 +617,7 @@
 	} else {
 		printf("\tXSDT=0x%08lx, length=%u, cksum=%u\n",
 		    (u_long)rp->xsdt_addr, rp->length, rp->xsum);
-	else
-		printf("\tRSDT=0x%08x, cksum=%u\n", rp->rsdt_addr, rp->sum);
+	}
 	printf(END_COMMENT);
 }
 
@@ -642,10 +639,9 @@
 			addr = le64dec((char*)rsdp->body + i * addr_size);
 			break;
 		default:
-			addr = 0;
-			break;
+			assert((addr = 0));
 		}
-		assert(addr != 0);
+
 		sdp = (struct ACPIsdt *)acpi_map_sdt(addr);
 		if (acpi_checksum(sdp, sdp->len))
 			errx(1, "RSDT entry %d is corrupt", i);