PERFORCE change 38167 for review

[Marcel Moolenaar]

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

Change 38167 by marcel at 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);