diff options
| author | Jordan Hargrave <jordan@cvs.openbsd.org> | 2007-12-02 22:23:05 +0000 |
|---|---|---|
| committer | Jordan Hargrave <jordan@cvs.openbsd.org> | 2007-12-02 22:23:05 +0000 |
| commit | 1479c87d2b8cac80cc33523d728d7252815ea35c (patch) | |
| tree | 387d62be1fcc4efb6a0669eaff47d08882fe45c8 /usr.sbin | |
| parent | 0c9ad058860bbfbedec494dace763f1ba13b522e (diff) | |
Fixes acpidump on DL145 systems; method defined within another method
ok brad@
Diffstat (limited to 'usr.sbin')
| -rw-r--r-- | usr.sbin/acpidump/asl_dump.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/usr.sbin/acpidump/asl_dump.c b/usr.sbin/acpidump/asl_dump.c index 7e7e2529779..83b265d6d2f 100644 --- a/usr.sbin/acpidump/asl_dump.c +++ b/usr.sbin/acpidump/asl_dump.c @@ -1,4 +1,4 @@ -/* $OpenBSD: asl_dump.c,v 1.5 2007/11/26 19:57:05 kettenis Exp $ */ +/* $OpenBSD: asl_dump.c,v 1.6 2007/12/02 22:23:04 jordan Exp $ */ /*- * Copyright (c) 1999 Doug Rabson * Copyright (c) 2000 Mitsuru IWASAKI <iwasaki@FreeBSD.org> @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: asl_dump.c,v 1.5 2007/11/26 19:57:05 kettenis Exp $ + * $Id: asl_dump.c,v 1.6 2007/12/02 22:23:04 jordan Exp $ * $FreeBSD: src/usr.sbin/acpi/acpidump/asl_dump.c,v 1.5 2001/10/23 14:53:58 takawata Exp $ */ @@ -300,11 +300,15 @@ asl_dump_defmethod(u_int8_t **dpp, int indent) u_int8_t flags; u_int32_t pkglength; struct aml_name *oname; + int swi; dp = *dpp; start = dp; pkglength = asl_dump_pkglength(&dp); + swi = scope_within_method; + scope_within_method = 0; + printf("Method("); ASL_ENTER_SCOPE(dp, oname); asl_dump_termobj(&dp, indent); @@ -319,7 +323,7 @@ asl_dump_defmethod(u_int8_t **dpp, int indent) end = start + pkglength; scope_within_method = 1; asl_dump_objectlist(&dp, end, indent + 1); - scope_within_method = 0; + scope_within_method = swi; print_indent(indent); printf("}"); |