Clean up some data type mismatches.

[mirror_edk2.git] / Tools / Source / TianoTools / StrGather / StrGather.c

diff --git a/Tools/Source/TianoTools/StrGather/StrGather.c b/Tools/Source/TianoTools/StrGather/StrGather.c
index f909b34bb34aa119d7ba7210145fef86e1a93df1..9eb5c5a19e8ae26ba0b9e5c61c358f0df4c8ee90 100644 (file)
--- a/Tools/Source/TianoTools/StrGather/StrGather.c
+++ b/Tools/Source/TianoTools/StrGather/StrGather.c
@@ -57,7 +57,7 @@ typedef struct _SOURCE_FILE {
   WCHAR               *FileBuffer;\r
   WCHAR               *FileBufferPtr;\r
   UINT32              FileSize;\r
-  INT8                FileName[MAX_PATH];\r
+  CHAR8               FileName[MAX_PATH];\r
   UINT32              LineNum;\r
   BOOLEAN             EndOfFile;\r
   BOOLEAN             SkipToHash;\r
@@ -96,19 +96,19 @@ static struct {
   BOOLEAN                     IgnoreNotFound;                   // when scanning\r
   BOOLEAN                     VerboseScan;\r
   BOOLEAN                     UnquotedStrings;                  // -uqs option\r
-  INT8                        OutputDatabaseFileName[MAX_PATH];\r
-  INT8                        StringHFileName[MAX_PATH];\r
-  INT8                        StringCFileName[MAX_PATH];        // output .C filename\r
-  INT8                        DumpUFileName[MAX_PATH];          // output unicode dump file name\r
-  INT8                        HiiExportPackFileName[MAX_PATH];  // HII export pack file name\r
-  INT8                        BaseName[MAX_PATH];               // base filename of the strings file\r
+  CHAR8                       OutputDatabaseFileName[MAX_PATH];\r
+  CHAR8                       StringHFileName[MAX_PATH];\r
+  CHAR8                       StringCFileName[MAX_PATH];        // output .C filename\r
+  CHAR8                       DumpUFileName[MAX_PATH];          // output unicode dump file name\r
+  CHAR8                       HiiExportPackFileName[MAX_PATH];  // HII export pack file name\r
+  CHAR8                       BaseName[MAX_PATH];               // base filename of the strings file\r
   UINT32                      Mode;\r
 } mGlobals;\r
 \r
 static\r
 BOOLEAN\r
 IsValidIdentifierChar (\r
-  INT8      Char,\r
+  CHAR8     Char,\r
   BOOLEAN   FirstChar\r
   );\r
 \r
@@ -176,7 +176,7 @@ GetPrintableLanguageName (
 static\r
 STATUS\r
 AddCommandLineLanguage (\r
-  IN INT8          *Language\r
+  IN CHAR8         *Language\r
   );\r
 \r
 static\r
@@ -202,8 +202,8 @@ ParseFile (
 static\r
 FILE  *\r
 FindFile (\r
-  IN INT8     *FileName,\r
-  OUT INT8    *FoundFileName,\r
+  IN CHAR8    *FileName,\r
+  OUT CHAR8   *FoundFileName,\r
   IN UINT32   FoundFileNameLen\r
   );\r
 \r
@@ -283,7 +283,7 @@ ParseIndirectionFiles (
 \r
 STATUS\r
 StringDBCreateHiiExportPack (\r
-  INT8                *OutputFileName\r
+  CHAR8               *OutputFileName\r
   );\r
 \r
 int\r
@@ -448,7 +448,7 @@ Returns:
 --*/\r
 {\r
   static UINT32 NestDepth = 0;\r
-  INT8          FoundFileName[MAX_PATH];\r
+  CHAR8         FoundFileName[MAX_PATH];\r
   STATUS        Status;\r
 \r
   Status = STATUS_SUCCESS;\r
@@ -1055,8 +1055,8 @@ ProcessTokenInclude (
   SOURCE_FILE *SourceFile\r
   )\r
 {\r
-  INT8        IncludeFileName[MAX_PATH];\r
-  INT8        *To;\r
+  CHAR8       IncludeFileName[MAX_PATH];\r
+  CHAR8       *To;\r
   UINT32      Len;\r
   BOOLEAN     ReportedError;\r
   SOURCE_FILE IncludedSourceFile;\r
@@ -1443,8 +1443,8 @@ wstrcmp (
 static\r
 FILE *\r
 FindFile (\r
-  IN INT8    *FileName,\r
-  OUT INT8   *FoundFileName,\r
+  IN CHAR8   *FileName,\r
+  OUT CHAR8  *FoundFileName,\r
   IN UINT32  FoundFileNameLen\r
   )\r
 {\r
@@ -1901,7 +1901,7 @@ ProcessArgs (
       }\r
 \r
       memset (NewList, 0, sizeof (TEXT_STRING_LIST));\r
-      NewList->Str = (UINT8 *) malloc (strlen (Argv[0]) + 1);\r
+      NewList->Str = (CHAR8 *) malloc (strlen (Argv[0]) + 1);\r
       if (NewList->Str == NULL) {\r
         Error (PROGRAM_NAME, 0, 0, "memory allocation failure", NULL);\r
         return STATUS_ERROR;\r
@@ -1940,7 +1940,7 @@ ProcessArgs (
 static\r
 STATUS\r
 AddCommandLineLanguage (\r
-  IN INT8          *Language\r
+  IN CHAR8         *Language\r
   )\r
 {\r
   WCHAR_STRING_LIST *WNewList;\r
@@ -2040,10 +2040,10 @@ ParseIndirectionFiles (
   )\r
 {\r
   FILE                        *Fptr;\r
-  INT8                        Line[200];\r
-  INT8                        *StringName;\r
-  INT8                        *ScopeName;\r
-  INT8                        *End;\r
+  CHAR8                       Line[200];\r
+  CHAR8                       *StringName;\r
+  CHAR8                       *ScopeName;\r
+  CHAR8                       *End;\r
   UINT32                      LineCount;\r
   WCHAR_MATCHING_STRING_LIST  *NewList;\r
 \r
@@ -2390,7 +2390,7 @@ FreeLists (
 static\r
 BOOLEAN\r
 IsValidIdentifierChar (\r
-  INT8      Char,\r
+  CHAR8     Char,\r
   BOOLEAN   FirstChar\r
   )\r
 {\r