summaryrefslogtreecommitdiff
path: root/EdkCompatibilityPkg/Foundation/Library/EfiCommonLib/String.c
diff options
context:
space:
mode:
authorjljusten <jljusten@6f19259b-4bc3-4df7-8a09-765794883524>2008-04-24 16:21:53 +0000
committerjljusten <jljusten@6f19259b-4bc3-4df7-8a09-765794883524>2008-04-24 16:21:53 +0000
commit4cb43192bd4a7b7eee05f5c33233459843636edb (patch)
tree848afdd6c229a825d9976b8ba56e797deda48be6 /EdkCompatibilityPkg/Foundation/Library/EfiCommonLib/String.c
parent8067d3032cae5a13d0f2ab045eb8064ba4c1ee52 (diff)
downloadedk2-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/String.c')
-rw-r--r--EdkCompatibilityPkg/Foundation/Library/EfiCommonLib/String.c10
1 files changed, 7 insertions, 3 deletions
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') {