MdePkg: Apply uncrustify changes

[mirror_edk2.git] / MdePkg / Library / UefiDevicePathLib / UefiDevicePathLibOptionalDevicePathProtocol.c

diff --git a/MdePkg/Library/UefiDevicePathLib/UefiDevicePathLibOptionalDevicePathProtocol.c b/MdePkg/Library/UefiDevicePathLib/UefiDevicePathLibOptionalDevicePathProtocol.c
index e1e629442a0fafe8a14898c61585873a5138e5c4..dfe211205b7f18d7ca9178e728d6121c69a36ef7 100644 (file)
--- a/MdePkg/Library/UefiDevicePathLib/UefiDevicePathLibOptionalDevicePathProtocol.c
+++ b/MdePkg/Library/UefiDevicePathLib/UefiDevicePathLibOptionalDevicePathProtocol.c
@@ -13,12 +13,11 @@
 \r
 **/\r
 \r
 \r
 **/\r
 \r

-\r

 #include "UefiDevicePathLib.h"\r
 \r
 #include "UefiDevicePathLib.h"\r
 \r

-GLOBAL_REMOVE_IF_UNREFERENCED EFI_DEVICE_PATH_UTILITIES_PROTOCOL *mDevicePathLibDevicePathUtilities = NULL;\r
-GLOBAL_REMOVE_IF_UNREFERENCED EFI_DEVICE_PATH_TO_TEXT_PROTOCOL   *mDevicePathLibDevicePathToText    = NULL;\r
-GLOBAL_REMOVE_IF_UNREFERENCED EFI_DEVICE_PATH_FROM_TEXT_PROTOCOL *mDevicePathLibDevicePathFromText  = NULL;\r
+GLOBAL_REMOVE_IF_UNREFERENCED EFI_DEVICE_PATH_UTILITIES_PROTOCOL  *mDevicePathLibDevicePathUtilities = NULL;\r
+GLOBAL_REMOVE_IF_UNREFERENCED EFI_DEVICE_PATH_TO_TEXT_PROTOCOL    *mDevicePathLibDevicePathToText    = NULL;\r
+GLOBAL_REMOVE_IF_UNREFERENCED EFI_DEVICE_PATH_FROM_TEXT_PROTOCOL  *mDevicePathLibDevicePathFromText  = NULL;\r

 \r
 /**\r
   The constructor function caches the pointer to DevicePathUtilites protocol,\r
 \r
 /**\r
   The constructor function caches the pointer to DevicePathUtilites protocol,\r


@@ -37,16 +36,16 @@ GLOBAL_REMOVE_IF_UNREFERENCED EFI_DEVICE_PATH_FROM_TEXT_PROTOCOL *mDevicePathLib
 EFI_STATUS\r
 EFIAPI\r
 UefiDevicePathLibOptionalDevicePathProtocolConstructor (\r
 EFI_STATUS\r
 EFIAPI\r
 UefiDevicePathLibOptionalDevicePathProtocolConstructor (\r

-  IN      EFI_HANDLE                ImageHandle,\r
-  IN      EFI_SYSTEM_TABLE          *SystemTable\r
+  IN      EFI_HANDLE        ImageHandle,\r
+  IN      EFI_SYSTEM_TABLE  *SystemTable\r

   )\r
 {\r
   )\r
 {\r

-  EFI_STATUS                        Status;\r
+  EFI_STATUS  Status;\r

 \r
   Status = gBS->LocateProtocol (\r
                   &gEfiDevicePathUtilitiesProtocolGuid,\r
                   NULL,\r
 \r
   Status = gBS->LocateProtocol (\r
                   &gEfiDevicePathUtilitiesProtocolGuid,\r
                   NULL,\r

-                  (VOID**) &mDevicePathLibDevicePathUtilities\r
+                  (VOID **)&mDevicePathLibDevicePathUtilities\r

                   );\r
   ASSERT_EFI_ERROR (Status);\r
   ASSERT (mDevicePathLibDevicePathUtilities != NULL);\r
                   );\r
   ASSERT_EFI_ERROR (Status);\r
   ASSERT (mDevicePathLibDevicePathUtilities != NULL);\r


@@ -256,8 +255,8 @@ AppendDevicePathInstance (
 EFI_DEVICE_PATH_PROTOCOL *\r
 EFIAPI\r
 GetNextDevicePathInstance (\r
 EFI_DEVICE_PATH_PROTOCOL *\r
 EFIAPI\r
 GetNextDevicePathInstance (\r

-  IN OUT EFI_DEVICE_PATH_PROTOCOL    **DevicePath,\r
-  OUT UINTN                          *Size\r
+  IN OUT EFI_DEVICE_PATH_PROTOCOL  **DevicePath,\r
+  OUT UINTN                        *Size\r

   )\r
 {\r
   if (mDevicePathLibDevicePathUtilities != NULL) {\r
   )\r
 {\r
   if (mDevicePathLibDevicePathUtilities != NULL) {\r


@@ -289,9 +288,9 @@ GetNextDevicePathInstance (
 EFI_DEVICE_PATH_PROTOCOL *\r
 EFIAPI\r
 CreateDeviceNode (\r
 EFI_DEVICE_PATH_PROTOCOL *\r
 EFIAPI\r
 CreateDeviceNode (\r

-  IN UINT8                           NodeType,\r
-  IN UINT8                           NodeSubType,\r
-  IN UINT16                          NodeLength\r
+  IN UINT8   NodeType,\r
+  IN UINT8   NodeSubType,\r
+  IN UINT16  NodeLength\r

   )\r
 {\r
   if (mDevicePathLibDevicePathUtilities != NULL) {\r
   )\r
 {\r
   if (mDevicePathLibDevicePathUtilities != NULL) {\r


@@ -338,15 +337,16 @@ IsDevicePathMultiInstance (
 **/\r
 VOID *\r
 UefiDevicePathLibLocateProtocol (\r
 **/\r
 VOID *\r
 UefiDevicePathLibLocateProtocol (\r

-  EFI_GUID                         *ProtocolGuid\r
+  EFI_GUID  *ProtocolGuid\r

   )\r
 {\r
   )\r
 {\r

-  EFI_STATUS Status;\r
-  VOID       *Protocol;\r
+  EFI_STATUS  Status;\r
+  VOID        *Protocol;\r
+\r

   Status = gBS->LocateProtocol (\r
                   ProtocolGuid,\r
                   NULL,\r
   Status = gBS->LocateProtocol (\r
                   ProtocolGuid,\r
                   NULL,\r

-                  (VOID**) &Protocol\r
+                  (VOID **)&Protocol\r

                   );\r
   if (EFI_ERROR (Status)) {\r
     return NULL;\r
                   );\r
   if (EFI_ERROR (Status)) {\r
     return NULL;\r


@@ -381,6 +381,7 @@ ConvertDeviceNodeToText (
   if (mDevicePathLibDevicePathToText == NULL) {\r
     mDevicePathLibDevicePathToText = UefiDevicePathLibLocateProtocol (&gEfiDevicePathToTextProtocolGuid);\r
   }\r
   if (mDevicePathLibDevicePathToText == NULL) {\r
     mDevicePathLibDevicePathToText = UefiDevicePathLibLocateProtocol (&gEfiDevicePathToTextProtocolGuid);\r
   }\r

+\r

   if (mDevicePathLibDevicePathToText != NULL) {\r
     return mDevicePathLibDevicePathToText->ConvertDeviceNodeToText (DeviceNode, DisplayOnly, AllowShortcuts);\r
   }\r
   if (mDevicePathLibDevicePathToText != NULL) {\r
     return mDevicePathLibDevicePathToText->ConvertDeviceNodeToText (DeviceNode, DisplayOnly, AllowShortcuts);\r
   }\r


@@ -406,14 +407,15 @@ ConvertDeviceNodeToText (
 CHAR16 *\r
 EFIAPI\r
 ConvertDevicePathToText (\r
 CHAR16 *\r
 EFIAPI\r
 ConvertDevicePathToText (\r

-  IN CONST EFI_DEVICE_PATH_PROTOCOL   *DevicePath,\r
-  IN BOOLEAN                          DisplayOnly,\r
-  IN BOOLEAN                          AllowShortcuts\r
+  IN CONST EFI_DEVICE_PATH_PROTOCOL  *DevicePath,\r
+  IN BOOLEAN                         DisplayOnly,\r
+  IN BOOLEAN                         AllowShortcuts\r

   )\r
 {\r
   if (mDevicePathLibDevicePathToText == NULL) {\r
     mDevicePathLibDevicePathToText = UefiDevicePathLibLocateProtocol (&gEfiDevicePathToTextProtocolGuid);\r
   }\r
   )\r
 {\r
   if (mDevicePathLibDevicePathToText == NULL) {\r
     mDevicePathLibDevicePathToText = UefiDevicePathLibLocateProtocol (&gEfiDevicePathToTextProtocolGuid);\r
   }\r

+\r

   if (mDevicePathLibDevicePathToText != NULL) {\r
     return mDevicePathLibDevicePathToText->ConvertDevicePathToText (DevicePath, DisplayOnly, AllowShortcuts);\r
   }\r
   if (mDevicePathLibDevicePathToText != NULL) {\r
     return mDevicePathLibDevicePathToText->ConvertDevicePathToText (DevicePath, DisplayOnly, AllowShortcuts);\r
   }\r


@@ -435,12 +437,13 @@ ConvertDevicePathToText (
 EFI_DEVICE_PATH_PROTOCOL *\r
 EFIAPI\r
 ConvertTextToDeviceNode (\r
 EFI_DEVICE_PATH_PROTOCOL *\r
 EFIAPI\r
 ConvertTextToDeviceNode (\r

-  IN CONST CHAR16 *TextDeviceNode\r
+  IN CONST CHAR16  *TextDeviceNode\r

   )\r
 {\r
   if (mDevicePathLibDevicePathFromText == NULL) {\r
     mDevicePathLibDevicePathFromText = UefiDevicePathLibLocateProtocol (&gEfiDevicePathFromTextProtocolGuid);\r
   }\r
   )\r
 {\r
   if (mDevicePathLibDevicePathFromText == NULL) {\r
     mDevicePathLibDevicePathFromText = UefiDevicePathLibLocateProtocol (&gEfiDevicePathFromTextProtocolGuid);\r
   }\r

+\r

   if (mDevicePathLibDevicePathFromText != NULL) {\r
     return mDevicePathLibDevicePathFromText->ConvertTextToDeviceNode (TextDeviceNode);\r
   }\r
   if (mDevicePathLibDevicePathFromText != NULL) {\r
     return mDevicePathLibDevicePathFromText->ConvertTextToDeviceNode (TextDeviceNode);\r
   }\r


@@ -463,12 +466,13 @@ ConvertTextToDeviceNode (
 EFI_DEVICE_PATH_PROTOCOL *\r
 EFIAPI\r
 ConvertTextToDevicePath (\r
 EFI_DEVICE_PATH_PROTOCOL *\r
 EFIAPI\r
 ConvertTextToDevicePath (\r

-  IN CONST CHAR16 *TextDevicePath\r
+  IN CONST CHAR16  *TextDevicePath\r

   )\r
 {\r
   if (mDevicePathLibDevicePathFromText == NULL) {\r
     mDevicePathLibDevicePathFromText = UefiDevicePathLibLocateProtocol (&gEfiDevicePathFromTextProtocolGuid);\r
   }\r
   )\r
 {\r
   if (mDevicePathLibDevicePathFromText == NULL) {\r
     mDevicePathLibDevicePathFromText = UefiDevicePathLibLocateProtocol (&gEfiDevicePathFromTextProtocolGuid);\r
   }\r

+\r

   if (mDevicePathLibDevicePathFromText != NULL) {\r
     return mDevicePathLibDevicePathFromText->ConvertTextToDevicePath (TextDevicePath);\r
   }\r
   if (mDevicePathLibDevicePathFromText != NULL) {\r
     return mDevicePathLibDevicePathFromText->ConvertTextToDevicePath (TextDevicePath);\r
   }\r