Perfect the msa of the following modules, DiskIo, Partition, English and Ebc.

[mirror_edk2.git] / EdkModulePkg / Universal / Disk / Partition / Dxe / Gpt.c

diff --git a/EdkModulePkg/Universal/Disk/Partition/Dxe/Gpt.c b/EdkModulePkg/Universal/Disk/Partition/Dxe/Gpt.c
index 42411806f648985811876c4a149d62c82b40b0e7..61a4ec5e70e9fc51e9e62d8687e0b90806c82a26 100644 (file)
--- a/EdkModulePkg/Universal/Disk/Partition/Dxe/Gpt.c
+++ b/EdkModulePkg/Universal/Disk/Partition/Dxe/Gpt.c
@@ -22,6 +22,7 @@ Abstract:
 \r
 #include "Partition.h"\r
 \r
+STATIC\r
 BOOLEAN\r
 PartitionValidGptTable (\r
   IN  EFI_BLOCK_IO_PROTOCOL       *BlockIo,\r
@@ -30,6 +31,7 @@ PartitionValidGptTable (
   OUT EFI_PARTITION_TABLE_HEADER  *PartHeader\r
   );\r
 \r
+STATIC\r
 BOOLEAN\r
 PartitionCheckGptEntryArrayCRC (\r
   IN  EFI_BLOCK_IO_PROTOCOL       *BlockIo,\r
@@ -37,6 +39,7 @@ PartitionCheckGptEntryArrayCRC (
   IN  EFI_PARTITION_TABLE_HEADER  *PartHeader\r
   );\r
 \r
+STATIC\r
 BOOLEAN\r
 PartitionRestoreGptTable (\r
   IN  EFI_BLOCK_IO_PROTOCOL       *BlockIo,\r
@@ -44,6 +47,7 @@ PartitionRestoreGptTable (
   IN  EFI_PARTITION_TABLE_HEADER  *PartHeader\r
   );\r
 \r
+STATIC\r
 VOID\r
 PartitionCheckGptEntry (\r
   IN  EFI_PARTITION_TABLE_HEADER  *PartHeader,\r
@@ -51,6 +55,7 @@ PartitionCheckGptEntry (
   OUT EFI_PARTITION_ENTRY_STATUS  *PEntryStatus\r
   );\r
 \r
+STATIC\r
 BOOLEAN\r
 PartitionCheckCrcAltSize (\r
   IN UINTN                 MaxSize,\r
@@ -58,18 +63,21 @@ PartitionCheckCrcAltSize (
   IN OUT EFI_TABLE_HEADER  *Hdr\r
   );\r
 \r
+STATIC\r
 BOOLEAN\r
 PartitionCheckCrc (\r
   IN UINTN                 MaxSize,\r
   IN OUT EFI_TABLE_HEADER  *Hdr\r
   );\r
 \r
+STATIC\r
 VOID\r
 PartitionSetCrcAltSize (\r
   IN UINTN                 Size,\r
   IN OUT EFI_TABLE_HEADER  *Hdr\r
   );\r
 \r
+STATIC\r
 VOID\r
 PartitionSetCrc (\r
   IN OUT EFI_TABLE_HEADER *Hdr\r
@@ -302,24 +310,25 @@ Returns:
 \r
 Done:\r
   if (ProtectiveMbr != NULL) {\r
-    gBS->FreePool (ProtectiveMbr);\r
+    FreePool (ProtectiveMbr);\r
   }\r
   if (PrimaryHeader != NULL) {\r
-    gBS->FreePool (PrimaryHeader);\r
+    FreePool (PrimaryHeader);\r
   }\r
   if (BackupHeader != NULL) {\r
-    gBS->FreePool (BackupHeader);\r
+    FreePool (BackupHeader);\r
   }\r
   if (PartEntry != NULL) {\r
-    gBS->FreePool (PartEntry);\r
+    FreePool (PartEntry);\r
   }\r
   if (PEntryStatus != NULL) {\r
-    gBS->FreePool (PEntryStatus);\r
+    FreePool (PEntryStatus);\r
   }\r
 \r
   return GptValid;\r
 }\r
 \r
+STATIC\r
 BOOLEAN\r
 PartitionValidGptTable (\r
   IN  EFI_BLOCK_IO_PROTOCOL       *BlockIo,\r
@@ -367,7 +376,7 @@ Returns:
                       PartHdr\r
                       );\r
   if (EFI_ERROR (Status)) {\r
-    gBS->FreePool (PartHdr);\r
+    FreePool (PartHdr);\r
     return FALSE;\r
   }\r
 \r
@@ -376,21 +385,22 @@ Returns:
       PartHdr->MyLBA != Lba\r
       ) {\r
     DEBUG ((EFI_D_INFO, " !Valid efi partition table header\n"));\r
-    gBS->FreePool (PartHdr);\r
+    FreePool (PartHdr);\r
     return FALSE;\r
   }\r
 \r
   CopyMem (PartHeader, PartHdr, sizeof (EFI_PARTITION_TABLE_HEADER));\r
   if (!PartitionCheckGptEntryArrayCRC (BlockIo, DiskIo, PartHeader)) {\r
-    gBS->FreePool (PartHdr);\r
+    FreePool (PartHdr);\r
     return FALSE;\r
   }\r
 \r
   DEBUG ((EFI_D_INFO, " Valid efi partition table header\n"));\r
-  gBS->FreePool (PartHdr);\r
+  FreePool (PartHdr);\r
   return TRUE;\r
 }\r
 \r
+STATIC\r
 BOOLEAN\r
 PartitionCheckGptEntryArrayCRC (\r
   IN  EFI_BLOCK_IO_PROTOCOL       *BlockIo,\r
@@ -439,7 +449,7 @@ Returns:
                     Ptr\r
                     );\r
   if (EFI_ERROR (Status)) {\r
-    gBS->FreePool (Ptr);\r
+    FreePool (Ptr);\r
     return FALSE;\r
   }\r
 \r
@@ -448,15 +458,16 @@ Returns:
   Status  = gBS->CalculateCrc32 (Ptr, Size, &Crc);\r
   if (EFI_ERROR (Status)) {\r
     DEBUG ((EFI_D_ERROR, "CheckPEntryArrayCRC: Crc calculation failed\n"));\r
-    gBS->FreePool (Ptr);\r
+    FreePool (Ptr);\r
     return FALSE;\r
   }\r
 \r
-  gBS->FreePool (Ptr);\r
+  FreePool (Ptr);\r
 \r
   return (BOOLEAN) (PartHeader->PartitionEntryArrayCRC32 == Crc);\r
 }\r
 \r
+STATIC\r
 BOOLEAN\r
 PartitionRestoreGptTable (\r
   IN  EFI_BLOCK_IO_PROTOCOL       *BlockIo,\r
@@ -544,8 +555,8 @@ Returns:
                     );\r
 \r
 Done:\r
-  gBS->FreePool (PartHdr);\r
-  gBS->FreePool (Ptr);\r
+  FreePool (PartHdr);\r
+  FreePool (Ptr);\r
 \r
   if (EFI_ERROR (Status)) {\r
     return FALSE;\r
@@ -554,6 +565,7 @@ Done:
   return TRUE;\r
 }\r
 \r
+STATIC\r
 VOID\r
 PartitionCheckGptEntry (\r
   IN  EFI_PARTITION_TABLE_HEADER  *PartHeader,\r
@@ -622,6 +634,7 @@ Returns:
   DEBUG ((EFI_D_INFO, " End check partition entries\n"));\r
 }\r
 \r
+STATIC\r
 VOID\r
 PartitionSetCrc (\r
   IN OUT EFI_TABLE_HEADER *Hdr\r
@@ -645,6 +658,7 @@ Returns:
   PartitionSetCrcAltSize (Hdr->HeaderSize, Hdr);\r
 }\r
 \r
+STATIC\r
 VOID\r
 PartitionSetCrcAltSize (\r
   IN UINTN                 Size,\r
@@ -674,6 +688,7 @@ Returns:
   Hdr->CRC32 = Crc;\r
 }\r
 \r
+STATIC\r
 BOOLEAN\r
 PartitionCheckCrc (\r
   IN UINTN                 MaxSize,\r
@@ -699,6 +714,7 @@ Returns:
   return PartitionCheckCrcAltSize (MaxSize, Hdr->HeaderSize, Hdr);\r
 }\r
 \r
+STATIC\r
 BOOLEAN\r
 PartitionCheckCrcAltSize (\r
   IN UINTN                 MaxSize,\r