diff options
| author | jljusten <jljusten@6f19259b-4bc3-4df7-8a09-765794883524> | 2008-04-24 16:21:53 +0000 |
|---|---|---|
| committer | jljusten <jljusten@6f19259b-4bc3-4df7-8a09-765794883524> | 2008-04-24 16:21:53 +0000 |
| commit | 4cb43192bd4a7b7eee05f5c33233459843636edb (patch) | |
| tree | 848afdd6c229a825d9976b8ba56e797deda48be6 /EdkCompatibilityPkg/Foundation/Library/EfiCommonLib | |
| parent | 8067d3032cae5a13d0f2ab045eb8064ba4c1ee52 (diff) | |
| download | edk2-platforms-4cb43192bd4a7b7eee05f5c33233459843636edb.tar.xz | |
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
Diffstat (limited to 'EdkCompatibilityPkg/Foundation/Library/EfiCommonLib')
4 files changed, 11 insertions, 6 deletions
diff --git a/EdkCompatibilityPkg/Foundation/Library/EfiCommonLib/Math.c b/EdkCompatibilityPkg/Foundation/Library/EfiCommonLib/Math.c index 64e683ec89..ba00c8bb3d 100644 --- a/EdkCompatibilityPkg/Foundation/Library/EfiCommonLib/Math.c +++ b/EdkCompatibilityPkg/Foundation/Library/EfiCommonLib/Math.c @@ -167,7 +167,7 @@ Returns: Operand >>= 1;
Bitpos++;
}
- return (Bitpos - 1);
+ return (UINT8)(Bitpos - 1);
}
diff --git a/EdkCompatibilityPkg/Foundation/Library/EfiCommonLib/PostCode.c b/EdkCompatibilityPkg/Foundation/Library/EfiCommonLib/PostCode.c index 31232bebdc..69171eaeae 100644 --- a/EdkCompatibilityPkg/Foundation/Library/EfiCommonLib/PostCode.c +++ b/EdkCompatibilityPkg/Foundation/Library/EfiCommonLib/PostCode.c @@ -54,7 +54,7 @@ Returns: if (((CodeType & EFI_STATUS_CODE_TYPE_MASK) == EFI_PROGRESS_CODE) ||
((CodeType & EFI_STATUS_CODE_TYPE_MASK)== EFI_ERROR_CODE)) {
*PostCode = (UINT8) (((Value & EFI_STATUS_CODE_CLASS_MASK) >> 24) << 5);
- *PostCode |= (UINT8) (((Value & EFI_STATUS_CODE_SUBCLASS_MASK) >> 16) & 0x1f);
+ *PostCode = (UINT8)(*PostCode | (((Value & EFI_STATUS_CODE_SUBCLASS_MASK) >> 16) & 0x1f));
return TRUE;
}
diff --git a/EdkCompatibilityPkg/Foundation/Library/EfiCommonLib/ReportStatusCode.c b/EdkCompatibilityPkg/Foundation/Library/EfiCommonLib/ReportStatusCode.c index 4a9fca82bc..49328e6ca2 100644 --- a/EdkCompatibilityPkg/Foundation/Library/EfiCommonLib/ReportStatusCode.c +++ b/EdkCompatibilityPkg/Foundation/Library/EfiCommonLib/ReportStatusCode.c @@ -196,7 +196,8 @@ Returns: // Make sure it will all fit in the passed in buffer
//
TotalSize = sizeof (EFI_STATUS_CODE_DATA) + sizeof (EFI_DEBUG_ASSERT_DATA);
- TotalSize += EfiAsciiStrLen (Filename) + EfiAsciiStrLen (Description);
+ TotalSize += EfiAsciiStrLen (Filename);
+ TotalSize += EfiAsciiStrLen (Description);
if (TotalSize > BufferSize) {
return EFI_BUFFER_TOO_SMALL;
}
diff --git a/EdkCompatibilityPkg/Foundation/Library/EfiCommonLib/String.c b/EdkCompatibilityPkg/Foundation/Library/EfiCommonLib/String.c index 150f650598..54523b2417 100644 --- a/EdkCompatibilityPkg/Foundation/Library/EfiCommonLib/String.c +++ b/EdkCompatibilityPkg/Foundation/Library/EfiCommonLib/String.c @@ -593,7 +593,7 @@ HexStringToBuf ( } else {
Byte = Buf[Idx / 2];
Byte &= 0x0F;
- Byte |= Digit << 4;
+ Byte = (UINT8)(Byte | (Digit << 4));
}
Buf[Idx / 2] = Byte;
@@ -749,9 +749,11 @@ Returns: Sub = StrCharSet;
while ((*String != L'\0') && (*StrCharSet != L'\0')) {
- if (*String++ != *StrCharSet++) {
+ if (*String++ != *StrCharSet) {
String = ++Src;
StrCharSet = Sub;
+ } else {
+ StrCharSet++;
}
}
if (*StrCharSet == L'\0') {
@@ -788,9 +790,11 @@ Returns: Sub = StrCharSet;
while ((*String != '\0') && (*StrCharSet != '\0')) {
- if (*String++ != *StrCharSet++) {
+ if (*String++ != *StrCharSet) {
String = ++Src;
StrCharSet = Sub;
+ } else {
+ StrCharSet++;
}
}
if (*StrCharSet == '\0') {
|