Partially make EdkModulePkg pass intel IPF compiler with /W4 /WX switched on.

[mirror_edk2.git] / EdkModulePkg / Universal / DevicePath / Dxe / DevicePathToText.c

diff --git a/EdkModulePkg/Universal/DevicePath/Dxe/DevicePathToText.c b/EdkModulePkg/Universal/DevicePath/Dxe/DevicePathToText.c
index 25c88e07d6d1e285df2427d84084fc288559e627..03150706c79516579f06eb17f73bd6e70356638a 100644 (file)
--- a/EdkModulePkg/Universal/DevicePath/Dxe/DevicePathToText.c
+++ b/EdkModulePkg/Universal/DevicePath/Dxe/DevicePathToText.c
@@ -21,6 +21,7 @@ Abstract:
 \r
 #include "DevicePath.h"\r
 \r
+STATIC\r
 EFI_DEVICE_PATH_PROTOCOL *\r
 UnpackDevicePath (\r
   IN EFI_DEVICE_PATH_PROTOCOL  *DevPath\r
@@ -95,6 +96,7 @@ UnpackDevicePath (
   return NewPath;\r
 }\r
 \r
+STATIC\r
 VOID *\r
 ReallocatePool (\r
   IN VOID                 *OldPool,\r
@@ -136,6 +138,7 @@ ReallocatePool (
   return NewPool;\r
 }\r
 \r
+STATIC\r
 CHAR16 *\r
 CatPrint (\r
   IN OUT POOL_PRINT   *Str,\r
@@ -177,7 +180,8 @@ CatPrint (
     Str->Str  = AllocateZeroPool (Size);\r
     ASSERT (Str->Str != NULL);\r
   } else {\r
-    Size = StrSize (AppendStr) + StrSize (Str->Str) - sizeof (UINT16);\r
+    Size = StrSize (AppendStr)  - sizeof (UINT16);\r
+    Size = Size + StrSize (Str->Str);\r
     Str->Str = ReallocatePool (\r
                 Str->Str,\r
                 StrSize (Str->Str),\r
@@ -196,6 +200,7 @@ CatPrint (
   return Str->Str;\r
 }\r
 \r
+STATIC\r
 VOID\r
 DevPathToTextPci (\r
   IN OUT POOL_PRINT  *Str,\r
@@ -210,6 +215,7 @@ DevPathToTextPci (
   CatPrint (Str, L"Pci(%x,%x)", Pci->Function, Pci->Device);\r
 }\r
 \r
+STATIC\r
 VOID\r
 DevPathToTextPccard (\r
   IN OUT POOL_PRINT  *Str,\r
@@ -224,6 +230,7 @@ DevPathToTextPccard (
   CatPrint (Str, L"PcCard(%x)", Pccard->FunctionNumber);\r
 }\r
 \r
+STATIC\r
 VOID\r
 DevPathToTextMemMap (\r
   IN OUT POOL_PRINT  *Str,\r
@@ -243,6 +250,7 @@ DevPathToTextMemMap (
     );\r
 }\r
 \r
+STATIC\r
 VOID\r
 DevPathToTextVendor (\r
   IN OUT POOL_PRINT  *Str,\r
@@ -357,6 +365,7 @@ DevPathToTextVendor (
   CatPrint (Str, L")");\r
 }\r
 \r
+STATIC\r
 VOID\r
 DevPathToTextController (\r
   IN OUT POOL_PRINT  *Str,\r
@@ -375,6 +384,7 @@ DevPathToTextController (
     );\r
 }\r
 \r
+STATIC\r
 VOID\r
 DevPathToTextAcpi (\r
   IN OUT POOL_PRINT  *Str,\r
@@ -424,6 +434,7 @@ DevPathToTextAcpi (
 \r
 #define NextStrA(a) ((UINT8 *) (((UINT8 *) (a)) + AsciiStrLen ((CHAR8 *) (a)) + 1))\r
 \r
+STATIC\r
 VOID\r
 DevPathToTextExtAcpi (\r
   IN OUT POOL_PRINT  *Str,\r
@@ -433,12 +444,14 @@ DevPathToTextExtAcpi (
   )\r
 {\r
   ACPI_EXTENDED_HID_DEVICE_PATH_WITH_STR  *AcpiExt;\r
+  UINT8                                   *NextString;\r
 \r
   AcpiExt = DevPath;\r
 \r
   if (AllowShortcuts) {\r
+    NextString = NextStrA (AcpiExt->HidUidCidStr);\r
     if ((*(AcpiExt->HidUidCidStr) == '\0') &&\r
-        (*(NextStrA (NextStrA (AcpiExt->HidUidCidStr))) == '\0') &&\r
+        (*(NextStrA (NextString)) == '\0') &&\r
         (AcpiExt->UID == 0)\r
         ) {\r
       if ((AcpiExt->HID & PNP_EISA_ID_MASK) == PNP_EISA_ID_CONST) {\r
@@ -462,6 +475,8 @@ DevPathToTextExtAcpi (
     return ;\r
   }\r
 \r
+  NextString = NextStrA (AcpiExt->HidUidCidStr);\r
+  NextString = NextStrA (NextString);\r
   if ((AcpiExt->HID & PNP_EISA_ID_MASK) == PNP_EISA_ID_CONST) {\r
     CatPrint (\r
       Str,\r
@@ -470,7 +485,7 @@ DevPathToTextExtAcpi (
       AcpiExt->CID,\r
       AcpiExt->UID,\r
       AcpiExt->HidUidCidStr,\r
-      NextStrA (NextStrA (AcpiExt->HidUidCidStr)),\r
+      NextString,\r
       NextStrA (AcpiExt->HidUidCidStr)\r
       );\r
   } else {\r
@@ -481,12 +496,13 @@ DevPathToTextExtAcpi (
       AcpiExt->CID,\r
       AcpiExt->UID,\r
       AcpiExt->HidUidCidStr,\r
-      NextStrA (NextStrA (AcpiExt->HidUidCidStr)),\r
+      NextString,\r
       NextStrA (AcpiExt->HidUidCidStr)\r
       );\r
   }\r
 }\r
 \r
+STATIC\r
 VOID\r
 DevPathToTextAtapi (\r
   IN OUT POOL_PRINT  *Str,\r
@@ -512,6 +528,7 @@ DevPathToTextAtapi (
   }\r
 }\r
 \r
+STATIC\r
 VOID\r
 DevPathToTextScsi (\r
   IN OUT POOL_PRINT  *Str,\r
@@ -526,6 +543,7 @@ DevPathToTextScsi (
   CatPrint (Str, L"Scsi(%x,%x)", Scsi->Pun, Scsi->Lun);\r
 }\r
 \r
+STATIC\r
 VOID\r
 DevPathToTextFibre (\r
   IN OUT POOL_PRINT  *Str,\r
@@ -540,6 +558,7 @@ DevPathToTextFibre (
   CatPrint (Str, L"Fibre(%lx,%lx)", Fibre->WWN, Fibre->Lun);\r
 }\r
 \r
+STATIC\r
 VOID\r
 DevPathToText1394 (\r
   IN OUT POOL_PRINT  *Str,\r
@@ -554,6 +573,7 @@ DevPathToText1394 (
   CatPrint (Str, L"I1394(%lx)", F1394->Guid);\r
 }\r
 \r
+STATIC\r
 VOID\r
 DevPathToTextUsb (\r
   IN OUT POOL_PRINT  *Str,\r
@@ -568,6 +588,7 @@ DevPathToTextUsb (
   CatPrint (Str, L"USB(%x,%x)", Usb->ParentPortNumber, Usb->InterfaceNumber);\r
 }\r
 \r
+STATIC\r
 VOID\r
 DevPathToTextUsbWWID (\r
   IN OUT POOL_PRINT  *Str,\r
@@ -588,6 +609,7 @@ DevPathToTextUsbWWID (
     );\r
 }\r
 \r
+STATIC\r
 VOID\r
 DevPathToTextLogicalUnit (\r
   IN OUT POOL_PRINT  *Str,\r
@@ -602,6 +624,7 @@ DevPathToTextLogicalUnit (
   CatPrint (Str, L"Unit(%x)", LogicalUnit->Lun);\r
 }\r
 \r
+STATIC\r
 VOID\r
 DevPathToTextUsbClass (\r
   IN OUT POOL_PRINT  *Str,\r
@@ -794,6 +817,7 @@ DevPathToTextUsbClass (
     );\r
 }\r
 \r
+STATIC\r
 VOID\r
 DevPathToTextI2O (\r
   IN OUT POOL_PRINT  *Str,\r
@@ -808,6 +832,7 @@ DevPathToTextI2O (
   CatPrint (Str, L"I2O(%x)", I2O->Tid);\r
 }\r
 \r
+STATIC\r
 VOID\r
 DevPathToTextMacAddr (\r
   IN OUT POOL_PRINT  *Str,\r
@@ -836,6 +861,7 @@ DevPathToTextMacAddr (
   CatPrint (Str, L",%x)", MAC->IfType);\r
 }\r
 \r
+STATIC\r
 VOID\r
 DevPathToTextIPv4 (\r
   IN OUT POOL_PRINT  *Str,\r
@@ -875,6 +901,7 @@ DevPathToTextIPv4 (
     );\r
 }\r
 \r
+STATIC\r
 VOID\r
 DevPathToTextIPv6 (\r
   IN OUT POOL_PRINT  *Str,\r
@@ -950,6 +977,7 @@ DevPathToTextIPv6 (
     );\r
 }\r
 \r
+STATIC\r
 VOID\r
 DevPathToTextInfiniBand (\r
   IN OUT POOL_PRINT  *Str,\r
@@ -972,6 +1000,7 @@ DevPathToTextInfiniBand (
     );\r
 }\r
 \r
+STATIC\r
 VOID\r
 DevPathToTextUart (\r
   IN OUT POOL_PRINT  *Str,\r
@@ -1051,6 +1080,7 @@ DevPathToTextUart (
   }\r
 }\r
 \r
+STATIC\r
 VOID\r
 DevPathToTextiSCSI (\r
   IN OUT POOL_PRINT  *Str,\r
@@ -1086,6 +1116,7 @@ DevPathToTextiSCSI (
   CatPrint (Str, L"%s)", (iSCSI->NetworkProtocol == 0) ? L"TCP" : L"reserved");\r
 }\r
 \r
+STATIC\r
 VOID\r
 DevPathToTextHardDrive (\r
   IN OUT POOL_PRINT  *Str,\r
@@ -1134,6 +1165,7 @@ DevPathToTextHardDrive (
   CatPrint (Str, L"%lx,%lx)", Hd->PartitionStart, Hd->PartitionSize);\r
 }\r
 \r
+STATIC\r
 VOID\r
 DevPathToTextCDROM (\r
   IN OUT POOL_PRINT  *Str,\r
@@ -1153,6 +1185,7 @@ DevPathToTextCDROM (
   CatPrint (Str, L"CDROM(%x,%lx,%lx)", Cd->BootEntry, Cd->PartitionStart, Cd->PartitionSize);\r
 }\r
 \r
+STATIC\r
 VOID\r
 DevPathToTextFilePath (\r
   IN OUT POOL_PRINT  *Str,\r
@@ -1167,6 +1200,7 @@ DevPathToTextFilePath (
   CatPrint (Str, L"%s", Fp->PathName);\r
 }\r
 \r
+STATIC\r
 VOID\r
 DevPathToTextMediaProtocol (\r
   IN OUT POOL_PRINT  *Str,\r
@@ -1181,6 +1215,7 @@ DevPathToTextMediaProtocol (
   CatPrint (Str, L"Media(%g)", &MediaProt->Protocol);\r
 }\r
 \r
+STATIC\r
 VOID\r
 DevPathToTextBBS (\r
   IN OUT POOL_PRINT  *Str,\r
@@ -1233,6 +1268,7 @@ DevPathToTextBBS (
   CatPrint (Str, L",%x)", Bbs->StatusFlag);\r
 }\r
 \r
+STATIC\r
 VOID\r
 DevPathToTextEndInstance (\r
   IN OUT POOL_PRINT  *Str,\r
@@ -1244,6 +1280,7 @@ DevPathToTextEndInstance (
   CatPrint (Str, L",");\r
 }\r
 \r
+STATIC\r
 VOID\r
 DevPathToTextNodeUnknown (\r
   IN OUT POOL_PRINT  *Str,\r