[src/netbsd-6]: src/usr.sbin/acpitools/acpidump Pull up following revision(s)...

[msaitoh <msaitoh%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/e8c9bce8d9d3
branches:  netbsd-6
changeset: 776720:e8c9bce8d9d3
user:      msaitoh <msaitoh%NetBSD.org@localhost>
date:      Mon Oct 27 05:39:54 2014 +0000

description:
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.

diffstat:

 usr.sbin/acpitools/acpidump/acpi.c |  7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

diffs (29 lines):

diff -r 37c770c80bea -r e8c9bce8d9d3 usr.sbin/acpitools/acpidump/acpi.c
--- a/usr.sbin/acpitools/acpidump/acpi.c        Mon Oct 27 05:37:28 2014 +0000
+++ b/usr.sbin/acpitools/acpidump/acpi.c        Mon Oct 27 05:39:54 2014 +0000
@@ -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 @@
                        addr = le64toh(xsdt->TableOffsetEntry[i]);
                        break;
                default:
-                       addr = 0;
+                       assert((addr = 0));
                }
-               assert(addr != 0);
                printf("0x%08lx", addr);
        }
        printf(" }\n");