Clean up some data type mismatches.
authorbbahnsen <bbahnsen@6f19259b-4bc3-4df7-8a09-765794883524>
Wed, 21 Jun 2006 17:39:11 +0000 (17:39 +0000)
committerbbahnsen <bbahnsen@6f19259b-4bc3-4df7-8a09-765794883524>
Wed, 21 Jun 2006 17:39:11 +0000 (17:39 +0000)
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@587 6f19259b-4bc3-4df7-8a09-765794883524

Tools/Source/TianoTools/Common/CommonLib.c
Tools/Source/TianoTools/Common/ParseInf.h
Tools/Source/TianoTools/StrGather/StrGather.c
Tools/Source/TianoTools/StrGather/StrGather.h
Tools/Source/TianoTools/StrGather/StringDB.c
Tools/Source/TianoTools/StrGather/StringDB.h

index 77f49a7..4d1663a 100644 (file)
@@ -280,7 +280,7 @@ Returns:
 UINT8\r
 CalculateSum8 (\r
   IN UINT8  *Buffer,\r
-  IN UINT32 Size\r
+  IN UINT Size\r
   )\r
 /*++\r
   \r
index ae10b6f..ff98635 100644 (file)
@@ -43,7 +43,7 @@ CHAR8 *
 ReadLine (\r
   IN MEMORY_FILE    *InputFile,\r
   IN OUT CHAR8      *InputBuffer,\r
-  IN UINT32         MaxLength\r
+  IN UINT         MaxLength\r
   )\r
 ;\r
 \r
index f909b34..9eb5c5a 100644 (file)
@@ -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
index df175c2..65dc15c 100644 (file)
@@ -67,7 +67,7 @@ typedef CHAR16  WCHAR;
 \r
 typedef struct _TEXT_STRING_LIST {\r
   struct _TEXT_STRING_LIST  *Next;\r
-  UINT8                     *Str;\r
+  CHAR8                     *Str;\r
 } TEXT_STRING_LIST;\r
 \r
 typedef struct _WCHAR_STRING_LIST {\r
index 3a6a5a4..16ef052 100644 (file)
@@ -175,7 +175,7 @@ StringDBWriteStandardFileHeader (
 static\r
 WCHAR                 *\r
 AsciiToWchar (\r
-  INT8 *Str\r
+  CHAR8 *Str\r
   );\r
 \r
 static\r
@@ -376,8 +376,8 @@ Notes:
 --*/\r
 STATUS\r
 StringDBDumpCStrings (\r
-  INT8                        *FileName,\r
-  INT8                        *BaseName,\r
+  CHAR8                       *FileName,\r
+  CHAR8                       *BaseName,\r
   WCHAR_STRING_LIST           *LanguagesOfInterest,\r
   WCHAR_MATCHING_STRING_LIST  *IndirectionList\r
   )\r
@@ -793,16 +793,16 @@ Returns:
 --*/\r
 STATUS\r
 StringDBDumpStringDefines (\r
-  INT8 *FileName,\r
-  INT8 *BaseName\r
+  CHAR8 *FileName,\r
+  CHAR8 *BaseName\r
   )\r
 {\r
   FILE              *Fptr;\r
   STRING_IDENTIFIER *Identifier;\r
-  INT8              CopyBaseName[100];\r
+  CHAR8             CopyBaseName[100];\r
   WCHAR             Line[200];\r
   UINT32            Index;\r
-  const INT8        *StrDefHeader[] = {\r
+  const CHAR8       *StrDefHeader[] = {\r
     "#ifndef _%s_STRINGS_DEFINE_H_\n",\r
     "#define _%s_STRINGS_DEFINE_H_\n\n",\r
     NULL\r
@@ -1485,7 +1485,7 @@ StringDBFormatString (
 /*****************************************************************************/\r
 STATUS\r
 StringDBReadDatabase (\r
-  INT8    *DBFileName,\r
+  CHAR8   *DBFileName,\r
   BOOLEAN IgnoreIfNotExist,\r
   BOOLEAN Verbose\r
   )\r
@@ -1596,7 +1596,7 @@ Returns:
 --*/\r
 STATUS\r
 StringDBWriteDatabase (\r
-  INT8    *DBFileName,\r
+  CHAR8   *DBFileName,\r
   BOOLEAN Verbose\r
   )\r
 {\r
@@ -1684,7 +1684,7 @@ StringDBWriteDatabase (
 \r
 STATUS\r
 StringDBSetStringReferenced (\r
-  INT8      *StringIdentifierName,\r
+  CHAR8     *StringIdentifierName,\r
   BOOLEAN   IgnoreNotFound\r
   )\r
 {\r
@@ -1738,8 +1738,8 @@ Notes:
 --*/\r
 STATUS\r
 StringDBDumpDatabase (\r
-  INT8                *DBFileName,\r
-  INT8                *OutputFileName,\r
+  CHAR8               *DBFileName,\r
+  CHAR8               *OutputFileName,\r
   BOOLEAN             Verbose\r
   )\r
 {\r
@@ -2422,7 +2422,7 @@ DuplicateString (
 static\r
 WCHAR *\r
 AsciiToWchar (\r
-  INT8 *Str\r
+  CHAR8 *Str\r
   )\r
 {\r
   UINT32  Len;\r
@@ -2459,7 +2459,7 @@ Returns:
 --*/\r
 STATUS\r
 StringDBCreateHiiExportPack (\r
-  INT8                        *FileName\r
+  CHAR8                       *FileName\r
   )\r
 {\r
   FILE                        *Fptr;\r
index 4dc05a3..c525731 100644 (file)
@@ -70,7 +70,7 @@ StringDBAddStringIdentifier (
 \r
 STATUS\r
 StringDBReadDatabase (\r
-  INT8    *DBFileName,\r
+  CHAR8   *DBFileName,\r
   BOOLEAN IgnoreIfNotExist,\r
   BOOLEAN Verbose\r
   )\r
@@ -78,15 +78,15 @@ StringDBReadDatabase (
 \r
 STATUS\r
 StringDBWriteDatabase (\r
-  INT8    *DBFileName,\r
+  CHAR8   *DBFileName,\r
   BOOLEAN Verbose\r
   )\r
 ;\r
 \r
 STATUS\r
 StringDBDumpDatabase (\r
-  INT8                *DBFileName,\r
-  INT8                *OutputFileName,\r
+  CHAR8               *DBFileName,\r
+  CHAR8               *OutputFileName,\r
   BOOLEAN             Verbose\r
   )\r
 ;\r
@@ -100,8 +100,8 @@ StringDBAddLanguage (
 \r
 STATUS\r
 StringDBDumpCStrings (\r
-  INT8                        *FileName,\r
-  INT8                        *BaseName,\r
+  CHAR8                       *FileName,\r
+  CHAR8                       *BaseName,\r
   WCHAR_STRING_LIST           *LanguagesOfInterest,\r
   WCHAR_MATCHING_STRING_LIST  *IndirectionList\r
   )\r
@@ -109,8 +109,8 @@ StringDBDumpCStrings (
 \r
 STATUS\r
 StringDBDumpStringDefines (\r
-  INT8                *FileName,\r
-  INT8                *BaseName\r
+  CHAR8               *FileName,\r
+  CHAR8               *BaseName\r
   )\r
 ;\r
 \r
@@ -122,7 +122,7 @@ StringDBSetCurrentLanguage (
 \r
 STATUS\r
 StringDBSetStringReferenced (\r
-  INT8      *StringIdentifierName,\r
+  CHAR8     *StringIdentifierName,\r
   BOOLEAN   IgnoreNotFound\r
   )\r
 ;\r