From 80151e53310a3ef57e85ac1efc4f843d0a1c0824 Mon Sep 17 00:00:00 2001 From: lgao4 Date: Thu, 23 Jul 2009 01:43:04 +0000 Subject: [PATCH] Rename BaseLib internal functions by adding InternalBaseLib. git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@8980 6f19259b-4bc3-4df7-8a09-765794883524 --- MdePkg/Library/BaseLib/BitField.c | 24 ++++++++++++------------ MdePkg/Library/BaseLib/LinkedList.c | 18 +++++++++--------- MdePkg/Library/BaseLib/String.c | 16 ++++++++-------- 3 files changed, 29 insertions(+), 29 deletions(-) diff --git a/MdePkg/Library/BaseLib/BitField.c b/MdePkg/Library/BaseLib/BitField.c index 658dd97cda..1c1fbdfeb7 100644 --- a/MdePkg/Library/BaseLib/BitField.c +++ b/MdePkg/Library/BaseLib/BitField.c @@ -28,7 +28,7 @@ **/ UINTN EFIAPI -BitFieldReadUint ( +InternalBaseLibBitFieldReadUint ( IN UINTN Operand, IN UINTN StartBit, IN UINTN EndBit @@ -59,7 +59,7 @@ BitFieldReadUint ( **/ UINTN EFIAPI -BitFieldOrUint ( +InternalBaseLibBitFieldOrUint ( IN UINTN Operand, IN UINTN StartBit, IN UINTN EndBit, @@ -91,7 +91,7 @@ BitFieldOrUint ( **/ UINTN EFIAPI -BitFieldAndUint ( +InternalBaseLibBitFieldAndUint ( IN UINTN Operand, IN UINTN StartBit, IN UINTN EndBit, @@ -134,7 +134,7 @@ BitFieldRead8 ( { ASSERT (EndBit < 8); ASSERT (StartBit <= EndBit); - return (UINT8)BitFieldReadUint (Operand, StartBit, EndBit); + return (UINT8)InternalBaseLibBitFieldReadUint (Operand, StartBit, EndBit); } /** @@ -207,7 +207,7 @@ BitFieldOr8 ( { ASSERT (EndBit < 8); ASSERT (StartBit <= EndBit); - return (UINT8)BitFieldOrUint (Operand, StartBit, EndBit, OrData); + return (UINT8)InternalBaseLibBitFieldOrUint (Operand, StartBit, EndBit, OrData); } /** @@ -244,7 +244,7 @@ BitFieldAnd8 ( { ASSERT (EndBit < 8); ASSERT (StartBit <= EndBit); - return (UINT8)BitFieldAndUint (Operand, StartBit, EndBit, AndData); + return (UINT8)InternalBaseLibBitFieldAndUint (Operand, StartBit, EndBit, AndData); } /** @@ -321,7 +321,7 @@ BitFieldRead16 ( { ASSERT (EndBit < 16); ASSERT (StartBit <= EndBit); - return (UINT16)BitFieldReadUint (Operand, StartBit, EndBit); + return (UINT16)InternalBaseLibBitFieldReadUint (Operand, StartBit, EndBit); } /** @@ -394,7 +394,7 @@ BitFieldOr16 ( { ASSERT (EndBit < 16); ASSERT (StartBit <= EndBit); - return (UINT16)BitFieldOrUint (Operand, StartBit, EndBit, OrData); + return (UINT16)InternalBaseLibBitFieldOrUint (Operand, StartBit, EndBit, OrData); } /** @@ -431,7 +431,7 @@ BitFieldAnd16 ( { ASSERT (EndBit < 16); ASSERT (StartBit <= EndBit); - return (UINT16)BitFieldAndUint (Operand, StartBit, EndBit, AndData); + return (UINT16)InternalBaseLibBitFieldAndUint (Operand, StartBit, EndBit, AndData); } /** @@ -508,7 +508,7 @@ BitFieldRead32 ( { ASSERT (EndBit < 32); ASSERT (StartBit <= EndBit); - return (UINT32)BitFieldReadUint (Operand, StartBit, EndBit); + return (UINT32)InternalBaseLibBitFieldReadUint (Operand, StartBit, EndBit); } /** @@ -581,7 +581,7 @@ BitFieldOr32 ( { ASSERT (EndBit < 32); ASSERT (StartBit <= EndBit); - return (UINT32)BitFieldOrUint (Operand, StartBit, EndBit, OrData); + return (UINT32)InternalBaseLibBitFieldOrUint (Operand, StartBit, EndBit, OrData); } /** @@ -618,7 +618,7 @@ BitFieldAnd32 ( { ASSERT (EndBit < 32); ASSERT (StartBit <= EndBit); - return (UINT32)BitFieldAndUint (Operand, StartBit, EndBit, AndData); + return (UINT32)InternalBaseLibBitFieldAndUint (Operand, StartBit, EndBit, AndData); } /** diff --git a/MdePkg/Library/BaseLib/LinkedList.c b/MdePkg/Library/BaseLib/LinkedList.c index 8069bd3550..62b6c36478 100644 --- a/MdePkg/Library/BaseLib/LinkedList.c +++ b/MdePkg/Library/BaseLib/LinkedList.c @@ -37,7 +37,7 @@ **/ BOOLEAN EFIAPI -IsNodeInList ( +InternalBaseLibIsNodeInList ( IN CONST LIST_ENTRY *List, IN CONST LIST_ENTRY *Node ) @@ -136,7 +136,7 @@ InsertHeadList ( // // ASSERT List not too long and Entry is not one of the nodes of List // - ASSERT (!IsNodeInList (ListHead, Entry)); + ASSERT (!InternalBaseLibIsNodeInList (ListHead, Entry)); Entry->ForwardLink = ListHead->ForwardLink; Entry->BackLink = ListHead; @@ -177,7 +177,7 @@ InsertTailList ( // // ASSERT List not too long and Entry is not one of the nodes of List // - ASSERT (!IsNodeInList (ListHead, Entry)); + ASSERT (!InternalBaseLibIsNodeInList (ListHead, Entry)); Entry->ForwardLink = ListHead; Entry->BackLink = ListHead->BackLink; @@ -215,7 +215,7 @@ GetFirstNode ( // // ASSERT List not too long // - ASSERT (IsNodeInList (List, List)); + ASSERT (InternalBaseLibIsNodeInList (List, List)); return List->ForwardLink; } @@ -252,7 +252,7 @@ GetNextNode ( // // ASSERT List not too long and Node is one of the nodes of List // - ASSERT (IsNodeInList (List, Node)); + ASSERT (InternalBaseLibIsNodeInList (List, Node)); return Node->ForwardLink; } @@ -285,7 +285,7 @@ IsListEmpty ( // // ASSERT List not too long // - ASSERT (IsNodeInList (ListHead, ListHead)); + ASSERT (InternalBaseLibIsNodeInList (ListHead, ListHead)); return (BOOLEAN)(ListHead->ForwardLink == ListHead); } @@ -325,7 +325,7 @@ IsNull ( // // ASSERT List not too long and Node is one of the nodes of List // - ASSERT (IsNodeInList (List, Node)); + ASSERT (InternalBaseLibIsNodeInList (List, Node)); return (BOOLEAN)(Node == List); } @@ -363,7 +363,7 @@ IsNodeAtEnd ( // // ASSERT List not too long and Node is one of the nodes of List // - ASSERT (IsNodeInList (List, Node)); + ASSERT (InternalBaseLibIsNodeInList (List, Node)); return (BOOLEAN)(!IsNull (List, Node) && List->BackLink == Node); } @@ -409,7 +409,7 @@ SwapListEntries ( // // ASSERT Entry1 and Entry2 are in the same linked list // - ASSERT (IsNodeInList (FirstEntry, SecondEntry)); + ASSERT (InternalBaseLibIsNodeInList (FirstEntry, SecondEntry)); // // Ptr is the node pointed to by FirstEntry->ForwardLink diff --git a/MdePkg/Library/BaseLib/String.c b/MdePkg/Library/BaseLib/String.c index 43ba1447b8..31ea36de41 100644 --- a/MdePkg/Library/BaseLib/String.c +++ b/MdePkg/Library/BaseLib/String.c @@ -1325,7 +1325,7 @@ AsciiStrCmp ( **/ CHAR8 EFIAPI -AsciiToUpper ( +InternalBaseLibAsciiToUpper ( IN CHAR8 Chr ) { @@ -1355,7 +1355,7 @@ InternalAsciiHexCharToUintn ( return Char - '0'; } - return (UINTN) (10 + AsciiToUpper (Char) - 'A'); + return (UINTN) (10 + InternalBaseLibAsciiToUpper (Char) - 'A'); } @@ -1404,13 +1404,13 @@ AsciiStriCmp ( ASSERT (AsciiStrSize (FirstString)); ASSERT (AsciiStrSize (SecondString)); - UpperFirstString = AsciiToUpper (*FirstString); - UpperSecondString = AsciiToUpper (*SecondString); + UpperFirstString = InternalBaseLibAsciiToUpper (*FirstString); + UpperSecondString = InternalBaseLibAsciiToUpper (*SecondString); while ((*FirstString != '\0') && (UpperFirstString == UpperSecondString)) { FirstString++; SecondString++; - UpperFirstString = AsciiToUpper (*FirstString); - UpperSecondString = AsciiToUpper (*SecondString); + UpperFirstString = InternalBaseLibAsciiToUpper (*FirstString); + UpperSecondString = InternalBaseLibAsciiToUpper (*SecondString); } return UpperFirstString - UpperSecondString; @@ -1858,7 +1858,7 @@ AsciiStrHexToUintn ( String++; } - if (AsciiToUpper (*String) == 'X') { + if (InternalBaseLibAsciiToUpper (*String) == 'X') { ASSERT (*(String - 1) == '0'); if (*(String - 1) != '0') { return 0; @@ -1953,7 +1953,7 @@ AsciiStrHexToUint64 ( String++; } - if (AsciiToUpper (*String) == 'X') { + if (InternalBaseLibAsciiToUpper (*String) == 'X') { ASSERT (*(String - 1) == '0'); if (*(String - 1) != '0') { return 0; -- 2.39.2