Fix various warnings with the Intel C compiler.
EfiBind.h: * Adding ignores for certain warnings with the Intel C compiler. (Partially merged from MdePkg.) EfiPxe.h: * Make sure PXE_NO_UINT64_SUPPORT is defined Decompress.c: * Removed 'unreachable' return statement. EdkCompatibilityPkg/**: (all other files) * Remove trailing comma from last value in enum. * Include <EfiBind.h> instead of "EfiBind.h", or for some reason __STDC_VERSION__ is not defined. * Introduce more explicit function call ordering by storing results in local variables before using in a calculation. * Add some additional casting for BOOLEAN & UINT8 following calculations which change the type to 'int'. git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@5123 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
@@ -119,6 +119,8 @@ Returns:
|
||||
UINT8 *Destination;
|
||||
UINTN Index;
|
||||
BOOLEAN Finished;
|
||||
UINTN SizeofLanguage;
|
||||
UINTN SizeofString;
|
||||
|
||||
StringPack = (EFI_HII_STRING_PACK *) StringBuffer;
|
||||
Finished = FALSE;
|
||||
@@ -239,14 +241,16 @@ Returns:
|
||||
//
|
||||
// Pointing to a new string pack location
|
||||
//
|
||||
SizeofLanguage = EfiStrSize (Language);
|
||||
SizeofString = EfiStrSize (String);
|
||||
StringPackBuffer->Header.Length = (UINT32)
|
||||
(
|
||||
sizeof (EFI_HII_STRING_PACK) -
|
||||
sizeof (EFI_STRING) +
|
||||
sizeof (RELOFST) +
|
||||
sizeof (RELOFST) +
|
||||
EfiStrSize (Language) +
|
||||
EfiStrSize (String)
|
||||
SizeofLanguage +
|
||||
SizeofString
|
||||
);
|
||||
StringPackBuffer->Header.Type = EFI_HII_STRING;
|
||||
StringPackBuffer->LanguageNameString = (UINT16) ((UINTN) &PackDestination[3] - (UINTN) StringPackBuffer);
|
||||
|
@@ -471,11 +471,15 @@ Returns:
|
||||
{
|
||||
EFI_STATUS Status;
|
||||
CHAR16 *NameSuffixed;
|
||||
UINTN NameLength;
|
||||
UINTN SuffixLength;
|
||||
|
||||
//
|
||||
// enough to concatenate both strings.
|
||||
//
|
||||
NameSuffixed = EfiLibAllocateZeroPool ((EfiStrLen (Name) + EfiStrLen (Suffix) + 1) * sizeof (CHAR16));
|
||||
NameLength = EfiStrLen (Name);
|
||||
SuffixLength = EfiStrLen (Suffix);
|
||||
NameSuffixed = EfiLibAllocateZeroPool ((NameLength + SuffixLength + 1) * sizeof (CHAR16));
|
||||
|
||||
EfiStrCpy (NameSuffixed, Name);
|
||||
EfiStrCat (NameSuffixed, Suffix);
|
||||
|
Reference in New Issue
Block a user