[edk2] [PATCH v2 1/3] BaseTools/Common: Remove InternalCharToUpper

Shenglei Zhang shenglei.zhang at intel.com
Fri Dec 14 00:20:26 PST 2018


InternalCharToUpper is an internal function.
So now remove InternalCharToUpper and replace it with a public
function CharToUpper in all places.
https://bugzilla.tianocore.org/show_bug.cgi?id=1369

Cc: Bob Feng <bob.c.feng at intel.com>
Cc: Liming Gao <liming.gao at intel.com>
Cc: Yonghong Zhu <yonghong.zhu at intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Shenglei Zhang <shenglei.zhang at intel.com>
---
 BaseTools/Source/C/Common/CommonLib.c | 16 ++--------------
 BaseTools/Source/C/Common/CommonLib.h |  4 ----
 2 files changed, 2 insertions(+), 18 deletions(-)

diff --git a/BaseTools/Source/C/Common/CommonLib.c b/BaseTools/Source/C/Common/CommonLib.c
index 5c40fdb5fd..878b593a4e 100644
--- a/BaseTools/Source/C/Common/CommonLib.c
+++ b/BaseTools/Source/C/Common/CommonLib.c
@@ -740,18 +740,6 @@ Returns:
 #endif
 }
 
-CHAR16
-InternalCharToUpper (
-        CHAR16                    Char
-  )
-{
-  if (Char >= L'a' && Char <= L'z') {
-    return (CHAR16) (Char - (L'a' - L'A'));
-  }
-
-  return Char;
-}
-
 UINTN
 StrnLenS (
    CONST CHAR16              *String,
@@ -1089,7 +1077,7 @@ StrHexToUint64S (
     String++;
   }
 
-  if (InternalCharToUpper (*String) == L'X') {
+  if (CharToUpper (*String) == L'X') {
     if (*(String - 1) != L'0') {
       *Data = 0;
       return RETURN_SUCCESS;
@@ -1264,7 +1252,7 @@ InternalHexCharToUintn (
     return Char - L'0';
   }
 
-  return (10 + InternalCharToUpper (Char) - L'A');
+  return (10 + CharToUpper (Char) - L'A');
 }
 
 
diff --git a/BaseTools/Source/C/Common/CommonLib.h b/BaseTools/Source/C/Common/CommonLib.h
index 4e1541bc70..b81584c7d4 100644
--- a/BaseTools/Source/C/Common/CommonLib.h
+++ b/BaseTools/Source/C/Common/CommonLib.h
@@ -304,10 +304,6 @@ StrnLenS (
    UINTN                     MaxSize
   );
 
-CHAR16
-InternalCharToUpper (
-        CHAR16                    Char
-  );
 
 INTN
 StrCmp (
-- 
2.18.0.windows.1



More information about the edk2-devel mailing list