CHAR8 StrPtr[40];\r
CHAR8 *Token;\r
UINTN Length;\r
- UINT32 Major;\r
- UINT32 Minor;\r
+ unsigned Major;\r
+ unsigned Minor;\r
\r
Major = 0;\r
Minor = 0;\r
\r
Routine Description:\r
\r
- This function intializes the relevant global variable which is being\r
+ This function initializes the relevant global variable which is being\r
used to store the information retrieved from INF file. This also initializes\r
the VTF symbol file.\r
\r
\r
Routine Description:\r
\r
- This function intializes the relevant global variable which is being\r
+ This function initializes the relevant global variable which is being\r
used to store the information retrieved from INF file.\r
\r
Arguments:\r
} else if (strnicmp (*TokenStr, "COMP_TYPE", 9) == 0) {\r
TokenStr++;\r
if (AsciiStringToUint64 (*TokenStr, FALSE, &StringValue) != EFI_SUCCESS) {\r
- Error (NULL, 0, 5001, "Cannot get: \"0x%x\".", *TokenStr);\r
+ Error (NULL, 0, 5001, "Cannot get: \"0x%s\".", *TokenStr);\r
return ;\r
}\r
\r
\r
Fv1BaseAddress = StartAddress1;\r
Fv1EndAddress = Fv1BaseAddress + Size1;\r
- if (Fv1EndAddress != 0x100000000 || Size1 < 0x100000) {\r
+ if (Fv1EndAddress != 0x100000000ULL || Size1 < 0x100000) {\r
Error (NULL, 0, 2000, "Invalid parameter", "Error BaseAddress and Size parameters!");\r
if (Size1 < 0x100000) {\r
Error (NULL, 0, 2000, "Invalid parameter", "The FwVolumeSize must be larger than 1M!");\r
//\r
TokenAddress += BaseAddress &~IPF_CACHE_BIT;\r
\r
-#ifdef __GNUC__\r
- fprintf (DestFile, "%s | %016lX | %s | %s%s\n", Type, TokenAddress, Section, BaseToken, Token);\r
-#else\r
- fprintf (DestFile, "%s | %016I64X | %s | %s%s\n", Type, TokenAddress, Section, BaseToken, Token);\r
-#endif\r
+ fprintf (DestFile, "%s | %016llX | %s | %s%s\n", Type, (unsigned long long) TokenAddress, Section, BaseToken, Token);\r
}\r
}\r
\r
break;\r
\r
case EFI_ABORTED:\r
- Error (NULL, 0, 3000, "Invaild", "Error detected while creating the file image.");\r
+ Error (NULL, 0, 3000, "Invalid", "Error detected while creating the file image.");\r
break;\r
\r
case EFI_OUT_OF_RESOURCES:\r
break;\r
\r
case EFI_VOLUME_CORRUPTED:\r
- Error (NULL, 0, 3000, "Invaild", "No base address was specified.");\r
+ Error (NULL, 0, 3000, "Invalid", "No base address was specified.");\r
break;\r
\r
default:\r
- Error (NULL, 0, 3000, "Invaild", "GenVtfImage function returned unknown status %x.",Status );\r
+ Error (NULL, 0, 3000, "Invalid", "GenVtfImage function returned unknown status %x.", (int) Status );\r
break;\r
}\r
}\r