diff options
author | xli24 <xli24@6f19259b-4bc3-4df7-8a09-765794883524> | 2007-01-25 06:05:36 +0000 |
---|---|---|
committer | xli24 <xli24@6f19259b-4bc3-4df7-8a09-765794883524> | 2007-01-25 06:05:36 +0000 |
commit | 582510249f2fb1334e507b99421b9485f6b89159 (patch) | |
tree | cd9d7414885d26e79565cd12ec241af93dc600f2 /MdePkg/Library/BaseLib/String.c | |
parent | ba3a1cb5bb97ffdea980f188fbd14b08200aeac6 (diff) | |
download | edk2-platforms-582510249f2fb1334e507b99421b9485f6b89159.tar.xz |
Make MDE package pass intel IPF compiler with /W4 /WX switched on.
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@2312 6f19259b-4bc3-4df7-8a09-765794883524
Diffstat (limited to 'MdePkg/Library/BaseLib/String.c')
-rw-r--r-- | MdePkg/Library/BaseLib/String.c | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/MdePkg/Library/BaseLib/String.c b/MdePkg/Library/BaseLib/String.c index 2ac32254fc..7db468aee5 100644 --- a/MdePkg/Library/BaseLib/String.c +++ b/MdePkg/Library/BaseLib/String.c @@ -636,7 +636,7 @@ AsciiToUpper ( IN CHAR8 Chr
)
{
- return (Chr >= 'a' && Chr <= 'z') ? Chr - ('a' - 'A') : Chr;
+ return (UINT8) ((Chr >= 'a' && Chr <= 'z') ? Chr - ('a' - 'A') : Chr);
}
/**
@@ -675,19 +675,25 @@ AsciiStriCmp ( IN CONST CHAR8 *SecondString
)
{
+ CHAR8 UpperFirstString;
+ CHAR8 UpperSecondString;
+
//
// ASSERT both strings are less long than PcdMaximumAsciiStringLength
//
ASSERT (AsciiStrSize (FirstString));
ASSERT (AsciiStrSize (SecondString));
- while ((*FirstString != '\0') &&
- (AsciiToUpper (*FirstString) == AsciiToUpper (*SecondString))) {
+ UpperFirstString = AsciiToUpper (*FirstString);
+ UpperSecondString = AsciiToUpper (*SecondString);
+ while ((*FirstString != '\0') && (UpperFirstString == UpperSecondString)) {
FirstString++;
SecondString++;
+ UpperFirstString = AsciiToUpper (*FirstString);
+ UpperSecondString = AsciiToUpper (*SecondString);
}
- return AsciiToUpper (*FirstString) - AsciiToUpper (*SecondString);
+ return UpperFirstString - UpperSecondString;
}
/**
@@ -861,7 +867,7 @@ DecimalToBcd8 ( )
{
ASSERT (Value < 100);
- return ((Value / 10) << 4) | (Value % 10);
+ return (UINT8) (((Value / 10) << 4) | (Value % 10));
}
/**
@@ -886,5 +892,5 @@ BcdToDecimal8 ( {
ASSERT (Value < 0xa0);
ASSERT ((Value & 0xf) < 0xa);
- return (Value >> 4) * 10 + (Value & 0xf);
+ return (UINT8) ((Value >> 4) * 10 + (Value & 0xf));
}
|