summaryrefslogtreecommitdiff
path: root/source/tools/acpisrc
diff options
context:
space:
mode:
Diffstat (limited to 'source/tools/acpisrc')
-rw-r--r--source/tools/acpisrc/ascase.c3
-rw-r--r--source/tools/acpisrc/asconvrt.c9
-rw-r--r--source/tools/acpisrc/asfile.c28
-rw-r--r--source/tools/acpisrc/asmain.c13
-rw-r--r--source/tools/acpisrc/asremove.c9
-rw-r--r--source/tools/acpisrc/astable.c32
6 files changed, 54 insertions, 40 deletions
diff --git a/source/tools/acpisrc/ascase.c b/source/tools/acpisrc/ascase.c
index 53e61ad7ad4f4..9c33362f5a822 100644
--- a/source/tools/acpisrc/ascase.c
+++ b/source/tools/acpisrc/ascase.c
@@ -241,6 +241,7 @@ AsMixedCaseToUnderscores (
SubBuffer++;
}
+
SubBuffer++;
continue;
}
@@ -260,6 +261,7 @@ AsMixedCaseToUnderscores (
LineNumber, Filename);
return;
}
+
continue;
}
@@ -535,6 +537,7 @@ AsLowerCaseIdentifiers (
SubBuffer++;
break;
}
+
SubBuffer++;
}
}
diff --git a/source/tools/acpisrc/asconvrt.c b/source/tools/acpisrc/asconvrt.c
index 5a82167c13afc..a277264b96d2c 100644
--- a/source/tools/acpisrc/asconvrt.c
+++ b/source/tools/acpisrc/asconvrt.c
@@ -252,6 +252,7 @@ AsMatchValidToken (
{
SubBuffer++;
}
+
SubBuffer++;
continue;
}
@@ -283,6 +284,7 @@ AsMatchValidToken (
{
SubBuffer++;
}
+
SubBuffer++;
}
@@ -1154,6 +1156,7 @@ AsTabify8 (
LastLineTabCount = TabCount;
TabCount = 0;
}
+
FirstNonBlank = NULL;
LastLineColumnStart = ThisColumnStart;
SubBuffer++;
@@ -1190,6 +1193,7 @@ AsTabify8 (
LastLineTabCount = TabCount;
TabCount = 0;
}
+
FirstNonBlank = NULL;
LastLineColumnStart = ThisColumnStart;
}
@@ -1208,6 +1212,7 @@ AsTabify8 (
{
return;
}
+
SpaceCount = 0;
}
@@ -1396,8 +1401,8 @@ AsCountSourceLines (
/* Find end of comment */
while (SubBuffer[0] && SubBuffer[1] &&
- !(((SubBuffer[0] == '*') &&
- (SubBuffer[1] == '/'))))
+ !(((SubBuffer[0] == '*') &&
+ (SubBuffer[1] == '/'))))
{
if (SubBuffer[0] == '\n')
{
diff --git a/source/tools/acpisrc/asfile.c b/source/tools/acpisrc/asfile.c
index cd18430570854..c59f9d7ff4717 100644
--- a/source/tools/acpisrc/asfile.c
+++ b/source/tools/acpisrc/asfile.c
@@ -123,7 +123,7 @@ AsDoWildcard (
/* If we actually have a dir, process the subtree */
if (!AsCheckForDirectory (SourcePath, TargetPath, Filename,
- &SourceDirPath, &TargetDirPath))
+ &SourceDirPath, &TargetDirPath))
{
VERBOSE_PRINT (("Subdirectory: %s\n", Filename));
@@ -140,7 +140,7 @@ AsDoWildcard (
VERBOSE_PRINT (("File: %s\n", Filename));
AsProcessOneFile (ConversionTable, SourcePath, TargetPath,
- MaxPathLength, Filename, FileType);
+ MaxPathLength, Filename, FileType);
break;
default:
@@ -197,32 +197,32 @@ AsProcessTree (
/* Do the C source files */
AsDoWildcard (ConversionTable, SourcePath, TargetPath, MaxPathLength,
- FILE_TYPE_SOURCE, "*.c");
+ FILE_TYPE_SOURCE, "*.c");
/* Do the C header files */
AsDoWildcard (ConversionTable, SourcePath, TargetPath, MaxPathLength,
- FILE_TYPE_HEADER, "*.h");
+ FILE_TYPE_HEADER, "*.h");
/* Do the Lex file(s) */
AsDoWildcard (ConversionTable, SourcePath, TargetPath, MaxPathLength,
- FILE_TYPE_SOURCE, "*.l");
+ FILE_TYPE_SOURCE, "*.l");
/* Do the yacc file(s) */
AsDoWildcard (ConversionTable, SourcePath, TargetPath, MaxPathLength,
- FILE_TYPE_SOURCE, "*.y");
+ FILE_TYPE_SOURCE, "*.y");
/* Do any ASL files */
AsDoWildcard (ConversionTable, SourcePath, TargetPath, MaxPathLength,
- FILE_TYPE_HEADER, "*.asl");
+ FILE_TYPE_HEADER, "*.asl");
/* Do any subdirectories */
AsDoWildcard (ConversionTable, SourcePath, TargetPath, MaxPathLength,
- FILE_TYPE_DIRECTORY, "*");
+ FILE_TYPE_DIRECTORY, "*");
return (0);
}
@@ -259,6 +259,7 @@ AsDetectLoneLineFeeds (
{
LfCount++;
}
+
LineCount++;
}
i++;
@@ -278,6 +279,7 @@ AsDetectLoneLineFeeds (
{
printf ("%s: %u lone linefeeds in file\n", Filename, LfCount);
}
+
return (TRUE);
}
@@ -365,7 +367,7 @@ AsConvertFile (
for (i = 0; ConversionTable->LowerCaseTable[i].Identifier; i++)
{
AsLowerCaseString (ConversionTable->LowerCaseTable[i].Identifier,
- FileBuffer);
+ FileBuffer);
}
}
@@ -376,7 +378,7 @@ AsConvertFile (
for (i = 0; StringTable[i].Target; i++)
{
AsReplaceString (StringTable[i].Target, StringTable[i].Replacement,
- StringTable[i].Type, FileBuffer);
+ StringTable[i].Type, FileBuffer);
}
}
@@ -410,7 +412,8 @@ AsConvertFile (
{
for (i = 0; StructTable[i].Identifier; i++)
{
- AsInsertPrefix (FileBuffer, StructTable[i].Identifier, StructTable[i].Type);
+ AsInsertPrefix (FileBuffer, StructTable[i].Identifier,
+ StructTable[i].Type);
}
}
@@ -610,7 +613,8 @@ AsProcessOneFile (
{
/* Generate the target pathname and write the file */
- OutPathname = calloc (MaxPathLength + strlen (Filename) + 2 + strlen (TargetPath), 1);
+ OutPathname = calloc (MaxPathLength +
+ strlen (Filename) + 2 + strlen (TargetPath), 1);
if (!OutPathname)
{
printf ("Could not allocate buffer for file pathnames\n");
diff --git a/source/tools/acpisrc/asmain.c b/source/tools/acpisrc/asmain.c
index 4da3cdd5c5a34..40d0cd47853d8 100644
--- a/source/tools/acpisrc/asmain.c
+++ b/source/tools/acpisrc/asmain.c
@@ -221,7 +221,8 @@ AsDisplayStats (
if ((Gbl_CommentLines + Gbl_NonAnsiComments) > 0)
{
printf ("%8.1f Ratio of code to comments\n",
- ((float) Gbl_SourceLines / (float) (Gbl_CommentLines + Gbl_NonAnsiComments)));
+ ((float) Gbl_SourceLines /
+ (float) (Gbl_CommentLines + Gbl_NonAnsiComments)));
}
if (!Gbl_TotalLines)
@@ -456,15 +457,18 @@ main (
if (strstr (SourcePath, ".h"))
{
- AsProcessOneFile (ConversionTable, NULL, TargetPath, 0, SourcePath, FILE_TYPE_HEADER);
+ AsProcessOneFile (ConversionTable, NULL, TargetPath, 0,
+ SourcePath, FILE_TYPE_HEADER);
}
else if (strstr (SourcePath, ".c"))
{
- AsProcessOneFile (ConversionTable, NULL, TargetPath, 0, SourcePath, FILE_TYPE_SOURCE);
+ AsProcessOneFile (ConversionTable, NULL, TargetPath, 0,
+ SourcePath, FILE_TYPE_SOURCE);
}
else if (strstr (SourcePath, ".patch"))
{
- AsProcessOneFile (ConversionTable, NULL, TargetPath, 0, SourcePath, FILE_TYPE_PATCH);
+ AsProcessOneFile (ConversionTable, NULL, TargetPath, 0,
+ SourcePath, FILE_TYPE_PATCH);
}
else
{
@@ -475,6 +479,5 @@ main (
/* Always display final summary and stats */
AsDisplayStats ();
-
return (0);
}
diff --git a/source/tools/acpisrc/asremove.c b/source/tools/acpisrc/asremove.c
index 9a4e57c2fae04..358430a482b52 100644
--- a/source/tools/acpisrc/asremove.c
+++ b/source/tools/acpisrc/asremove.c
@@ -78,7 +78,6 @@ AsRemoveStatement (
SubBuffer = Buffer;
SubString = Buffer;
-
while (SubString)
{
SubString = strstr (SubBuffer, Keyword);
@@ -160,7 +159,6 @@ AsRemoveConditionalCompile (
SubBuffer = Buffer;
SubString = Buffer;
-
while (SubString)
{
SubBuffer = strstr (SubString, Keyword);
@@ -225,6 +223,7 @@ AsRemoveConditionalCompile (
{
SubString--;
}
+
SubString++;
/* Find the "#ifxxxx" */
@@ -327,7 +326,6 @@ AsRemoveMacro (
SubBuffer = Buffer;
SubString = Buffer;
-
while (SubString)
{
SubString = strstr (SubBuffer, Keyword);
@@ -397,7 +395,6 @@ AsRemoveLine (
SubBuffer = Buffer;
SubString = Buffer;
-
while (SubString)
{
SubString = strstr (SubBuffer, Keyword);
@@ -451,7 +448,6 @@ AsReduceTypedefs (
SubBuffer = Buffer;
SubString = Buffer;
-
while (SubString)
{
SubString = strstr (SubBuffer, Keyword);
@@ -555,6 +551,7 @@ AsRemoveEmptyBlocks (
EmptyBlock = FALSE;
break;
}
+
SubBuffer++;
}
@@ -664,6 +661,7 @@ AsCleanupSpecialMacro (
{
SubString++;
}
+
SubString++;
NestLevel = 1;
@@ -697,6 +695,7 @@ SkipLine:
{
NewLine = TRUE;
}
+
SubString++;
}
diff --git a/source/tools/acpisrc/astable.c b/source/tools/acpisrc/astable.c
index 8781c80e2595c..494df3ce7d370 100644
--- a/source/tools/acpisrc/astable.c
+++ b/source/tools/acpisrc/astable.c
@@ -276,6 +276,7 @@ ACPI_TYPED_IDENTIFIER_TABLE AcpiIdentifiers[] = {
{"ACPI_NAMESTRING_INFO", SRC_TYPE_STRUCT},
{"ACPI_NATIVE_INT", SRC_TYPE_SIMPLE},
{"ACPI_NATIVE_UINT", SRC_TYPE_SIMPLE},
+ {"ACPI_NEW_TABLE_DESC", SRC_TYPE_STRUCT},
{"ACPI_NOTIFY_HANDLER", SRC_TYPE_SIMPLE},
{"ACPI_NOTIFY_INFO", SRC_TYPE_STRUCT},
{"ACPI_NS_SEARCH_DATA", SRC_TYPE_STRUCT},
@@ -346,6 +347,7 @@ ACPI_TYPED_IDENTIFIER_TABLE AcpiIdentifiers[] = {
{"ACPI_PREDEFINED_DATA", SRC_TYPE_STRUCT},
{"ACPI_PREDEFINED_INFO", SRC_TYPE_UNION},
{"ACPI_PREDEFINED_NAMES", SRC_TYPE_STRUCT},
+ {"ACPI_PRUNE_INFO", SRC_TYPE_STRUCT},
{"ACPI_PSCOPE_STATE", SRC_TYPE_STRUCT},
{"ACPI_RASF_PARAMETER_BLOCK", SRC_TYPE_STRUCT},
{"ACPI_RASF_PATROL_SCRUB_PARAMETER", SRC_TYPE_STRUCT},
@@ -484,7 +486,6 @@ ACPI_TYPED_IDENTIFIER_TABLE AcpiIdentifiers[] = {
{"APIC_HEADER", SRC_TYPE_STRUCT},
{"AE_DEBUG_REGIONS", SRC_TYPE_STRUCT},
{"AE_REGION", SRC_TYPE_STRUCT},
- {"AE_TABLE_DESC", SRC_TYPE_STRUCT},
{"ASL_ANALYSIS_WALK_INFO", SRC_TYPE_STRUCT},
{"ASL_ERROR_MSG", SRC_TYPE_STRUCT},
{"ASL_ERROR_MSG", SRC_TYPE_STRUCT},
@@ -796,8 +797,8 @@ ACPI_IDENTIFIER_TABLE LinuxSpecialMacros[] = {
};
-ACPI_CONVERSION_TABLE LinuxConversionTable = {
-
+ACPI_CONVERSION_TABLE LinuxConversionTable =
+{
DualLicenseHeader,
FLG_NO_CARRIAGE_RETURNS | FLG_LOWERCASE_DIRNAMES,
@@ -849,8 +850,8 @@ ACPI_CONVERSION_TABLE LinuxConversionTable = {
*
******************************************************************************/
-ACPI_CONVERSION_TABLE CleanupConversionTable = {
-
+ACPI_CONVERSION_TABLE CleanupConversionTable =
+{
NULL,
FLG_DEFAULT_FLAGS,
NULL,
@@ -888,8 +889,8 @@ ACPI_CONVERSION_TABLE CleanupConversionTable = {
};
-ACPI_CONVERSION_TABLE StatsConversionTable = {
-
+ACPI_CONVERSION_TABLE StatsConversionTable =
+{
NULL,
FLG_NO_FILE_OUTPUT,
NULL,
@@ -935,8 +936,8 @@ ACPI_CONVERSION_TABLE StatsConversionTable = {
*
******************************************************************************/
-ACPI_CONVERSION_TABLE LicenseConversionTable = {
-
+ACPI_CONVERSION_TABLE LicenseConversionTable =
+{
DualLicenseHeader,
FLG_DEFAULT_FLAGS,
NULL,
@@ -982,9 +983,8 @@ ACPI_CONVERSION_TABLE LicenseConversionTable = {
*
******************************************************************************/
-ACPI_STRING_TABLE CustomReplacements[] = {
-
-
+ACPI_STRING_TABLE CustomReplacements[] =
+{
{"(c) 1999 - 2014", "(c) 1999 - 2015", REPLACE_WHOLE_WORD}, /* Main ACPICA source */
{"(c) 2006 - 2014", "(c) 2006 - 2015", REPLACE_WHOLE_WORD}, /* Test suites */
@@ -1037,8 +1037,8 @@ ACPI_STRING_TABLE CustomReplacements[] = {
};
-ACPI_CONVERSION_TABLE CustomConversionTable = {
-
+ACPI_CONVERSION_TABLE CustomConversionTable =
+{
NULL,
FLG_DEFAULT_FLAGS,
NULL,
@@ -1083,8 +1083,8 @@ ACPI_CONVERSION_TABLE CustomConversionTable = {
*
******************************************************************************/
-ACPI_CONVERSION_TABLE IndentConversionTable = {
-
+ACPI_CONVERSION_TABLE IndentConversionTable =
+{
NULL,
FLG_NO_CARRIAGE_RETURNS,
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-03 00:26:20 +0000