EmulatorPkg: Change OPTIONAL keyword usage style

REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3760

Update all use of ', OPTIONAL' to ' OPTIONAL,' for function params.

Cc: Andrew Fish <afish@apple.com>
Cc: Leif Lindholm <leif@nuviainc.com>
Cc: Michael Kubacki <michael.kubacki@microsoft.com>
Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
Reviewed-by: Ray Ni <ray.ni@intel.com>

diff --git a/EmulatorPkg/EmuGopDxe/GopScreen.c b/EmulatorPkg/EmuGopDxe/GopScreen.c
index cbbb0db07fe351ec401bc35a2bde2861af23f966..05fd236151e23878b63bbccb8c491b42b6d66961 100644 (file)
--- a/EmulatorPkg/EmuGopDxe/GopScreen.c
+++ b/EmulatorPkg/EmuGopDxe/GopScreen.c
@@ -184,7 +184,7 @@ EFI_STATUS
 EFIAPI\r
 EmuGopBlt (\r
   IN  EFI_GRAPHICS_OUTPUT_PROTOCOL            *This,\r
-  IN  EFI_GRAPHICS_OUTPUT_BLT_PIXEL           *BltBuffer,   OPTIONAL\r
+  IN  EFI_GRAPHICS_OUTPUT_BLT_PIXEL           *BltBuffer    OPTIONAL,\r
   IN  EFI_GRAPHICS_OUTPUT_BLT_OPERATION       BltOperation,\r
   IN  UINTN                                   SourceX,\r
   IN  UINTN                                   SourceY,\r
@@ -407,4 +407,3 @@ Returns:
 {\r
   EmuGopDestructor (Context);\r
 }\r
-\r

diff --git a/EmulatorPkg/Library/DxeCoreTimerLib/DxeCoreTimerLib.c b/EmulatorPkg/Library/DxeCoreTimerLib/DxeCoreTimerLib.c
index ab0de143c443418884b75f0d8ddd81419092cc1d..513a5aaa7c3eb2958646826d29de9770fe30ed35 100644 (file)
--- a/EmulatorPkg/Library/DxeCoreTimerLib/DxeCoreTimerLib.c
+++ b/EmulatorPkg/Library/DxeCoreTimerLib/DxeCoreTimerLib.c
@@ -105,7 +105,7 @@ GetPerformanceCounter (
 UINT64\r
 EFIAPI\r
 GetPerformanceCounterProperties (\r
-  OUT      UINT64                    *StartValue,  OPTIONAL\r
+  OUT      UINT64                    *StartValue   OPTIONAL,\r
   OUT      UINT64                    *EndValue     OPTIONAL\r
   )\r
 {\r

diff --git a/EmulatorPkg/Library/DxeTimerLib/DxeTimerLib.c b/EmulatorPkg/Library/DxeTimerLib/DxeTimerLib.c
index 9c3e97e680a1423431908c04252be078404b403a..4244a5d65c5ff4b6634bbe9cb34e27475d1d5a38 100644 (file)
--- a/EmulatorPkg/Library/DxeTimerLib/DxeTimerLib.c
+++ b/EmulatorPkg/Library/DxeTimerLib/DxeTimerLib.c
@@ -155,7 +155,7 @@ GetPerformanceCounter (
 UINT64\r
 EFIAPI\r
 GetPerformanceCounterProperties (\r
-  OUT      UINT64                    *StartValue,  OPTIONAL\r
+  OUT      UINT64                    *StartValue   OPTIONAL,\r
   OUT      UINT64                    *EndValue     OPTIONAL\r
   )\r
 {\r

diff --git a/EmulatorPkg/Library/PeiTimerLib/PeiTimerLib.c b/EmulatorPkg/Library/PeiTimerLib/PeiTimerLib.c
index 132abb2c04c0ae6d4d0b3bec92939d2a2b9d42cf..c71b16685306582ff41954f9dfde46811d405cf9 100644 (file)
--- a/EmulatorPkg/Library/PeiTimerLib/PeiTimerLib.c
+++ b/EmulatorPkg/Library/PeiTimerLib/PeiTimerLib.c
@@ -136,7 +136,7 @@ GetPerformanceCounter (
 UINT64\r
 EFIAPI\r
 GetPerformanceCounterProperties (\r
-  OUT      UINT64                    *StartValue,  OPTIONAL\r
+  OUT      UINT64                    *StartValue   OPTIONAL,\r
   OUT      UINT64                    *EndValue     OPTIONAL\r
   )\r
 {\r

diff --git a/EmulatorPkg/Library/SecPeiServicesLib/PeiServicesLib.c b/EmulatorPkg/Library/SecPeiServicesLib/PeiServicesLib.c
index af85efcef379a632f7106085c22319263ac8e63f..c1d10d7f685e43e825b7c9379061cfb1aea0f6e7 100644 (file)
--- a/EmulatorPkg/Library/SecPeiServicesLib/PeiServicesLib.c
+++ b/EmulatorPkg/Library/SecPeiServicesLib/PeiServicesLib.c
@@ -548,14 +548,13 @@ PeiServicesFfsGetVolumeInfo (
 VOID\r
 EFIAPI\r
 PeiServicesInstallFvInfoPpi (\r
-  IN CONST EFI_GUID                *FvFormat, OPTIONAL\r
+  IN CONST EFI_GUID                *FvFormat  OPTIONAL,\r
   IN CONST VOID                    *FvInfo,\r
   IN       UINT32                  FvInfoSize,\r
-  IN CONST EFI_GUID                *ParentFvName, OPTIONAL\r
+  IN CONST EFI_GUID                *ParentFvName  OPTIONAL,\r
   IN CONST EFI_GUID                *ParentFileName OPTIONAL\r
   )\r
 {\r
   ASSERT (FALSE);\r
   return;\r
 }\r
-\r

diff --git a/EmulatorPkg/Unix/Host/Host.h b/EmulatorPkg/Unix/Host/Host.h
index 9791cf8c370eaba2dffc5eaccb433fd34e11bb95..a372ecaadbd9727bc06cfc360723b1904e9f1fc9 100644 (file)
--- a/EmulatorPkg/Unix/Host/Host.h
+++ b/EmulatorPkg/Unix/Host/Host.h
@@ -300,8 +300,8 @@ SecPeCoffLoaderUnloadImageExtraAction (
 VOID\r
 PeiSwitchStacks (\r
   IN      SWITCH_STACK_ENTRY_POINT  EntryPoint,\r
-  IN      VOID                      *Context1,  OPTIONAL\r
-  IN      VOID                      *Context2,  OPTIONAL\r
+  IN      VOID                      *Context1   OPTIONAL,\r
+  IN      VOID                      *Context2   OPTIONAL,\r
   IN      VOID                      *NewStack\r
   );\r
 \r

diff --git a/EmulatorPkg/Unix/Host/Ia32/SwitchStack.c b/EmulatorPkg/Unix/Host/Ia32/SwitchStack.c
index d9f7470c06d91b9c36f25ddb7585e5e3b677744f..0184de28941f9167329b41e807ecc93b320714c7 100644 (file)
--- a/EmulatorPkg/Unix/Host/Ia32/SwitchStack.c
+++ b/EmulatorPkg/Unix/Host/Ia32/SwitchStack.c
@@ -34,8 +34,8 @@ VOID
 EFIAPI\r
 PeiSwitchStacks (\r
   IN      SWITCH_STACK_ENTRY_POINT  EntryPoint,\r
-  IN      VOID                      *Context1,  OPTIONAL\r
-  IN      VOID                      *Context2,  OPTIONAL\r
+  IN      VOID                      *Context1   OPTIONAL,\r
+  IN      VOID                      *Context2   OPTIONAL,\r
   IN      VOID                      *NewStack\r
   )\r
 {\r
@@ -63,6 +63,3 @@ PeiSwitchStacks (
   //\r
   ASSERT (FALSE);\r
 }\r
-\r
-\r
-\r

diff --git a/EmulatorPkg/Win/Host/WinHost.c b/EmulatorPkg/Win/Host/WinHost.c
index 876cb8d4be8bbb252f334b029e8c6c5086cb817c..ffd1b9944d4b6caf58c124dceb26759285a71181 100644 (file)
--- a/EmulatorPkg/Win/Host/WinHost.c
+++ b/EmulatorPkg/Win/Host/WinHost.c
@@ -247,7 +247,7 @@ EfiSystemMemoryRange (
 \r
 EFI_STATUS\r
 WinNtOpenFile (\r
-  IN  CHAR16                    *FileName,            OPTIONAL\r
+  IN  CHAR16                    *FileName             OPTIONAL,\r
   IN  UINT32                    MapSize,\r
   IN  DWORD                     CreationDisposition,\r
   IN OUT  VOID                  **BaseAddress,\r