Clean up some data type mismatches.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@587 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
bbahnsen
2006-06-21 17:39:11 +00:00
parent 6c4dc2267a
commit cc7f0a9111
6 changed files with 50 additions and 50 deletions

View File

@ -280,7 +280,7 @@ Returns:
UINT8 UINT8
CalculateSum8 ( CalculateSum8 (
IN UINT8 *Buffer, IN UINT8 *Buffer,
IN UINT32 Size IN UINTN Size
) )
/*++ /*++

View File

@ -43,7 +43,7 @@ CHAR8 *
ReadLine ( ReadLine (
IN MEMORY_FILE *InputFile, IN MEMORY_FILE *InputFile,
IN OUT CHAR8 *InputBuffer, IN OUT CHAR8 *InputBuffer,
IN UINT32 MaxLength IN UINTN MaxLength
) )
; ;

View File

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

View File

@ -67,7 +67,7 @@ typedef CHAR16 WCHAR;
typedef struct _TEXT_STRING_LIST { typedef struct _TEXT_STRING_LIST {
struct _TEXT_STRING_LIST *Next; struct _TEXT_STRING_LIST *Next;
UINT8 *Str; CHAR8 *Str;
} TEXT_STRING_LIST; } TEXT_STRING_LIST;
typedef struct _WCHAR_STRING_LIST { typedef struct _WCHAR_STRING_LIST {

View File

@ -175,7 +175,7 @@ StringDBWriteStandardFileHeader (
static static
WCHAR * WCHAR *
AsciiToWchar ( AsciiToWchar (
INT8 *Str CHAR8 *Str
); );
static static
@ -376,8 +376,8 @@ Notes:
--*/ --*/
STATUS STATUS
StringDBDumpCStrings ( StringDBDumpCStrings (
INT8 *FileName, CHAR8 *FileName,
INT8 *BaseName, CHAR8 *BaseName,
WCHAR_STRING_LIST *LanguagesOfInterest, WCHAR_STRING_LIST *LanguagesOfInterest,
WCHAR_MATCHING_STRING_LIST *IndirectionList WCHAR_MATCHING_STRING_LIST *IndirectionList
) )
@ -793,16 +793,16 @@ Returns:
--*/ --*/
STATUS STATUS
StringDBDumpStringDefines ( StringDBDumpStringDefines (
INT8 *FileName, CHAR8 *FileName,
INT8 *BaseName CHAR8 *BaseName
) )
{ {
FILE *Fptr; FILE *Fptr;
STRING_IDENTIFIER *Identifier; STRING_IDENTIFIER *Identifier;
INT8 CopyBaseName[100]; CHAR8 CopyBaseName[100];
WCHAR Line[200]; WCHAR Line[200];
UINT32 Index; UINT32 Index;
const INT8 *StrDefHeader[] = { const CHAR8 *StrDefHeader[] = {
"#ifndef _%s_STRINGS_DEFINE_H_\n", "#ifndef _%s_STRINGS_DEFINE_H_\n",
"#define _%s_STRINGS_DEFINE_H_\n\n", "#define _%s_STRINGS_DEFINE_H_\n\n",
NULL NULL
@ -1485,7 +1485,7 @@ StringDBFormatString (
/*****************************************************************************/ /*****************************************************************************/
STATUS STATUS
StringDBReadDatabase ( StringDBReadDatabase (
INT8 *DBFileName, CHAR8 *DBFileName,
BOOLEAN IgnoreIfNotExist, BOOLEAN IgnoreIfNotExist,
BOOLEAN Verbose BOOLEAN Verbose
) )
@ -1596,7 +1596,7 @@ Returns:
--*/ --*/
STATUS STATUS
StringDBWriteDatabase ( StringDBWriteDatabase (
INT8 *DBFileName, CHAR8 *DBFileName,
BOOLEAN Verbose BOOLEAN Verbose
) )
{ {
@ -1684,7 +1684,7 @@ StringDBWriteDatabase (
STATUS STATUS
StringDBSetStringReferenced ( StringDBSetStringReferenced (
INT8 *StringIdentifierName, CHAR8 *StringIdentifierName,
BOOLEAN IgnoreNotFound BOOLEAN IgnoreNotFound
) )
{ {
@ -1738,8 +1738,8 @@ Notes:
--*/ --*/
STATUS STATUS
StringDBDumpDatabase ( StringDBDumpDatabase (
INT8 *DBFileName, CHAR8 *DBFileName,
INT8 *OutputFileName, CHAR8 *OutputFileName,
BOOLEAN Verbose BOOLEAN Verbose
) )
{ {
@ -2422,7 +2422,7 @@ DuplicateString (
static static
WCHAR * WCHAR *
AsciiToWchar ( AsciiToWchar (
INT8 *Str CHAR8 *Str
) )
{ {
UINT32 Len; UINT32 Len;
@ -2459,7 +2459,7 @@ Returns:
--*/ --*/
STATUS STATUS
StringDBCreateHiiExportPack ( StringDBCreateHiiExportPack (
INT8 *FileName CHAR8 *FileName
) )
{ {
FILE *Fptr; FILE *Fptr;

View File

@ -70,7 +70,7 @@ StringDBAddStringIdentifier (
STATUS STATUS
StringDBReadDatabase ( StringDBReadDatabase (
INT8 *DBFileName, CHAR8 *DBFileName,
BOOLEAN IgnoreIfNotExist, BOOLEAN IgnoreIfNotExist,
BOOLEAN Verbose BOOLEAN Verbose
) )
@ -78,15 +78,15 @@ StringDBReadDatabase (
STATUS STATUS
StringDBWriteDatabase ( StringDBWriteDatabase (
INT8 *DBFileName, CHAR8 *DBFileName,
BOOLEAN Verbose BOOLEAN Verbose
) )
; ;
STATUS STATUS
StringDBDumpDatabase ( StringDBDumpDatabase (
INT8 *DBFileName, CHAR8 *DBFileName,
INT8 *OutputFileName, CHAR8 *OutputFileName,
BOOLEAN Verbose BOOLEAN Verbose
) )
; ;
@ -100,8 +100,8 @@ StringDBAddLanguage (
STATUS STATUS
StringDBDumpCStrings ( StringDBDumpCStrings (
INT8 *FileName, CHAR8 *FileName,
INT8 *BaseName, CHAR8 *BaseName,
WCHAR_STRING_LIST *LanguagesOfInterest, WCHAR_STRING_LIST *LanguagesOfInterest,
WCHAR_MATCHING_STRING_LIST *IndirectionList WCHAR_MATCHING_STRING_LIST *IndirectionList
) )
@ -109,8 +109,8 @@ StringDBDumpCStrings (
STATUS STATUS
StringDBDumpStringDefines ( StringDBDumpStringDefines (
INT8 *FileName, CHAR8 *FileName,
INT8 *BaseName CHAR8 *BaseName
) )
; ;
@ -122,7 +122,7 @@ StringDBSetCurrentLanguage (
STATUS STATUS
StringDBSetStringReferenced ( StringDBSetStringReferenced (
INT8 *StringIdentifierName, CHAR8 *StringIdentifierName,
BOOLEAN IgnoreNotFound BOOLEAN IgnoreNotFound
) )
; ;