Hi Zhenglei, Please change the title to MdePkg/BaseLib: add common versions of CharToUpper and AsciiToUpper and split the change/deletion in String/SafeString/BaseLibInternals into a separate patch, following after this one.
Other than that, glad to see this consolidation. Regards, Leif On Thu, Dec 13, 2018 at 04:34:38PM +0800, Shenglei Zhang wrote: > Add two public functions, CharToUpper and AsciiToUpper. > InternalCharToUpper and InternalBaseLibAsciiToUpper have the same > functions as CharToUpper and AsciiToUpper, but they are internal ones. > So the internal ones are removed and replace them with public ones > in other places. > https://bugzilla.tianocore.org/show_bug.cgi?id=1369 > > Cc: Michael D Kinney <michael.d.kin...@intel.com> > Cc: Liming Gao <liming....@intel.com> > Contributed-under: TianoCore Contribution Agreement 1.1 > Signed-off-by: Shenglei Zhang <shenglei.zh...@intel.com> > --- > MdePkg/Include/Library/BaseLib.h | 40 +++++++++++++++++++++ > MdePkg/Library/BaseLib/BaseLibInternals.h | 42 ----------------------- > MdePkg/Library/BaseLib/SafeString.c | 8 ++--- > MdePkg/Library/BaseLib/String.c | 35 ++++--------------- > 4 files changed, 51 insertions(+), 74 deletions(-) > > diff --git a/MdePkg/Include/Library/BaseLib.h > b/MdePkg/Include/Library/BaseLib.h > index 8cc086983d..b861d82287 100644 > --- a/MdePkg/Include/Library/BaseLib.h > +++ b/MdePkg/Include/Library/BaseLib.h > @@ -2720,6 +2720,46 @@ AsciiStrnToUnicodeStrS ( > OUT UINTN *DestinationLength > ); > > +/** > + Convert a Unicode character to upper case only if > + it maps to a valid small-case ASCII character. > + > + This internal function only deal with Unicode character > + which maps to a valid small-case ASCII character, i.e. > + L'a' to L'z'. For other Unicode character, the input character > + is returned directly. > + > + @param Char The character to convert. > + > + @retval LowerCharacter If the Char is with range L'a' to L'z'. > + @retval Unchanged Otherwise. > + > +**/ > +CHAR16 > +EFIAPI > +CharToUpper ( > + IN CHAR16 Char > + ); > + > +/** > + Converts a lowercase Ascii character to upper one. > + > + If Chr is lowercase Ascii character, then converts it to upper one. > + > + If Value >= 0xA0, then ASSERT(). > + If (Value & 0x0F) >= 0x0A, then ASSERT(). > + > + @param Chr one Ascii character > + > + @return The uppercase value of Ascii character > + > +**/ > +CHAR8 > +EFIAPI > +AsciiToUpper ( > + IN CHAR8 Chr > + ); > + > /** > Converts an 8-bit value to an 8-bit BCD value. > > diff --git a/MdePkg/Library/BaseLib/BaseLibInternals.h > b/MdePkg/Library/BaseLib/BaseLibInternals.h > index 8855231c1a..9db925b157 100644 > --- a/MdePkg/Library/BaseLib/BaseLibInternals.h > +++ b/MdePkg/Library/BaseLib/BaseLibInternals.h > @@ -469,28 +469,6 @@ InternalIsDecimalDigitCharacter ( > ); > > > -/** > - Convert a Unicode character to upper case only if > - it maps to a valid small-case ASCII character. > - > - This internal function only deal with Unicode character > - which maps to a valid small-case ASCII character, i.e. > - L'a' to L'z'. For other Unicode character, the input character > - is returned directly. > - > - @param Char The character to convert. > - > - @retval LowerCharacter If the Char is with range L'a' to L'z'. > - @retval Unchanged Otherwise. > - > -**/ > -CHAR16 > -EFIAPI > -InternalCharToUpper ( > - IN CHAR16 Char > - ); > - > - > /** > Convert a Unicode character to numerical value. > > @@ -552,26 +530,6 @@ InternalAsciiIsDecimalDigitCharacter ( > ); > > > -/** > - Converts a lowercase Ascii character to upper one. > - > - If Chr is lowercase Ascii character, then converts it to upper one. > - > - If Value >= 0xA0, then ASSERT(). > - If (Value & 0x0F) >= 0x0A, then ASSERT(). > - > - @param Chr one Ascii character > - > - @return The uppercase value of Ascii character > - > -**/ > -CHAR8 > -EFIAPI > -InternalBaseLibAsciiToUpper ( > - IN CHAR8 Chr > - ); > - > - > /** > Check if a ASCII character is a hexadecimal character. > > diff --git a/MdePkg/Library/BaseLib/SafeString.c > b/MdePkg/Library/BaseLib/SafeString.c > index 417497cbc9..17f88b46d8 100644 > --- a/MdePkg/Library/BaseLib/SafeString.c > +++ b/MdePkg/Library/BaseLib/SafeString.c > @@ -905,7 +905,7 @@ StrHexToUintnS ( > String++; > } > > - if (InternalCharToUpper (*String) == L'X') { > + if (CharToUpper (*String) == L'X') { > if (*(String - 1) != L'0') { > *Data = 0; > return RETURN_SUCCESS; > @@ -1036,7 +1036,7 @@ StrHexToUint64S ( > String++; > } > > - if (InternalCharToUpper (*String) == L'X') { > + if (CharToUpper (*String) == L'X') { > if (*(String - 1) != L'0') { > *Data = 0; > return RETURN_SUCCESS; > @@ -2459,7 +2459,7 @@ AsciiStrHexToUintnS ( > String++; > } > > - if (InternalBaseLibAsciiToUpper (*String) == 'X') { > + if (AsciiToUpper (*String) == 'X') { > if (*(String - 1) != '0') { > *Data = 0; > return RETURN_SUCCESS; > @@ -2586,7 +2586,7 @@ AsciiStrHexToUint64S ( > String++; > } > > - if (InternalBaseLibAsciiToUpper (*String) == 'X') { > + if (AsciiToUpper (*String) == 'X') { > if (*(String - 1) != '0') { > *Data = 0; > return RETURN_SUCCESS; > diff --git a/MdePkg/Library/BaseLib/String.c b/MdePkg/Library/BaseLib/String.c > index e6df12797d..ced1b3f975 100644 > --- a/MdePkg/Library/BaseLib/String.c > +++ b/MdePkg/Library/BaseLib/String.c > @@ -552,7 +552,7 @@ InternalIsDecimalDigitCharacter ( > **/ > CHAR16 > EFIAPI > -InternalCharToUpper ( > +CharToUpper ( > IN CHAR16 Char > ) > { > @@ -586,7 +586,7 @@ InternalHexCharToUintn ( > return Char - L'0'; > } > > - return (10 + InternalCharToUpper (Char) - L'A'); > + return (10 + CharToUpper (Char) - L'A'); > } > > /** > @@ -1166,27 +1166,6 @@ AsciiStrCmp ( > return *FirstString - *SecondString; > } > > -/** > - Converts a lowercase Ascii character to upper one. > - > - If Chr is lowercase Ascii character, then converts it to upper one. > - > - If Value >= 0xA0, then ASSERT(). > - If (Value & 0x0F) >= 0x0A, then ASSERT(). > - > - @param Chr one Ascii character > - > - @return The uppercase value of Ascii character > - > -**/ > -CHAR8 > -EFIAPI > -InternalBaseLibAsciiToUpper ( > - IN CHAR8 Chr > - ) > -{ > - return (UINT8) ((Chr >= 'a' && Chr <= 'z') ? Chr - ('a' - 'A') : Chr); > -} > > /** > Convert a ASCII character to numerical value. > @@ -1211,7 +1190,7 @@ InternalAsciiHexCharToUintn ( > return Char - '0'; > } > > - return (10 + InternalBaseLibAsciiToUpper (Char) - 'A'); > + return (10 + AsciiToUpper (Char) - 'A'); > } > > > @@ -1260,13 +1239,13 @@ AsciiStriCmp ( > ASSERT (AsciiStrSize (FirstString)); > ASSERT (AsciiStrSize (SecondString)); > > - UpperFirstString = InternalBaseLibAsciiToUpper (*FirstString); > - UpperSecondString = InternalBaseLibAsciiToUpper (*SecondString); > + UpperFirstString = AsciiToUpper (*FirstString); > + UpperSecondString = AsciiToUpper (*SecondString); > while ((*FirstString != '\0') && (*SecondString != '\0') && > (UpperFirstString == UpperSecondString)) { > FirstString++; > SecondString++; > - UpperFirstString = InternalBaseLibAsciiToUpper (*FirstString); > - UpperSecondString = InternalBaseLibAsciiToUpper (*SecondString); > + UpperFirstString = AsciiToUpper (*FirstString); > + UpperSecondString = AsciiToUpper (*SecondString); > } > > return UpperFirstString - UpperSecondString; > -- > 2.18.0.windows.1 > > _______________________________________________ > edk2-devel mailing list > edk2-devel@lists.01.org > https://lists.01.org/mailman/listinfo/edk2-devel _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel
