From cc7f0a911113bfd03121a0807283161351887eb7 Mon Sep 17 00:00:00 2001 From: bbahnsen Date: Wed, 21 Jun 2006 17:39:11 +0000 Subject: [PATCH] Clean up some data type mismatches. git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@587 6f19259b-4bc3-4df7-8a09-765794883524 --- Tools/Source/TianoTools/Common/CommonLib.c | 2 +- Tools/Source/TianoTools/Common/ParseInf.h | 2 +- Tools/Source/TianoTools/StrGather/StrGather.c | 48 +++++++++---------- Tools/Source/TianoTools/StrGather/StrGather.h | 2 +- Tools/Source/TianoTools/StrGather/StringDB.c | 28 +++++------ Tools/Source/TianoTools/StrGather/StringDB.h | 18 +++---- 6 files changed, 50 insertions(+), 50 deletions(-) diff --git a/Tools/Source/TianoTools/Common/CommonLib.c b/Tools/Source/TianoTools/Common/CommonLib.c index 77f49a7875..4d1663a55a 100644 --- a/Tools/Source/TianoTools/Common/CommonLib.c +++ b/Tools/Source/TianoTools/Common/CommonLib.c @@ -280,7 +280,7 @@ Returns: UINT8 CalculateSum8 ( IN UINT8 *Buffer, - IN UINT32 Size + IN UINTN Size ) /*++ diff --git a/Tools/Source/TianoTools/Common/ParseInf.h b/Tools/Source/TianoTools/Common/ParseInf.h index ae10b6f631..ff986352c6 100644 --- a/Tools/Source/TianoTools/Common/ParseInf.h +++ b/Tools/Source/TianoTools/Common/ParseInf.h @@ -43,7 +43,7 @@ CHAR8 * ReadLine ( IN MEMORY_FILE *InputFile, IN OUT CHAR8 *InputBuffer, - IN UINT32 MaxLength + IN UINTN MaxLength ) ; diff --git a/Tools/Source/TianoTools/StrGather/StrGather.c b/Tools/Source/TianoTools/StrGather/StrGather.c index f909b34bb3..9eb5c5a19e 100644 --- a/Tools/Source/TianoTools/StrGather/StrGather.c +++ b/Tools/Source/TianoTools/StrGather/StrGather.c @@ -57,7 +57,7 @@ typedef struct _SOURCE_FILE { WCHAR *FileBuffer; WCHAR *FileBufferPtr; UINT32 FileSize; - INT8 FileName[MAX_PATH]; + CHAR8 FileName[MAX_PATH]; UINT32 LineNum; BOOLEAN EndOfFile; BOOLEAN SkipToHash; @@ -96,19 +96,19 @@ static struct { BOOLEAN IgnoreNotFound; // when scanning BOOLEAN VerboseScan; BOOLEAN UnquotedStrings; // -uqs option - INT8 OutputDatabaseFileName[MAX_PATH]; - INT8 StringHFileName[MAX_PATH]; - INT8 StringCFileName[MAX_PATH]; // output .C filename - INT8 DumpUFileName[MAX_PATH]; // output unicode dump file name - INT8 HiiExportPackFileName[MAX_PATH]; // HII export pack file name - INT8 BaseName[MAX_PATH]; // base filename of the strings file + CHAR8 OutputDatabaseFileName[MAX_PATH]; + CHAR8 StringHFileName[MAX_PATH]; + CHAR8 StringCFileName[MAX_PATH]; // output .C filename + CHAR8 DumpUFileName[MAX_PATH]; // output unicode dump file name + CHAR8 HiiExportPackFileName[MAX_PATH]; // HII export pack file name + CHAR8 BaseName[MAX_PATH]; // base filename of the strings file UINT32 Mode; } mGlobals; static BOOLEAN IsValidIdentifierChar ( - INT8 Char, + CHAR8 Char, BOOLEAN FirstChar ); @@ -176,7 +176,7 @@ GetPrintableLanguageName ( static STATUS AddCommandLineLanguage ( - IN INT8 *Language + IN CHAR8 *Language ); static @@ -202,8 +202,8 @@ ParseFile ( static FILE * FindFile ( - IN INT8 *FileName, - OUT INT8 *FoundFileName, + IN CHAR8 *FileName, + OUT CHAR8 *FoundFileName, IN UINT32 FoundFileNameLen ); @@ -283,7 +283,7 @@ ParseIndirectionFiles ( STATUS StringDBCreateHiiExportPack ( - INT8 *OutputFileName + CHAR8 *OutputFileName ); int @@ -448,7 +448,7 @@ Returns: --*/ { static UINT32 NestDepth = 0; - INT8 FoundFileName[MAX_PATH]; + CHAR8 FoundFileName[MAX_PATH]; STATUS Status; Status = STATUS_SUCCESS; @@ -1055,8 +1055,8 @@ ProcessTokenInclude ( SOURCE_FILE *SourceFile ) { - INT8 IncludeFileName[MAX_PATH]; - INT8 *To; + CHAR8 IncludeFileName[MAX_PATH]; + CHAR8 *To; UINT32 Len; BOOLEAN ReportedError; SOURCE_FILE IncludedSourceFile; @@ -1443,8 +1443,8 @@ wstrcmp ( static FILE * FindFile ( - IN INT8 *FileName, - OUT INT8 *FoundFileName, + IN CHAR8 *FileName, + OUT CHAR8 *FoundFileName, IN UINT32 FoundFileNameLen ) { @@ -1901,7 +1901,7 @@ ProcessArgs ( } memset (NewList, 0, sizeof (TEXT_STRING_LIST)); - NewList->Str = (UINT8 *) malloc (strlen (Argv[0]) + 1); + NewList->Str = (CHAR8 *) malloc (strlen (Argv[0]) + 1); if (NewList->Str == NULL) { Error (PROGRAM_NAME, 0, 0, "memory allocation failure", NULL); return STATUS_ERROR; @@ -1940,7 +1940,7 @@ ProcessArgs ( static STATUS AddCommandLineLanguage ( - IN INT8 *Language + IN CHAR8 *Language ) { WCHAR_STRING_LIST *WNewList; @@ -2040,10 +2040,10 @@ ParseIndirectionFiles ( ) { FILE *Fptr; - INT8 Line[200]; - INT8 *StringName; - INT8 *ScopeName; - INT8 *End; + CHAR8 Line[200]; + CHAR8 *StringName; + CHAR8 *ScopeName; + CHAR8 *End; UINT32 LineCount; WCHAR_MATCHING_STRING_LIST *NewList; @@ -2390,7 +2390,7 @@ FreeLists ( static BOOLEAN IsValidIdentifierChar ( - INT8 Char, + CHAR8 Char, BOOLEAN FirstChar ) { diff --git a/Tools/Source/TianoTools/StrGather/StrGather.h b/Tools/Source/TianoTools/StrGather/StrGather.h index df175c2db6..65dc15cbe8 100644 --- a/Tools/Source/TianoTools/StrGather/StrGather.h +++ b/Tools/Source/TianoTools/StrGather/StrGather.h @@ -67,7 +67,7 @@ typedef CHAR16 WCHAR; typedef struct _TEXT_STRING_LIST { struct _TEXT_STRING_LIST *Next; - UINT8 *Str; + CHAR8 *Str; } TEXT_STRING_LIST; typedef struct _WCHAR_STRING_LIST { diff --git a/Tools/Source/TianoTools/StrGather/StringDB.c b/Tools/Source/TianoTools/StrGather/StringDB.c index 3a6a5a4ef0..16ef0526d7 100644 --- a/Tools/Source/TianoTools/StrGather/StringDB.c +++ b/Tools/Source/TianoTools/StrGather/StringDB.c @@ -175,7 +175,7 @@ StringDBWriteStandardFileHeader ( static WCHAR * AsciiToWchar ( - INT8 *Str + CHAR8 *Str ); static @@ -376,8 +376,8 @@ Notes: --*/ STATUS StringDBDumpCStrings ( - INT8 *FileName, - INT8 *BaseName, + CHAR8 *FileName, + CHAR8 *BaseName, WCHAR_STRING_LIST *LanguagesOfInterest, WCHAR_MATCHING_STRING_LIST *IndirectionList ) @@ -793,16 +793,16 @@ Returns: --*/ STATUS StringDBDumpStringDefines ( - INT8 *FileName, - INT8 *BaseName + CHAR8 *FileName, + CHAR8 *BaseName ) { FILE *Fptr; STRING_IDENTIFIER *Identifier; - INT8 CopyBaseName[100]; + CHAR8 CopyBaseName[100]; WCHAR Line[200]; UINT32 Index; - const INT8 *StrDefHeader[] = { + const CHAR8 *StrDefHeader[] = { "#ifndef _%s_STRINGS_DEFINE_H_\n", "#define _%s_STRINGS_DEFINE_H_\n\n", NULL @@ -1485,7 +1485,7 @@ StringDBFormatString ( /*****************************************************************************/ STATUS StringDBReadDatabase ( - INT8 *DBFileName, + CHAR8 *DBFileName, BOOLEAN IgnoreIfNotExist, BOOLEAN Verbose ) @@ -1596,7 +1596,7 @@ Returns: --*/ STATUS StringDBWriteDatabase ( - INT8 *DBFileName, + CHAR8 *DBFileName, BOOLEAN Verbose ) { @@ -1684,7 +1684,7 @@ StringDBWriteDatabase ( STATUS StringDBSetStringReferenced ( - INT8 *StringIdentifierName, + CHAR8 *StringIdentifierName, BOOLEAN IgnoreNotFound ) { @@ -1738,8 +1738,8 @@ Notes: --*/ STATUS StringDBDumpDatabase ( - INT8 *DBFileName, - INT8 *OutputFileName, + CHAR8 *DBFileName, + CHAR8 *OutputFileName, BOOLEAN Verbose ) { @@ -2422,7 +2422,7 @@ DuplicateString ( static WCHAR * AsciiToWchar ( - INT8 *Str + CHAR8 *Str ) { UINT32 Len; @@ -2459,7 +2459,7 @@ Returns: --*/ STATUS StringDBCreateHiiExportPack ( - INT8 *FileName + CHAR8 *FileName ) { FILE *Fptr; diff --git a/Tools/Source/TianoTools/StrGather/StringDB.h b/Tools/Source/TianoTools/StrGather/StringDB.h index 4dc05a3642..c52573151f 100644 --- a/Tools/Source/TianoTools/StrGather/StringDB.h +++ b/Tools/Source/TianoTools/StrGather/StringDB.h @@ -70,7 +70,7 @@ StringDBAddStringIdentifier ( STATUS StringDBReadDatabase ( - INT8 *DBFileName, + CHAR8 *DBFileName, BOOLEAN IgnoreIfNotExist, BOOLEAN Verbose ) @@ -78,15 +78,15 @@ StringDBReadDatabase ( STATUS StringDBWriteDatabase ( - INT8 *DBFileName, + CHAR8 *DBFileName, BOOLEAN Verbose ) ; STATUS StringDBDumpDatabase ( - INT8 *DBFileName, - INT8 *OutputFileName, + CHAR8 *DBFileName, + CHAR8 *OutputFileName, BOOLEAN Verbose ) ; @@ -100,8 +100,8 @@ StringDBAddLanguage ( STATUS StringDBDumpCStrings ( - INT8 *FileName, - INT8 *BaseName, + CHAR8 *FileName, + CHAR8 *BaseName, WCHAR_STRING_LIST *LanguagesOfInterest, WCHAR_MATCHING_STRING_LIST *IndirectionList ) @@ -109,8 +109,8 @@ StringDBDumpCStrings ( STATUS StringDBDumpStringDefines ( - INT8 *FileName, - INT8 *BaseName + CHAR8 *FileName, + CHAR8 *BaseName ) ; @@ -122,7 +122,7 @@ StringDBSetCurrentLanguage ( STATUS StringDBSetStringReferenced ( - INT8 *StringIdentifierName, + CHAR8 *StringIdentifierName, BOOLEAN IgnoreNotFound ) ; -- 2.39.2