diff options
author | Jung-uk Kim <jkim@FreeBSD.org> | 2012-10-23 23:49:17 +0000 |
---|---|---|
committer | Jung-uk Kim <jkim@FreeBSD.org> | 2012-10-23 23:49:17 +0000 |
commit | 8ef1a33100b9364527b3e522c24b39609e1dae22 (patch) | |
tree | c76815c27a7a82ff262a7eafa3ab31e3365416e4 /sys/contrib/dev/acpica/compiler/aslutils.c | |
parent | 13f02f28c8ff07c78b61864f672fd538e228e60f (diff) | |
parent | 31aa864e8c068201d58aad3a8f82ddb51df11015 (diff) | |
download | src-8ef1a33100b9364527b3e522c24b39609e1dae22.tar.gz src-8ef1a33100b9364527b3e522c24b39609e1dae22.zip |
Merge ACPICA 20121018.
Notes
Notes:
svn path=/head/; revision=241973
Diffstat (limited to 'sys/contrib/dev/acpica/compiler/aslutils.c')
-rw-r--r-- | sys/contrib/dev/acpica/compiler/aslutils.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/sys/contrib/dev/acpica/compiler/aslutils.c b/sys/contrib/dev/acpica/compiler/aslutils.c index 3deeacb0d0a7..32ab1c967c38 100644 --- a/sys/contrib/dev/acpica/compiler/aslutils.c +++ b/sys/contrib/dev/acpica/compiler/aslutils.c @@ -1,4 +1,3 @@ - /****************************************************************************** * * Module Name: aslutils -- compiler utilities @@ -54,7 +53,6 @@ ACPI_MODULE_NAME ("aslutils") - /* Local prototypes */ static void @@ -569,7 +567,7 @@ UtCheckIntegerRange ( if (!Op) { - return NULL; + return (NULL); } if ((Op->Asl.Value.Integer < LowValue) || @@ -833,12 +831,12 @@ UtAttachNameseg ( Name++; } - /* Remaing string should be one single nameseg */ + /* Remaining string should be one single nameseg */ UtPadNameWithUnderscores (Name, PaddedNameSeg); } - strncpy (Op->Asl.NameSeg, PaddedNameSeg, 4); + ACPI_MOVE_NAME (Op->Asl.NameSeg, PaddedNameSeg); } |