Module Name: src
Committed By: msaitoh
Date: Mon Oct 27 05:39:54 UTC 2014
Modified Files:
src/usr.sbin/acpitools/acpidump [netbsd-6]: acpi.c
Log Message:
Pull up following revision(s) (requested by riastradh in ticket #1131):
usr.sbin/acpitools/acpidump/acpi.c: revision 1.9
Don't choke on an assertion for an RSDT with a null address entry.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.8.6.1 src/usr.sbin/acpitools/acpidump/acpi.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/acpitools/acpidump/acpi.c
diff -u src/usr.sbin/acpitools/acpidump/acpi.c:1.8 src/usr.sbin/acpitools/acpidump/acpi.c:1.8.6.1
--- src/usr.sbin/acpitools/acpidump/acpi.c:1.8 Thu Feb 17 10:18:05 2011
+++ src/usr.sbin/acpitools/acpidump/acpi.c Mon Oct 27 05:39:54 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi.c,v 1.8 2011/02/17 10:18:05 jmcneill Exp $ */
+/* $NetBSD: acpi.c,v 1.8.6.1 2014/10/27 05:39:54 msaitoh Exp $ */
/*-
* Copyright (c) 1998 Doug Rabson
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: acpi.c,v 1.8 2011/02/17 10:18:05 jmcneill Exp $");
+__RCSID("$NetBSD: acpi.c,v 1.8.6.1 2014/10/27 05:39:54 msaitoh Exp $");
#include <sys/param.h>
#include <sys/endian.h>
@@ -1949,9 +1949,8 @@ acpi_print_rsdt(ACPI_TABLE_HEADER *rsdp)
addr = le64toh(xsdt->TableOffsetEntry[i]);
break;
default:
- addr = 0;
+ assert((addr = 0));
}
- assert(addr != 0);
printf("0x%08lx", addr);
}
printf(" }\n");
