summaryrefslogtreecommitdiff
path: root/source/tools
diff options
context:
space:
mode:
authorJung-uk Kim <jkim@FreeBSD.org>2021-01-04 22:20:55 +0000
committerJung-uk Kim <jkim@FreeBSD.org>2021-01-04 22:20:55 +0000
commita4634ed7779f0905e3bfeb781e58d40a5bdf9bb7 (patch)
tree8e0e40f55257c63c3329cc4d985dd0640d3b2d26 /source/tools
parent960614968e0da10b32875a57ea1e30cc9c85b5e0 (diff)
Import ACPICA 20201217.vendor/acpica/20201217
Diffstat (limited to 'source/tools')
-rw-r--r--source/tools/acpibin/abmain.c2
-rw-r--r--source/tools/acpihelp/ahaml.c4
-rw-r--r--source/tools/acpihelp/ahdecode.c8
3 files changed, 7 insertions, 7 deletions
diff --git a/source/tools/acpibin/abmain.c b/source/tools/acpibin/abmain.c
index 613408143bb9..c928a1af9333 100644
--- a/source/tools/acpibin/abmain.c
+++ b/source/tools/acpibin/abmain.c
@@ -234,7 +234,7 @@ main (
AbGbl_DisplayAllMiscompares = TRUE;
- /* Fallthrough */
+ ACPI_FALLTHROUGH;
case 'c': /* Compare Files */
diff --git a/source/tools/acpihelp/ahaml.c b/source/tools/acpihelp/ahaml.c
index 83cd86bd900a..f3d1428c2498 100644
--- a/source/tools/acpihelp/ahaml.c
+++ b/source/tools/acpihelp/ahaml.c
@@ -215,9 +215,9 @@ AhFindAmlOpcode (
}
}
- if (!Found)
+ if (!Found && Name)
{
- printf ("%s, no matching AML operators\n", Name);
+ printf ("%s, no matching AML opcodes\n", Name);
}
}
diff --git a/source/tools/acpihelp/ahdecode.c b/source/tools/acpihelp/ahdecode.c
index b72db2a800d2..d573ac06ed68 100644
--- a/source/tools/acpihelp/ahdecode.c
+++ b/source/tools/acpihelp/ahdecode.c
@@ -377,7 +377,7 @@ AhDoSpecialNames (
case 'E':
if (Name[2] == 'J')
{
- if (isdigit (Name[3]) || (Name[3] == 'X'))
+ if (isdigit ((int) Name[3]) || (Name[3] == 'X'))
{
/* _EJx */
@@ -386,12 +386,12 @@ AhDoSpecialNames (
}
}
- /* Fallthrough */
+ ACPI_FALLTHROUGH;
case 'L':
case 'Q':
case 'W':
- if ((isxdigit (Name[2]) && isxdigit (Name[3]))
+ if ((isxdigit ((int) Name[2]) && isxdigit ((int) Name[3]))
||
((Name[2] == 'X') && (Name[3] == 'X')))
{
@@ -405,7 +405,7 @@ AhDoSpecialNames (
case 'A':
if ((Name[2] == 'C') || (Name[2] == 'L'))
{
- if (isdigit (Name[3]) || (Name[3] == 'X'))
+ if (isdigit ((int) Name[3]) || (Name[3] == 'X'))
{
/* _ACx or _ALx */