Code scrub for DxeCore

[mirror_edk2.git] / MdeModulePkg / Core / Dxe / Mem / Pool.c

diff --git a/MdeModulePkg/Core/Dxe/Mem/Pool.c b/MdeModulePkg/Core/Dxe/Mem/Pool.c
index f0af2b88004493ecf3b4564b283d203aca888955..fe1b239dc68571f28e2607962bf4c281280785b1 100644 (file)
--- a/MdeModulePkg/Core/Dxe/Mem/Pool.c
+++ b/MdeModulePkg/Core/Dxe/Mem/Pool.c
@@ -68,13 +68,15 @@ typedef struct {
     LIST_ENTRY       Link;\r
 } POOL; \r
 \r
-\r
-POOL            PoolHead[EfiMaxMemoryType];\r
-LIST_ENTRY      PoolHeadList;\r
-\r
 //\r
+// Pool header for each memory type.\r
+//\r
+POOL            mPoolHead[EfiMaxMemoryType];\r
+\r
 //\r
+// List of pool header to search for the appropriate memory type.\r
 //\r
+LIST_ENTRY      mPoolHeadList;\r
 \r
 \r
 /**\r
@@ -90,14 +92,14 @@ CoreInitializePool (
   UINTN  Index;\r
 \r
   for (Type=0; Type < EfiMaxMemoryType; Type++) {\r
-    PoolHead[Type].Signature  = 0;\r
-    PoolHead[Type].Used       = 0;\r
-    PoolHead[Type].MemoryType = (EFI_MEMORY_TYPE) Type;\r
+    mPoolHead[Type].Signature  = 0;\r
+    mPoolHead[Type].Used       = 0;\r
+    mPoolHead[Type].MemoryType = (EFI_MEMORY_TYPE) Type;\r
     for (Index=0; Index < MAX_POOL_LIST; Index++) {\r
-        InitializeListHead (&PoolHead[Type].FreeList[Index]);\r
+        InitializeListHead (&mPoolHead[Type].FreeList[Index]);\r
     }\r
   }\r
-  InitializeListHead (&PoolHeadList);\r
+  InitializeListHead (&mPoolHeadList);\r
 }\r
 \r
 \r
@@ -119,12 +121,12 @@ LookupPoolHead (
   UINTN           Index;\r
 \r
   if (MemoryType >= 0 && MemoryType < EfiMaxMemoryType) {\r
-    return &PoolHead[MemoryType];\r
+    return &mPoolHead[MemoryType];\r
   }\r
 \r
   if (MemoryType < 0) {\r
 \r
-    for (Link = PoolHeadList.ForwardLink; Link != &PoolHeadList; Link = Link->ForwardLink) {\r
+    for (Link = mPoolHeadList.ForwardLink; Link != &mPoolHeadList; Link = Link->ForwardLink) {\r
       Pool = CR(Link, POOL, Link, POOL_SIGNATURE);\r
       if (Pool->MemoryType == MemoryType) {\r
         return Pool;\r
@@ -143,7 +145,7 @@ LookupPoolHead (
       InitializeListHead (&Pool->FreeList[Index]);\r
     }\r
 \r
-    InsertHeadList (&PoolHeadList, &Pool->Link);\r
+    InsertHeadList (&mPoolHeadList, &Pool->Link);\r
 \r
     return Pool;\r
   }\r
@@ -153,7 +155,6 @@ LookupPoolHead (
 \r
  \r
 \r
-\r
 /**\r
   Allocate pool of a particular type.\r
 \r
@@ -331,14 +332,13 @@ Done:
     Buffer          = Head->Data;\r
     DEBUG_CLEAR_MEMORY (Buffer, Size - POOL_OVERHEAD);\r
 \r
-    DEBUG (\r
-      (DEBUG_POOL,\r
-      "AllocatePoolI: Type %x, Addr %x (len %x) %,d\n",\r
-       PoolType, \r
-       Buffer, \r
-       Size - POOL_OVERHEAD, \r
-      Pool->Used)\r
-      );\r
+    DEBUG ((\r
+      DEBUG_POOL,\r
+      "AllocatePoolI: Type %x, Addr %x (len %x) %,d\n", PoolType, \r
+      Buffer, \r
+      Size - POOL_OVERHEAD, \r
+      Pool->Used\r
+      ));\r
 \r
     //\r
     // Account the allocation\r
@@ -354,7 +354,6 @@ Done:
   \r
 \r
 \r
-\r
 /**\r
   Frees pool.\r
 \r
@@ -372,7 +371,7 @@ CoreFreePool (
 {\r
   EFI_STATUS Status;\r
 \r
-  if (NULL == Buffer) {\r
+  if (Buffer == NULL) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
@@ -486,7 +485,7 @@ CoreFreePoolI (
     //\r
     NewPage = (CHAR8 *)((UINTN)Free & ~((DEFAULT_PAGE_ALLOCATION) -1));\r
     Free = (POOL_FREE *) &NewPage[0];\r
-    ASSERT(NULL != Free);\r
+    ASSERT(Free != NULL);\r
 \r
     if (Free->Signature == POOL_FREE_SIGNATURE) {\r
 \r