clean up the un-suitable ';' location when declaring the functions. The regular is...

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@5821 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/EdkCompatibilityPkg/Compatibility/DeviceIoToPciRootBridgeIoThunk/DeviceIoToPciRootBridgeIoThunk.c b/EdkCompatibilityPkg/Compatibility/DeviceIoToPciRootBridgeIoThunk/DeviceIoToPciRootBridgeIoThunk.c
index 3c8c2a58f6f122777c21eb05dbec4be372187eaf..24acfb3b678d1cfd1bbbfdcfa1789f96bec08aa1 100644 (file)
--- a/EdkCompatibilityPkg/Compatibility/DeviceIoToPciRootBridgeIoThunk/DeviceIoToPciRootBridgeIoThunk.c
+++ b/EdkCompatibilityPkg/Compatibility/DeviceIoToPciRootBridgeIoThunk/DeviceIoToPciRootBridgeIoThunk.c
@@ -61,8 +61,7 @@ DeviceIoMemRead (
   IN     UINT64                   Address,\r
   IN     UINTN                    Count,\r
   IN OUT VOID                     *Buffer\r
-  )\r
-;\r
+  );\r
 \r
 \r
 /**\r
@@ -89,8 +88,7 @@ DeviceIoMemWrite (
   IN     UINT64                    Address,\r
   IN     UINTN                     Count,\r
   IN OUT VOID                      *Buffer\r
-  )\r
-;\r
+  );\r
 \r
 /**\r
   Perform reading I/O space of device.\r
@@ -116,8 +114,7 @@ DeviceIoIoRead (
   IN     UINT64                   Address,\r
   IN     UINTN                    Count,\r
   IN OUT VOID                     *Buffer\r
-  )\r
-;\r
+  );\r
 \r
 /**\r
   Perform writing I/O space of device.\r
@@ -143,8 +140,7 @@ DeviceIoIoWrite (
   IN     UINT64                    Address,\r
   IN     UINTN                     Count,\r
   IN OUT VOID                      *Buffer\r
-  )\r
-;\r
+  );\r
 \r
 /**\r
   Perform reading PCI configuration space of device\r
@@ -170,8 +166,7 @@ DeviceIoPciRead (
   IN     UINT64                   Address,\r
   IN     UINTN                    Count,\r
   IN OUT VOID                     *Buffer\r
-  )\r
-;\r
+  );\r
 \r
 /**\r
   Perform writing PCI configuration space of device.\r
@@ -197,8 +192,7 @@ DeviceIoPciWrite (
   IN     UINT64                    Address,\r
   IN     UINTN                     Count,\r
   IN OUT VOID                      *Buffer\r
-  )\r
-;\r
+  );\r
 \r
 /**\r
   Provides an EFI Device Path for a PCI device with the given PCI configuration space address.\r
@@ -224,8 +218,7 @@ DeviceIoPciDevicePath (
   IN     EFI_DEVICE_IO_PROTOCOL        *This,\r
   IN     UINT64                        Address,\r
   IN OUT EFI_DEVICE_PATH_PROTOCOL      **PciDevicePath\r
-  )\r
-;\r
+  );\r
 \r
 /**\r
   Provides the device-specific addresses needed to access system memory.\r
@@ -260,8 +253,7 @@ DeviceIoMap (
   IN OUT UINTN                    *NumberOfBytes,\r
   OUT    EFI_PHYSICAL_ADDRESS     *DeviceAddress,\r
   OUT    VOID                     **Mapping\r
-  )\r
-;\r
+  );\r
 \r
 /**\r
   Completes the Map() operation and releases any corresponding resources.\r
@@ -279,8 +271,7 @@ EFIAPI
 DeviceIoUnmap (\r
   IN EFI_DEVICE_IO_PROTOCOL   *This,\r
   IN VOID                     *Mapping\r
-  )\r
-;\r
+  );\r
 \r
 /**\r
   Allocates pages that are suitable for an EFIBusMasterCommonBuffer mapping.\r
@@ -308,8 +299,7 @@ DeviceIoAllocateBuffer (
   IN     EFI_MEMORY_TYPE           MemoryType,\r
   IN     UINTN                     Pages,\r
   IN OUT EFI_PHYSICAL_ADDRESS      *PhysicalAddress\r
-  )\r
-;\r
+  );\r
 \r
 /**\r
   Flushes any posted write data to the device.\r
@@ -325,8 +315,7 @@ EFI_STATUS
 EFIAPI\r
 DeviceIoFlush (\r
   IN EFI_DEVICE_IO_PROTOCOL  *This\r
-  )\r
-;\r
+  );\r
 \r
 /**\r
   Frees pages that were allocated with AllocateBuffer().\r
@@ -348,8 +337,7 @@ DeviceIoFreeBuffer (
   IN EFI_DEVICE_IO_PROTOCOL   *This,\r
   IN UINTN                    Pages,\r
   IN EFI_PHYSICAL_ADDRESS     HostAddress\r
-  )\r
-;\r
+  );\r
 \r
 \r
 #define DEVICE_IO_PRIVATE_DATA_SIGNATURE  EFI_SIGNATURE_32 ('D', 'e', 'I', 'O')\r

diff --git a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/ConfigAccess.h b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/ConfigAccess.h
index fb728074d1e2ce079c60cfee40534b8826abae00..c26f456620095f71a78e025a9e8ccdc3bcc0d6ab 100644 (file)
--- a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/ConfigAccess.h
+++ b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/ConfigAccess.h
@@ -35,14 +35,12 @@ EFI_STATUS
 InstallDefaultConfigAccessProtocol (\r
   IN  CONST EFI_HII_PACKAGES                         *Packages,\r
   IN  OUT   HII_THUNK_CONTEXT *ThunkContext\r
-  )\r
-;\r
+  );\r
 \r
 VOID\r
 UninstallDefaultConfigAccessProtocol (\r
   IN  HII_THUNK_CONTEXT                   *ThunkContext\r
-  )\r
-;\r
+  );\r
 \r
 /**\r
 \r
@@ -74,8 +72,7 @@ ThunkExtractConfig (
   IN  CONST EFI_STRING                       Request,\r
   OUT EFI_STRING                             *Progress,\r
   OUT EFI_STRING                             *Results\r
-  )\r
-;\r
+  );\r
 \r
 \r
 /**\r
@@ -100,8 +97,7 @@ ThunkRouteConfig (
   IN  CONST EFI_HII_CONFIG_ACCESS_PROTOCOL   *This,\r
   IN  CONST EFI_STRING                       Configuration,\r
   OUT EFI_STRING                             *Progress\r
-  )\r
-;\r
+  );\r
 \r
 /**\r
   Wrap the EFI_HII_CONFIG_ACCESS_PROTOCOL.CallBack to EFI_FORM_CALLBACK_PROTOCOL.Callback. Therefor,\r
@@ -137,8 +133,7 @@ ThunkCallback (
   IN  UINT8                                  Type,\r
   IN  EFI_IFR_TYPE_VALUE                     *Value,\r
   OUT EFI_BROWSER_ACTION_REQUEST             *ActionRequest\r
-  )\r
-;\r
+  );\r
 \r
 #endif\r
 \r

diff --git a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/HiiDatabase.h b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/HiiDatabase.h
index e165d74855fe085ce9be5f2b916b9284139fb4e7..2fc2be81a43f05693c255b1d14372c37c9b52b4e 100644 (file)
--- a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/HiiDatabase.h
+++ b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/HiiDatabase.h
@@ -237,16 +237,14 @@ HiiNewPack (
   IN  EFI_HII_PROTOCOL              *This,\r
   IN  EFI_HII_PACKAGES              *PackageList,\r
   OUT FRAMEWORK_EFI_HII_HANDLE      *Handle\r
-  )\r
-;\r
+  );\r
 \r
 EFI_STATUS\r
 EFIAPI\r
 HiiRemovePack (\r
   IN EFI_HII_PROTOCOL               *This,\r
   IN FRAMEWORK_EFI_HII_HANDLE       Handle\r
-  )\r
-;\r
+  );\r
 \r
 EFI_STATUS\r
 EFIAPI\r
@@ -254,8 +252,7 @@ HiiFindHandles (
   IN     EFI_HII_PROTOCOL           *This,\r
   IN OUT UINT16                     *HandleBufferLength,\r
   OUT    FRAMEWORK_EFI_HII_HANDLE   *Handle\r
-  )\r
-;\r
+  );\r
 \r
 EFI_STATUS\r
 EFIAPI\r
@@ -264,8 +261,7 @@ HiiExportDatabase (
   IN     FRAMEWORK_EFI_HII_HANDLE   Handle,\r
   IN OUT UINTN                      *BufferSize,\r
   OUT    VOID                       *Buffer\r
-  )\r
-;\r
+  );\r
 \r
 EFI_STATUS\r
 EFIAPI\r
@@ -276,8 +272,7 @@ HiiGetGlyph (
   OUT    UINT8                      **GlyphBuffer,\r
   OUT    UINT16                     *BitWidth,\r
   IN OUT UINT32                     *InternalStatus\r
-  )\r
-;\r
+  );\r
 \r
 EFI_STATUS\r
 EFIAPI\r
@@ -290,8 +285,7 @@ HiiGlyphToBlt (
   IN     UINTN                         Width,\r
   IN     UINTN                         Height,\r
   IN OUT EFI_GRAPHICS_OUTPUT_BLT_PIXEL *BltBuffer\r
-  )\r
-;\r
+  );\r
 \r
 EFI_STATUS\r
 EFIAPI\r
@@ -301,8 +295,7 @@ HiiNewString (
   IN     FRAMEWORK_EFI_HII_HANDLE Handle,\r
   IN OUT STRING_REF              *Reference,\r
   IN     CHAR16                  *NewString\r
-  )\r
-;\r
+  );\r
 \r
 EFI_STATUS\r
 EFIAPI\r
@@ -314,16 +307,14 @@ HiiGetString (
   IN     CHAR16                     *LanguageString,\r
   IN OUT UINTN                      *BufferLength,\r
   OUT    EFI_STRING                 StringBuffer\r
-  )\r
-;\r
+  );\r
 \r
 EFI_STATUS\r
 EFIAPI\r
 HiiResetStrings (\r
   IN     EFI_HII_PROTOCOL           *This,\r
   IN     FRAMEWORK_EFI_HII_HANDLE   Handle\r
-  )\r
-;\r
+  );\r
 \r
 EFI_STATUS\r
 EFIAPI\r
@@ -332,8 +323,7 @@ HiiTestString (
   IN     CHAR16                     *StringToTest,\r
   IN OUT UINT32                     *FirstMissing,\r
   OUT    UINT32                     *GlyphBufferSize\r
-  )\r
-;\r
+  );\r
 \r
 EFI_STATUS\r
 EFIAPI\r
@@ -341,8 +331,7 @@ HiiGetPrimaryLanguages (
   IN  EFI_HII_PROTOCOL              *This,\r
   IN  FRAMEWORK_EFI_HII_HANDLE      Handle,\r
   OUT EFI_STRING                    *LanguageString\r
-  )\r
-;\r
+  );\r
 \r
 EFI_STATUS\r
 EFIAPI\r
@@ -351,8 +340,7 @@ HiiGetSecondaryLanguages (
   IN  FRAMEWORK_EFI_HII_HANDLE        Handle,\r
   IN  CHAR16                          *PrimaryLanguage,\r
   OUT EFI_STRING                      *LanguageString\r
-  )\r
-;\r
+  );\r
 \r
 EFI_STATUS\r
 EFIAPI\r
@@ -365,8 +353,7 @@ HiiGetLine (
   IN     CHAR16                         *LanguageString,\r
   IN OUT UINT16                         *BufferLength,\r
   OUT    EFI_STRING                     StringBuffer\r
-  )\r
-;\r
+  );\r
 \r
 EFI_STATUS\r
 EFIAPI\r
@@ -376,8 +363,7 @@ HiiGetForms (
   IN     EFI_FORM_ID                    FormId,\r
   IN OUT UINTN                          *BufferLength,\r
   OUT    UINT8                          *Buffer\r
-  )\r
-;\r
+  );\r
 \r
 EFI_STATUS\r
 EFIAPI\r
@@ -386,8 +372,7 @@ HiiGetDefaultImage (
   IN     FRAMEWORK_EFI_HII_HANDLE       Handle,\r
   IN     UINTN                          DefaultMask,\r
   OUT    EFI_HII_VARIABLE_PACK_LIST     **VariablePackList\r
-  )\r
-;\r
+  );\r
 \r
 EFI_STATUS\r
 EFIAPI\r
@@ -397,8 +382,7 @@ HiiUpdateForm (
   IN EFI_FORM_LABEL                     Label,\r
   IN BOOLEAN                            AddData,\r
   IN FRAMEWORK_EFI_HII_UPDATE_DATA      *Data\r
-  )\r
-;\r
+  );\r
 \r
 EFI_STATUS\r
 EFIAPI\r
@@ -406,8 +390,7 @@ HiiGetKeyboardLayout (
   IN     EFI_HII_PROTOCOL               *This,\r
   OUT    UINT16                         *DescriptorCount,\r
   OUT    FRAMEWORK_EFI_KEY_DESCRIPTOR   *Descriptor\r
-  )\r
-;\r
+  );\r
 \r
 EFI_STATUS\r
 EFIAPI \r
@@ -421,8 +404,7 @@ ThunkSendForm (
   IN  UINT8                           *NvMapOverride, OPTIONAL\r
   IN  FRAMEWORK_EFI_SCREEN_DESCRIPTOR *ScreenDimensions, OPTIONAL\r
   OUT BOOLEAN                         *ResetRequired OPTIONAL\r
-  )\r
-;\r
+  );\r
 \r
 EFI_STATUS\r
 EFIAPI \r
@@ -434,8 +416,7 @@ ThunkCreatePopUp (
   OUT EFI_INPUT_KEY                   *KeyValue,\r
   IN  CHAR16                          *String,\r
   ...\r
-  )\r
-;\r
+  );\r
 \r
 EFI_STATUS\r
 EFIAPI\r
@@ -445,8 +426,7 @@ RemovePackNotify (
   IN CONST EFI_HII_PACKAGE_HEADER       *Package,\r
   IN EFI_HII_HANDLE                     Handle,\r
   IN EFI_HII_DATABASE_NOTIFY_TYPE       NotifyType\r
-  )\r
-;\r
+  );\r
 \r
 EFI_STATUS\r
 EFIAPI\r
@@ -456,8 +436,7 @@ NewOrAddPackNotify (
   IN CONST EFI_HII_PACKAGE_HEADER       *Package,\r
   IN EFI_HII_HANDLE                     Handle,\r
   IN EFI_HII_DATABASE_NOTIFY_TYPE       NotifyType\r
-  )\r
-;\r
+  );\r
 \r
 #include "Utility.h"\r
 #include "ConfigAccess.h"\r

diff --git a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/HiiHandle.h b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/HiiHandle.h
index 78612795b5c0b591c344fe240a74840828fd2c6d..ed2b186b7dbd4bb5d07a84c84aa04f64cef685ff 100644 (file)
--- a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/HiiHandle.h
+++ b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/HiiHandle.h
@@ -22,8 +22,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 VOID\r
 InitHiiHandleDatabase (\r
   VOID\r
-  )\r
-;\r
+  );\r
 \r
 EFI_STATUS\r
 AllocateHiiHandle (\r

diff --git a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/OpcodeCreation.h b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/OpcodeCreation.h
index 0c662399ab2ce121694cf69a80258b3ac8b8f8b9..c56947539d45644bcffd532837508721e40a905f 100644 (file)
--- a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/OpcodeCreation.h
+++ b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/OpcodeCreation.h
@@ -19,38 +19,33 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 EFI_STATUS\r
 UCreateEndOfOpcode (\r
   OUT      EFI_HII_UPDATE_DATA         *UefiData\r
-  )\r
-;\r
+  );\r
 \r
 EFI_STATUS\r
 F2UCreateSubtitleOpCode (\r
   IN CONST FRAMEWORK_EFI_IFR_SUBTITLE  *FwOpcode,\r
   OUT      EFI_HII_UPDATE_DATA         *UefiData\r
-  )\r
-;\r
+  );\r
 \r
 EFI_STATUS\r
 F2UCreateTextOpCode (\r
   IN CONST FRAMEWORK_EFI_IFR_TEXT      *FwOpcode,\r
   OUT      EFI_HII_UPDATE_DATA         *UefiData\r
-  )\r
-;\r
+  );\r
 \r
 \r
 EFI_STATUS\r
 F2UCreateGotoOpCode (\r
   IN CONST FRAMEWORK_EFI_IFR_REF       *FwOpcode,\r
   OUT      EFI_HII_UPDATE_DATA         *UefiData\r
-  )\r
-;\r
+  );\r
 \r
 EFI_STATUS\r
 F2UCreateOneOfOptionOpCode (\r
   IN CONST FRAMEWORK_EFI_IFR_ONE_OF_OPTION    *FwOpcode,\r
   IN       UINTN                              Width,\r
   OUT      EFI_HII_UPDATE_DATA                *UefiData\r
-  )\r
-;\r
+  );\r
 \r
 EFI_STATUS\r
 F2UCreateOneOfOpCode (\r
@@ -60,8 +55,7 @@ F2UCreateOneOfOpCode (
   OUT      EFI_HII_UPDATE_DATA         *UefiData,\r
   OUT      FRAMEWORK_EFI_IFR_OP_HEADER **NextFwOpcode,\r
   OUT      UINTN                       *DataCount\r
-  )\r
-;\r
+  );\r
 \r
 EFI_STATUS\r
 F2UCreateOrderedListOpCode (\r
@@ -71,8 +65,7 @@ F2UCreateOrderedListOpCode (
   OUT      EFI_HII_UPDATE_DATA         *UefiData,\r
   OUT      FRAMEWORK_EFI_IFR_OP_HEADER **NextFwOpcode,\r
   OUT      UINTN                       *DataCount\r
-  )\r
-;\r
+  );\r
 \r
 \r
 EFI_STATUS\r
@@ -81,8 +74,7 @@ F2UCreateCheckBoxOpCode (
   IN       UINT16                      VarStoreId,\r
   IN CONST FRAMEWORK_EFI_IFR_CHECKBOX  *FwOpcode,\r
   OUT      EFI_HII_UPDATE_DATA         *UefiData\r
-  )\r
-;\r
+  );\r
 \r
 \r
 EFI_STATUS\r
@@ -91,8 +83,7 @@ F2UCreateNumericOpCode (
   IN       UINT16                      VarStoreId,\r
   IN CONST FRAMEWORK_EFI_IFR_NUMERIC   *FwOpcode,\r
   OUT      EFI_HII_UPDATE_DATA         *UefiData\r
-  )\r
-;\r
+  );\r
 \r
 \r
 EFI_STATUS\r
@@ -101,16 +92,14 @@ F2UCreateStringOpCode (
   IN       UINT16                      VarStoreId,\r
   IN CONST FRAMEWORK_EFI_IFR_STRING    *FwOpcode,\r
   OUT      EFI_HII_UPDATE_DATA         *UefiData\r
-  )\r
-;\r
+  );\r
 \r
 \r
 EFI_STATUS\r
 F2UCreateBannerOpCode (\r
   IN CONST FRAMEWORK_EFI_IFR_BANNER    *FwOpcode,\r
   OUT      EFI_HII_UPDATE_DATA         *UefiData\r
-  )\r
-;\r
+  );\r
 \r
 EFI_STATUS\r
 FwUpdateDataToUefiUpdateData (\r
@@ -118,7 +107,6 @@ FwUpdateDataToUefiUpdateData (
   IN CONST FRAMEWORK_EFI_HII_UPDATE_DATA    *Data,\r
   IN       BOOLEAN                          AddData,\r
   OUT      EFI_HII_UPDATE_DATA              **UefiData\r
-  )\r
-;\r
+  );\r
 #endif\r
 \r

diff --git a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/UefiIfrDefault.h b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/UefiIfrDefault.h
index 9bb4063b605dcd55bbfca2601215458daa70e152..020c5e5cbc6ef44acaf9e9ea02f7ed1238108270 100644 (file)
--- a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/UefiIfrDefault.h
+++ b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/UefiIfrDefault.h
@@ -74,8 +74,7 @@ UefiDefaultsToFwDefaults (
   IN     LIST_ENTRY                  *UefiIfrDefaults,\r
   IN     UINTN                       DefaultMask,\r
   OUT    EFI_HII_VARIABLE_PACK_LIST  **VariablePackList\r
-  )\r
-;\r
+  );\r
 \r
 /**\r
   Free up all buffer allocated for the link list of UEFI_IFR_BUFFER_STORAGE_NODE.\r
@@ -92,8 +91,7 @@ UefiDefaultsToFwDefaults (
 VOID\r
 FreeDefaultList (\r
   IN     LIST_ENTRY                  *UefiIfrDefaults\r
-  )\r
-;\r
+  );\r
 \r
 #endif\r
 \r

diff --git a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/UefiIfrParser.h b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/UefiIfrParser.h
index 840c72428987010f3f8c5203f9cba5a221d83403..cfc12035cccc060d4243b257239668c3acd4d857 100644 (file)
--- a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/UefiIfrParser.h
+++ b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/UefiIfrParser.h
@@ -295,20 +295,17 @@ EvaluateExpression (
   IN FORM_BROWSER_FORMSET  *FormSet,\r
   IN FORM_BROWSER_FORM     *Form,\r
   IN OUT FORM_EXPRESSION   *Expression\r
-  )\r
-;\r
+  );\r
 \r
 EFI_STATUS\r
 ParseOpCodes (\r
   IN FORM_BROWSER_FORMSET              *FormSet\r
-  )\r
-;\r
+  );\r
 \r
 VOID\r
 DestroyFormSet (\r
   IN OUT FORM_BROWSER_FORMSET  *FormSet\r
-  )\r
-;\r
+  );\r
 \r
 #endif\r
 \r

diff --git a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/UefiIfrParserCommon.h b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/UefiIfrParserCommon.h
index 8c45ee5ab325a21e359e58907b80c79882d9d4f8..2f7876099cfaee4695ed2724503bcc9f16d0a735 100644 (file)
--- a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/UefiIfrParserCommon.h
+++ b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/UefiIfrParserCommon.h
@@ -37,8 +37,7 @@ CHAR16 *
 GetToken (\r
   IN  EFI_STRING_ID                Token,\r
   IN  EFI_HII_HANDLE               HiiHandle\r
-  )\r
-;\r
+  );\r
 \r
 /**\r
   Create a new string in HII Package List.\r
@@ -54,8 +53,7 @@ EFI_STRING_ID
 NewString (\r
   IN  CHAR16                   *String,\r
   IN  EFI_HII_HANDLE           HiiHandle\r
-  )\r
-;\r
+  );\r
 \r
 #endif\r
 \r

diff --git a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/UefiIfrParserExpression.h b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/UefiIfrParserExpression.h
index c4ed930ea2e5072d122693b64de63b66632a926a..c55277ff1310296a9581edae51a6edb2617045e7 100644 (file)
--- a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/UefiIfrParserExpression.h
+++ b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/UefiIfrParserExpression.h
@@ -27,8 +27,7 @@
 VOID\r
 ResetScopeStack (\r
   VOID\r
-  )\r
-;\r
+  );\r
 \r
 /**\r
   Push an Operand onto the Stack\r
@@ -43,8 +42,7 @@ ResetScopeStack (
 EFI_STATUS\r
 PushScope (\r
   IN UINT8   Operand\r
-  )\r
-;\r
+  );\r
 \r
 \r
 /**\r
@@ -60,8 +58,7 @@ PushScope (
 EFI_STATUS\r
 PopScope (\r
   OUT UINT8     *Operand\r
-  )\r
-;\r
+  );\r
 \r
 /**\r
   Zero extend integer/boolean/date/time to UINT64 for comparing.\r
@@ -74,8 +71,7 @@ PopScope (
 VOID\r
 ExtendValueToU64 (\r
   IN  EFI_HII_VALUE   *Value\r
-  )\r
-;\r
+  );\r
 \r
 /**\r
   Compare two Hii value.\r
@@ -95,7 +91,6 @@ CompareHiiValue (
   IN  EFI_HII_VALUE   *Value1,\r
   IN  EFI_HII_VALUE   *Value2,\r
   IN  EFI_HII_HANDLE  HiiHandle OPTIONAL\r
-  )\r
-;\r
+  );\r
 \r
 #endif\r

diff --git a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/UefiIfrParserExpressionInternal.h b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/UefiIfrParserExpressionInternal.h
index fea10aafd55dc0c0afead1385ce26756e02ad619..a77902c8127265d2371077aaa8efa91cce5f8a48 100644 (file)
--- a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/UefiIfrParserExpressionInternal.h
+++ b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/UefiIfrParserExpressionInternal.h
@@ -27,16 +27,14 @@ IdToQuestion (
   IN FORM_BROWSER_FORMSET  *FormSet,\r
   IN FORM_BROWSER_FORM     *Form,\r
   IN UINT16                QuestionId\r
-  )\r
-;\r
+  );\r
 \r
 \r
 FORM_EXPRESSION *\r
 IdToExpression (\r
   IN FORM_BROWSER_FORM  *Form,\r
   IN UINT8              RuleId\r
-  )\r
-;\r
+  );\r
 \r
  \r
 #endif\r

diff --git a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/Utility.h b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/Utility.h
index f2785a2438a4b3083f47ed712b8a2d599a7f0643..0a45144cf8b4e01b59c9a1d30f16ce6d43517da5 100644 (file)
--- a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/Utility.h
+++ b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/Utility.h
@@ -31,94 +31,80 @@ EFI_HII_HANDLE
 FwHiiHandleToUefiHiiHandle (\r
   IN CONST HII_THUNK_PRIVATE_DATA *Private,\r
   IN FRAMEWORK_EFI_HII_HANDLE          FwHiiHandle\r
-  )\r
-;\r
+  );\r
 \r
 HII_THUNK_CONTEXT *\r
 FwHiiHandleToThunkContext (\r
   IN CONST HII_THUNK_PRIVATE_DATA *Private,\r
   IN FRAMEWORK_EFI_HII_HANDLE          FwHiiHandle\r
-  )\r
-;\r
+  );\r
 \r
 HII_THUNK_CONTEXT *\r
 UefiHiiHandleToThunkContext (\r
   IN CONST HII_THUNK_PRIVATE_DATA *Private,\r
   IN EFI_HII_HANDLE                   UefiHiiHandle\r
-  )\r
-;\r
+  );\r
 \r
 EFI_HII_HANDLE *\r
 TagGuidToUefiHiiHandle (\r
   IN CONST HII_THUNK_PRIVATE_DATA *Private,\r
   IN CONST EFI_GUID                   *Guid\r
-  )\r
-;\r
+  );\r
 \r
 HII_THUNK_CONTEXT *\r
 CreateThunkContextForUefiHiiHandle (\r
   IN  EFI_HII_HANDLE             UefiHiiHandle\r
- )\r
-;\r
+ );\r
 \r
 VOID\r
 DestroyThunkContextForUefiHiiHandle (\r
   IN HII_THUNK_PRIVATE_DATA     *Private,\r
   IN EFI_HII_HANDLE             UefiHiiHandle\r
- )\r
-;\r
+ );\r
 \r
 UINTN\r
 GetPackageCountByType (\r
   IN CONST EFI_HII_PACKAGE_LIST_HEADER     *PackageListHeader,\r
   IN       UINT8                           PackageType\r
-  )\r
-;\r
+  );\r
 \r
 EFI_STATUS\r
 CreateQuestionIdMap (\r
   IN    OUT HII_THUNK_CONTEXT  *ThunkContext\r
-  )\r
-;\r
+  );\r
 \r
 VOID\r
 GetAttributesOfFirstFormSet (\r
   IN    OUT HII_THUNK_CONTEXT  *ThunkContext\r
-  )\r
-;\r
+  );\r
 \r
 LIST_ENTRY *\r
 GetMapEntryListHead (\r
   IN CONST HII_THUNK_CONTEXT  *ThunkContext,\r
   IN       UINT16             VarStoreId\r
-  )\r
-;\r
+  );\r
 \r
 HII_THUNK_CONTEXT *\r
 CreateThunkContext (\r
   IN  HII_THUNK_PRIVATE_DATA      *Private,\r
   IN  UINTN                       StringPackageCount,\r
   IN  UINTN                       IfrPackageCount\r
-  )\r
-;\r
+  );\r
 \r
 VOID\r
 DestroyThunkContext (\r
   IN HII_THUNK_CONTEXT          *ThunkContext\r
-  )\r
-;\r
+  );\r
 \r
 VOID\r
 DestroyQuestionIdMap (\r
   IN LIST_ENTRY     *QuestionIdMapListHead\r
-  )\r
-;\r
+  );\r
 \r
 \r
 VOID\r
 DestoryOneOfOptionMap (\r
   IN LIST_ENTRY     *OneOfOptionMapListHead\r
-  )\r
-;\r
+  );\r
 \r
 #endif\r

diff --git a/EdkCompatibilityPkg/Compatibility/FvFileLoaderToLoadFileThunk/FvFileLoaderToLoadFileThunk.c b/EdkCompatibilityPkg/Compatibility/FvFileLoaderToLoadFileThunk/FvFileLoaderToLoadFileThunk.c
index 35621cdc6d1bb300f747bb15a104b52dac9cc1c9..5f09a8d21bd2c4104ab6c5dded9b77fc3009ad45 100644 (file)
--- a/EdkCompatibilityPkg/Compatibility/FvFileLoaderToLoadFileThunk/FvFileLoaderToLoadFileThunk.c
+++ b/EdkCompatibilityPkg/Compatibility/FvFileLoaderToLoadFileThunk/FvFileLoaderToLoadFileThunk.c
@@ -50,8 +50,7 @@ FrameworkLoadFile (
   OUT EFI_PHYSICAL_ADDRESS                      *ImageAddress,\r
   OUT UINT64                                    *ImageSize,\r
   OUT EFI_PHYSICAL_ADDRESS                      *EntryPoint\r
-  )\r
-;\r
+  );\r
 \r
 EFI_PEI_FV_FILE_LOADER_PPI mLoadFilePpi = {\r
   FrameworkLoadFile\r

diff --git a/EdkCompatibilityPkg/Compatibility/Uc2ToUcThunk/Uc2ToUcThunk.c b/EdkCompatibilityPkg/Compatibility/Uc2ToUcThunk/Uc2ToUcThunk.c
index a9d82e675439c5c033cf3edd83377f06aa753ed4..4b2e30a623bdc7e4f39ba8aafd30478951111edd 100644 (file)
--- a/EdkCompatibilityPkg/Compatibility/Uc2ToUcThunk/Uc2ToUcThunk.c
+++ b/EdkCompatibilityPkg/Compatibility/Uc2ToUcThunk/Uc2ToUcThunk.c
@@ -52,8 +52,7 @@ StriColl (
   IN EFI_UNICODE_COLLATION_PROTOCOL   *This,\r
   IN CHAR16                           *Str1,\r
   IN CHAR16                           *Str2\r
-  )\r
-;\r
+  );\r
 \r
 /**\r
   Converts all the Unicode characters in a Null-terminated Unicode string to \r
@@ -68,8 +67,7 @@ EFIAPI
 StrLwr (\r
   IN EFI_UNICODE_COLLATION_PROTOCOL   *This,\r
   IN OUT CHAR16                       *Str\r
-  )\r
-;\r
+  );\r
 \r
 /**\r
   Converts all the Unicode characters in a Null-terminated Unicode string to upper\r
@@ -84,8 +82,7 @@ EFIAPI
 StrUpr (\r
   IN EFI_UNICODE_COLLATION_PROTOCOL   *This,\r
   IN OUT CHAR16                       *Str\r
-  )\r
-;\r
+  );\r
 \r
 /**\r
   Performs a case-insensitive comparison of a Null-terminated Unicode \r
@@ -105,8 +102,7 @@ MetaiMatch (
   IN EFI_UNICODE_COLLATION_PROTOCOL   *This,\r
   IN CHAR16                           *String,\r
   IN CHAR16                           *Pattern\r
-  )\r
-;\r
+  );\r
 \r
 /**\r
   Converts an 8.3 FAT file name in an OEM character set to a Null-terminated \r
@@ -127,8 +123,7 @@ FatToStr (
   IN UINTN                            FatSize,\r
   IN CHAR8                            *Fat,\r
   OUT CHAR16                          *String\r
-  )\r
-;\r
+  );\r
 \r
 /**\r
   Converts a Null-terminated Unicode string to legal characters in a FAT \r
@@ -152,8 +147,7 @@ StrToFat (
   IN CHAR16                           *String,\r
   IN UINTN                            FatSize,\r
   OUT CHAR8                           *Fat\r
-  )\r
-;\r
+  );\r
 \r
 #define UC2_PRIVATE_DATA_SIGNATURE  EFI_SIGNATURE_32 ('_', 'U', 'C', '2')\r
 \r

diff --git a/EdkCompatibilityPkg/Compatibility/UcToUc2Thunk/UcToUc2Thunk.c b/EdkCompatibilityPkg/Compatibility/UcToUc2Thunk/UcToUc2Thunk.c
index de4290ccf1694d63254d94a12454cc7a145f2d69..025027cc1caccc0d65c8271f0c8f8b74dc9120cb 100644 (file)
--- a/EdkCompatibilityPkg/Compatibility/UcToUc2Thunk/UcToUc2Thunk.c
+++ b/EdkCompatibilityPkg/Compatibility/UcToUc2Thunk/UcToUc2Thunk.c
@@ -52,8 +52,7 @@ StriColl (
   IN EFI_UNICODE_COLLATION_PROTOCOL   *This,\r
   IN CHAR16                           *Str1,\r
   IN CHAR16                           *Str2\r
-  )\r
-;\r
+  );\r
 \r
 /**\r
   Converts all the Unicode characters in a Null-terminated Unicode string to \r
@@ -68,8 +67,7 @@ EFIAPI
 StrLwr (\r
   IN EFI_UNICODE_COLLATION_PROTOCOL   *This,\r
   IN OUT CHAR16                       *Str\r
-  )\r
-;\r
+  );\r
 \r
 /**\r
   Converts all the Unicode characters in a Null-terminated Unicode string to upper\r
@@ -84,8 +82,7 @@ EFIAPI
 StrUpr (\r
   IN EFI_UNICODE_COLLATION_PROTOCOL   *This,\r
   IN OUT CHAR16                       *Str\r
-  )\r
-;\r
+  );\r
 \r
 /**\r
   Performs a case-insensitive comparison of a Null-terminated Unicode \r
@@ -105,8 +102,7 @@ MetaiMatch (
   IN EFI_UNICODE_COLLATION_PROTOCOL   *This,\r
   IN CHAR16                           *String,\r
   IN CHAR16                           *Pattern\r
-  )\r
-;\r
+  );\r
 \r
 /**\r
   Converts an 8.3 FAT file name in an OEM character set to a Null-terminated \r
@@ -127,8 +123,7 @@ FatToStr (
   IN UINTN                            FatSize,\r
   IN CHAR8                            *Fat,\r
   OUT CHAR16                          *String\r
-  )\r
-;\r
+  );\r
 \r
 /**\r
   Converts a Null-terminated Unicode string to legal characters in a FAT \r
@@ -152,8 +147,7 @@ StrToFat (
   IN CHAR16                           *String,\r
   IN UINTN                            FatSize,\r
   OUT CHAR8                           *Fat\r
-  )\r
-;\r
+  );\r
 \r
 #define UC_PRIVATE_DATA_SIGNATURE  EFI_SIGNATURE_32 ('_', 'U', 'C', '_')\r
 \r

diff --git a/EdkCompatibilityPkg/Foundation/Cpu/Pentium/Include/CpuIA32.h b/EdkCompatibilityPkg/Foundation/Cpu/Pentium/Include/CpuIA32.h
index a7fe8b00059ab1fd86a75b4545776c7ce78248fa..2b7d0a6999993b0c0fedb9c000d1bc8c8422ed0d 100644 (file)
--- a/EdkCompatibilityPkg/Foundation/Cpu/Pentium/Include/CpuIA32.h
+++ b/EdkCompatibilityPkg/Foundation/Cpu/Pentium/Include/CpuIA32.h
@@ -142,8 +142,7 @@ VOID
 IA32API\r
 EfiHalt (\r
   VOID\r
-  )\r
-;\r
+  );\r
 \r
 /*++                                                                                                                               \r
 Routine Description:                                                \r
@@ -157,8 +156,7 @@ VOID
 IA32API\r
 EfiWbinvd (\r
   VOID\r
-  )\r
-;\r
+  );\r
 \r
 /*++                                                                                                                               \r
 Routine Description:                                                \r
@@ -172,8 +170,7 @@ VOID
 IA32API\r
 EfiInvd (\r
   VOID\r
-  )\r
-;\r
+  );\r
 \r
 /*++                                                                                                                          \r
 Routine Description:                                                \r
@@ -188,8 +185,7 @@ IA32API
 EfiCpuid (\r
   IN  UINT32                 RegisterInEax,\r
   OUT EFI_CPUID_REGISTER     *Regs\r
-  )\r
-;\r
+  );\r
 \r
 /*++                                                                                                                          \r
 Routine Description:                                                \r
@@ -226,8 +222,7 @@ UINT64
 IA32API\r
 EfiReadMsr (\r
   IN UINT32     Index\r
-  )\r
-;\r
+  );\r
 \r
 /*++                                                                                                                          \r
 Routine Description:                                                \r
@@ -243,8 +238,7 @@ IA32API
 EfiWriteMsr (\r
   IN UINT32     Index,\r
   IN UINT64     Value\r
-  )\r
-;\r
+  );\r
 \r
 /*++                                                                                                                          \r
 Routine Description:                                                \r
@@ -259,8 +253,7 @@ UINT64
 IA32API\r
 EfiReadTsc (\r
   VOID\r
-  )\r
-;\r
+  );\r
 \r
 /*++                                                                                                                          \r
 Routine Description:                                                \r
@@ -274,8 +267,7 @@ VOID
 IA32API\r
 EfiDisableCache (\r
   VOID\r
-  )\r
-;\r
+  );\r
 \r
 /*++                                                                                                                          \r
 Routine Description:                                                \r
@@ -289,8 +281,7 @@ VOID
 IA32API\r
 EfiEnableCache (\r
   VOID\r
-  )\r
-;\r
+  );\r
 \r
 /*++                                                                                                                          \r
 Routine Description:                                                \r
@@ -304,8 +295,7 @@ UINT32
 IA32API\r
 EfiGetEflags (\r
   VOID\r
-  )\r
-;\r
+  );\r
 \r
 /*++                                                                                                                          \r
 Routine Description:                                                \r
@@ -319,8 +309,7 @@ VOID
 IA32API\r
 EfiDisableInterrupts (\r
   VOID\r
-  )\r
-;\r
+  );\r
 \r
 /*++                                                                                                                          \r
 Routine Description:                                                \r
@@ -334,8 +323,7 @@ VOID
 IA32API\r
 EfiEnableInterrupts (\r
   VOID\r
-  )\r
-;\r
+  );\r
 \r
 /*++                                                                                                                          \r
 Routine Description:                                                \r

diff --git a/EdkCompatibilityPkg/Foundation/Efi/Protocol/SimpleTextInputEx/SimpleTextInputEx.h b/EdkCompatibilityPkg/Foundation/Efi/Protocol/SimpleTextInputEx/SimpleTextInputEx.h
index f6f19978a625002f8f68c3b4cb3fcb03b0211031..29768b6cbe7b7a06e0c0fc880e35bc68c8cfae4b 100644 (file)
--- a/EdkCompatibilityPkg/Foundation/Efi/Protocol/SimpleTextInputEx/SimpleTextInputEx.h
+++ b/EdkCompatibilityPkg/Foundation/Efi/Protocol/SimpleTextInputEx/SimpleTextInputEx.h
@@ -111,8 +111,7 @@ typedef
 EFI_STATUS\r
 (EFIAPI *EFI_KEY_NOTIFY_FUNCTION) (\r
   IN  EFI_KEY_DATA                      *KeyData\r
-  )\r
-;\r
+  );\r
 \r
 typedef\r
 EFI_STATUS\r

diff --git a/EdkCompatibilityPkg/Foundation/Library/CompilerStub/memcpy.c b/EdkCompatibilityPkg/Foundation/Library/CompilerStub/memcpy.c
index 69c45e1583912ac2c17b765cf209fa01e0d3e8fd..7439e31405b7e05a7a313962bb26f8f680e11041 100644 (file)
--- a/EdkCompatibilityPkg/Foundation/Library/CompilerStub/memcpy.c
+++ b/EdkCompatibilityPkg/Foundation/Library/CompilerStub/memcpy.c
@@ -32,8 +32,7 @@ memcpy (
   OUT VOID        *Dest,\r
   IN  const VOID  *Src,\r
   IN  UINTN       Count\r
-  )\r
-;\r
+  );\r
 \r
 #ifdef _MSC_EXTENSIONS\r
 #pragma intrinsic(memcpy)\r

diff --git a/EdkCompatibilityPkg/Foundation/Library/CompilerStub/memset.c b/EdkCompatibilityPkg/Foundation/Library/CompilerStub/memset.c
index a51ea10a98298ee6afec0a2ca31c312154734196..3dc442253fdd7dd606612fcc87dbec66c3a1cd49 100644 (file)
--- a/EdkCompatibilityPkg/Foundation/Library/CompilerStub/memset.c
+++ b/EdkCompatibilityPkg/Foundation/Library/CompilerStub/memset.c
@@ -31,8 +31,7 @@ memset (
   OUT VOID    *Dest,\r
   IN  UINTN   Char,\r
   IN  UINTN   Count\r
-  )\r
-;\r
+  );\r
 \r
 #ifdef _MSC_EXTENSIONS\r
 #pragma intrinsic(memset)\r

diff --git a/EdkCompatibilityPkg/Foundation/Library/Dxe/Include/EfiHobLib.h b/EdkCompatibilityPkg/Foundation/Library/Dxe/Include/EfiHobLib.h
index cbf1c8d2507a9367914ad26000621125705a15b3..09aae87117314858544b2ae695f90b8528bf8537 100644 (file)
--- a/EdkCompatibilityPkg/Foundation/Library/Dxe/Include/EfiHobLib.h
+++ b/EdkCompatibilityPkg/Foundation/Library/Dxe/Include/EfiHobLib.h
@@ -215,8 +215,7 @@ GetNextFirmwareVolume2Hob (
   OUT    EFI_PHYSICAL_ADDRESS  *BaseAddress,\r
   OUT    UINT64                *Length,\r
   OUT    EFI_GUID              *FileName\r
-  )\r
-;\r
+  );\r
 #endif\r
 \r
 EFI_STATUS\r

diff --git a/EdkCompatibilityPkg/Foundation/Library/Dxe/UefiEfiIfrSupportLib/UefiIfrLibrary.h b/EdkCompatibilityPkg/Foundation/Library/Dxe/UefiEfiIfrSupportLib/UefiIfrLibrary.h
index 4ad79520c596b766a22c21ee800999f833cb4aa8..8b2507224fe99bc6c9d6d087284410d3ff941945 100644 (file)
--- a/EdkCompatibilityPkg/Foundation/Library/Dxe/UefiEfiIfrSupportLib/UefiIfrLibrary.h
+++ b/EdkCompatibilityPkg/Foundation/Library/Dxe/UefiEfiIfrSupportLib/UefiIfrLibrary.h
@@ -280,8 +280,7 @@ CreateOneOfOptionOpCode (
   IN     IFR_OPTION           *OptionsList,\r
   IN     UINT8                Type,\r
   IN OUT EFI_HII_UPDATE_DATA  *Data\r
-  )\r
-;\r
+  );\r
 \r
 EFI_STATUS\r
 CreateOneOfOpCode (\r

diff --git a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Include/Library/EdkIIGlueDxeRuntimeDriverLib.h b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Include/Library/EdkIIGlueDxeRuntimeDriverLib.h
index 0db9ee55f4d8b414938b72181401b46891ef86b3..b1b299a134c90eb0fd0078e35401896a2c3df418 100644 (file)
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Include/Library/EdkIIGlueDxeRuntimeDriverLib.h
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Include/Library/EdkIIGlueDxeRuntimeDriverLib.h
@@ -168,8 +168,7 @@ EfiGetVariable (
   OUT     UINT32                   *Attributes,\r
   IN OUT  UINTN                    *DataSize,\r
   OUT     VOID                     *Data\r
-  )\r
-;\r
+  );\r
 \r
 /**\r
   Enumerates variable's name.\r

diff --git a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Include/Library/EdkIIGlueEdkDxeSalLib.h b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Include/Library/EdkIIGlueEdkDxeSalLib.h
index b88c919bbb26fce9fbca416d2a3f3edd77fe5b3f..d10c4c202eb1c2e09d77f9e6af4a9a65ea3c704c 100644 (file)
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Include/Library/EdkIIGlueEdkDxeSalLib.h
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Include/Library/EdkIIGlueEdkDxeSalLib.h
@@ -122,23 +122,20 @@ EFIAPI
 SetEsalVirtualEntryPoint (\r
   IN  UINT64  EntryPoint,\r
   IN  UINT64  Gp\r
-  )\r
-;\r
+  );\r
 \r
 SAL_RETURN_REGS\r
 EFIAPI\r
 SetEsalPhysicalEntryPoint (\r
   IN  UINT64  EntryPoint,\r
   IN  UINT64  Gp\r
-  )\r
-;\r
+  );\r
 \r
 SAL_RETURN_REGS\r
 EFIAPI\r
 GetEsalEntryPoint (\r
   VOID\r
-  )\r
-;\r
+  );\r
 \r
 \r
 #endif\r

diff --git a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Include/Library/EdkIIGlueHiiLib.h b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Include/Library/EdkIIGlueHiiLib.h
index 47444e2044e087c8e0069eea4ff81ac6e5abb5ec..76aab31165317b5b18c6516895a7d38cac0b8326 100644 (file)
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Include/Library/EdkIIGlueHiiLib.h
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Include/Library/EdkIIGlueHiiLib.h
@@ -47,8 +47,7 @@ GluePreparePackages (
   IN UINTN           NumberOfPackages,\r
   IN CONST EFI_GUID  *Guid OPTIONAL,\r
   ...\r
-  )\r
-;\r
+  );\r
 \r
 #endif\r
 \r

diff --git a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Include/Library/EdkIIGlueHobLib.h b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Include/Library/EdkIIGlueHobLib.h
index 187c5dad4c272fbdd3c4cbbb85a228961ae5e370..53aa7b0639bdafb201235a8e35af6697662083bb 100644 (file)
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Include/Library/EdkIIGlueHobLib.h
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Include/Library/EdkIIGlueHobLib.h
@@ -43,8 +43,7 @@ VOID *
 EFIAPI\r
 GetHobList (\r
   VOID\r
-  )\r
-;\r
+  );\r
 \r
 /**\r
   Returns the next instance of a HOB type from the starting HOB.\r
@@ -67,8 +66,7 @@ EFIAPI
 GetNextHob (\r
   IN UINT16                 Type,\r
   IN CONST VOID             *HobStart\r
-  )\r
-;\r
+  );\r
 \r
 /**\r
   Returns the first instance of a HOB type among the whole HOB list.\r
@@ -85,8 +83,7 @@ VOID *
 EFIAPI\r
 GetFirstHob (\r
   IN UINT16                 Type\r
-  )\r
-;\r
+  );\r
 \r
 /**\r
   This function searches the first instance of a HOB from the starting HOB pointer. \r
@@ -112,8 +109,7 @@ EFIAPI
 GlueGetNextGuidHob (\r
   IN CONST EFI_GUID         *Guid,\r
   IN CONST VOID             *HobStart\r
-  )\r
-;\r
+  );\r
 \r
 /**\r
   This function searches the first instance of a HOB among the whole HOB list. \r
@@ -133,8 +129,7 @@ VOID *
 EFIAPI\r
 GlueGetFirstGuidHob (\r
   IN CONST EFI_GUID         *Guid\r
-  )\r
-;\r
+  );\r
 \r
 /**\r
   Get the Boot Mode from the HOB list.\r
@@ -151,8 +146,7 @@ EFI_BOOT_MODE
 EFIAPI\r
 GetBootModeHob (\r
   VOID\r
-  )\r
-;\r
+  );\r
 \r
 /**\r
   Builds a HOB for a loaded PE32 module.\r
@@ -176,8 +170,7 @@ GlueBuildModuleHob (
   IN EFI_PHYSICAL_ADDRESS   MemoryAllocationModule,\r
   IN UINT64                 ModuleLength,\r
   IN EFI_PHYSICAL_ADDRESS   EntryPoint\r
-  )\r
-;\r
+  );\r
 \r
 /**\r
   Builds a HOB that describes a chunk of system memory.\r
@@ -200,8 +193,7 @@ BuildResourceDescriptorHob (
   IN EFI_RESOURCE_ATTRIBUTE_TYPE  ResourceAttribute,\r
   IN EFI_PHYSICAL_ADDRESS         PhysicalStart,\r
   IN UINT64                       NumberOfBytes\r
-  )\r
-;\r
+  );\r
 \r
 /**\r
   Builds a GUID HOB with a certain data length.\r
@@ -226,8 +218,7 @@ EFIAPI
 BuildGuidHob (\r
   IN CONST EFI_GUID              *Guid,\r
   IN UINTN                       DataLength\r
-  )\r
-;\r
+  );\r
 \r
 /**\r
   Copies a data buffer to a newly-built HOB.\r
@@ -255,8 +246,7 @@ BuildGuidDataHob (
   IN CONST EFI_GUID              *Guid,\r
   IN VOID                        *Data,\r
   IN UINTN                       DataLength\r
-  )\r
-;\r
+  );\r
 \r
 /**\r
   Builds a Firmware Volume HOB.\r
@@ -275,8 +265,7 @@ EFIAPI
 BuildFvHob (\r
   IN EFI_PHYSICAL_ADDRESS        BaseAddress,\r
   IN UINT64                      Length\r
-  )\r
-;\r
+  );\r
 \r
 /**\r
   Builds a Capsule Volume HOB.\r
@@ -295,8 +284,7 @@ EFIAPI
 BuildCvHob (\r
   IN EFI_PHYSICAL_ADDRESS        BaseAddress,\r
   IN UINT64                      Length\r
-  )\r
-;\r
+  );\r
 \r
 /**\r
   Builds a HOB for the CPU.\r
@@ -315,8 +303,7 @@ EFIAPI
 BuildCpuHob (\r
   IN UINT8                       SizeOfMemorySpace,\r
   IN UINT8                       SizeOfIoSpace\r
-  )\r
-;\r
+  );\r
 \r
 /**\r
   Builds a HOB for the Stack.\r
@@ -335,8 +322,7 @@ EFIAPI
 BuildStackHob (\r
   IN EFI_PHYSICAL_ADDRESS        BaseAddress,\r
   IN UINT64                      Length\r
-  )\r
-;\r
+  );\r
 \r
 /**\r
   Builds a HOB for the BSP store.\r
@@ -357,8 +343,7 @@ BuildBspStoreHob (
   IN EFI_PHYSICAL_ADDRESS        BaseAddress,\r
   IN UINT64                      Length,\r
   IN EFI_MEMORY_TYPE             MemoryType\r
-  )\r
-;\r
+  );\r
 \r
 /**\r
   Builds a HOB for the memory allocation.\r
@@ -379,7 +364,6 @@ GlueBuildMemoryAllocationHob (
   IN EFI_PHYSICAL_ADDRESS        BaseAddress,\r
   IN UINT64                      Length,\r
   IN EFI_MEMORY_TYPE             MemoryType\r
-  )\r
-;\r
+  );\r
 \r
 #endif\r

diff --git a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Include/Library/EdkIIGluePeCoffLib.h b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Include/Library/EdkIIGluePeCoffLib.h
index 4ac6659462e324102ba19e6d2078c2fc9b36b2ba..10f0e0f022b2bf384bcbd0c6fb003db8103863ad 100644 (file)
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Include/Library/EdkIIGluePeCoffLib.h
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Include/Library/EdkIIGluePeCoffLib.h
@@ -114,8 +114,7 @@ RETURN_STATUS
 EFIAPI\r
 GluePeCoffLoaderGetImageInfo (\r
   IN OUT PE_COFF_LOADER_IMAGE_CONTEXT  *ImageContext\r
-  )\r
-;\r
+  );\r
 \r
 /**\r
   Applies relocation fixups to a PE/COFF image that was loaded with PeCoffLoaderLoadImage().\r
@@ -141,8 +140,7 @@ RETURN_STATUS
 EFIAPI\r
 GluePeCoffLoaderRelocateImage (\r
   IN OUT PE_COFF_LOADER_IMAGE_CONTEXT  *ImageContext\r
-  )\r
-;\r
+  );\r
 \r
 /**\r
   Loads a PE/COFF image into memory.\r
@@ -171,8 +169,7 @@ RETURN_STATUS
 EFIAPI\r
 GluePeCoffLoaderLoadImage (\r
   IN OUT PE_COFF_LOADER_IMAGE_CONTEXT  *ImageContext\r
-  )\r
-;\r
+  );\r
 \r
 \r
 /**\r
@@ -194,8 +191,7 @@ PeCoffLoaderImageReadFromMemory (
   IN     UINTN   FileOffset,\r
   IN OUT UINTN   *ReadSize,\r
   OUT    VOID    *Buffer\r
-  )\r
-;\r
+  );\r
 \r
 \r
 /**\r
@@ -219,8 +215,7 @@ PeCoffLoaderRelocateImageForRuntime (
   IN  PHYSICAL_ADDRESS        VirtImageBase,\r
   IN  UINTN                   ImageSize,\r
   IN  VOID                    *RelocationData\r
-  )\r
-;\r
+  );\r
 \r
 \r
 #endif\r

diff --git a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Include/Library/EdkIIGlueResourcePublicationLib.h b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Include/Library/EdkIIGlueResourcePublicationLib.h
index f2ea2fd9fe705f80c2d34da59035f28f9d467448..45c0aa24a2909965c610268dcefcbe1fbe067340 100644 (file)
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Include/Library/EdkIIGlueResourcePublicationLib.h
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Include/Library/EdkIIGlueResourcePublicationLib.h
@@ -44,7 +44,6 @@ EFIAPI
 PublishSystemMemory (\r
   IN PHYSICAL_ADDRESS       MemoryBegin,\r
   IN UINT64                 MemoryLength\r
-  )\r
-;\r
+  );\r
 \r
 #endif\r

diff --git a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Include/Library/EdkIIGlueSmbusLib.h b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Include/Library/EdkIIGlueSmbusLib.h
index 3ae42e60a456f28a564e8c559b9a92b277ca371e..6a54afc1389c170cc1417e4046133b27669ca732 100644 (file)
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Include/Library/EdkIIGlueSmbusLib.h
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Include/Library/EdkIIGlueSmbusLib.h
@@ -71,8 +71,7 @@ EFIAPI
 SmBusQuickRead (\r
   IN  UINTN                     SmBusAddress,\r
   OUT RETURN_STATUS             *Status       OPTIONAL\r
-  )\r
-;\r
+  );\r
 \r
 /**\r
   Executes an SMBUS quick write command.\r
@@ -96,8 +95,7 @@ EFIAPI
 SmBusQuickWrite (\r
   IN  UINTN                     SmBusAddress,\r
   OUT RETURN_STATUS             *Status       OPTIONAL\r
-  )\r
-;\r
+  );\r
 \r
 /**\r
   Executes an SMBUS receive byte command.\r
@@ -123,8 +121,7 @@ EFIAPI
 SmBusReceiveByte (\r
   IN  UINTN          SmBusAddress,\r
   OUT RETURN_STATUS  *Status        OPTIONAL\r
-  )\r
-;\r
+  );\r
 \r
 /**\r
   Executes an SMBUS send byte command.\r
@@ -152,8 +149,7 @@ SmBusSendByte (
   IN  UINTN          SmBusAddress,\r
   IN  UINT8          Value,\r
   OUT RETURN_STATUS  *Status        OPTIONAL\r
-  )\r
-;\r
+  );\r
 \r
 /**\r
   Executes an SMBUS read data byte command.\r
@@ -178,8 +174,7 @@ EFIAPI
 SmBusReadDataByte (\r
   IN  UINTN          SmBusAddress,\r
   OUT RETURN_STATUS  *Status        OPTIONAL\r
-  )\r
-;\r
+  );\r
 \r
 /**\r
   Executes an SMBUS write data byte command.\r
@@ -207,8 +202,7 @@ SmBusWriteDataByte (
   IN  UINTN          SmBusAddress,\r
   IN  UINT8          Value,\r
   OUT RETURN_STATUS  *Status        OPTIONAL\r
-  )\r
-;\r
+  );\r
 \r
 /**\r
   Executes an SMBUS read data word command.\r
@@ -233,8 +227,7 @@ EFIAPI
 SmBusReadDataWord (\r
   IN  UINTN          SmBusAddress,\r
   OUT RETURN_STATUS  *Status        OPTIONAL\r
-  )\r
-;\r
+  );\r
 \r
 /**\r
   Executes an SMBUS write data word command.\r
@@ -262,8 +255,7 @@ SmBusWriteDataWord (
   IN  UINTN          SmBusAddress,\r
   IN  UINT16         Value,\r
   OUT RETURN_STATUS  *Status        OPTIONAL\r
-  )\r
-;\r
+  );\r
 \r
 /**\r
   Executes an SMBUS process call command.\r
@@ -291,8 +283,7 @@ SmBusProcessCall (
   IN  UINTN          SmBusAddress,\r
   IN  UINT16         Value,\r
   OUT RETURN_STATUS  *Status        OPTIONAL\r
-  )\r
-;\r
+  );\r
 \r
 /**\r
   Executes an SMBUS read block command.\r
@@ -323,8 +314,7 @@ SmBusReadBlock (
   IN  UINTN          SmBusAddress,\r
   OUT VOID           *Buffer,\r
   OUT RETURN_STATUS  *Status        OPTIONAL\r
-  )\r
-;\r
+  );\r
 \r
 /**\r
   Executes an SMBUS write block command.\r
@@ -353,8 +343,7 @@ SmBusWriteBlock (
   IN  UINTN          SmBusAddress,\r
   OUT VOID           *Buffer,\r
   OUT RETURN_STATUS  *Status        OPTIONAL\r
-  )\r
-;\r
+  );\r
 \r
 /**\r
   Executes an SMBUS block process call command.\r
@@ -387,8 +376,7 @@ SmBusBlockProcessCall (
   IN  VOID           *WriteBuffer,\r
   OUT VOID           *ReadBuffer,\r
   OUT RETURN_STATUS  *Status        OPTIONAL\r
-  )\r
-;\r
+  );\r
 \r
 \r
 #endif\r

diff --git a/EdkCompatibilityPkg/Sample/Platform/Generic/MonoStatusCode/Library/Pei/Include/MemoryStatusCodeLib.h b/EdkCompatibilityPkg/Sample/Platform/Generic/MonoStatusCode/Library/Pei/Include/MemoryStatusCodeLib.h
index b2ed83b1aaf6ba93754110dad3687f7345e9d7ce..e954cf8cca73676eee20b883360b12bcac3502bb 100644 (file)
--- a/EdkCompatibilityPkg/Sample/Platform/Generic/MonoStatusCode/Library/Pei/Include/MemoryStatusCodeLib.h
+++ b/EdkCompatibilityPkg/Sample/Platform/Generic/MonoStatusCode/Library/Pei/Include/MemoryStatusCodeLib.h
@@ -40,8 +40,7 @@ VOID
 MemoryInitializeStatusCode (\r
   IN EFI_FFS_FILE_HEADER       *FfsHeader,\r
   IN EFI_PEI_SERVICES          **PeiServices\r
-  )\r
-;\r
+  );\r
 \r
 //\r
 // Status code reporting function\r
@@ -54,7 +53,6 @@ MemoryReportStatusCode (
   IN UINT32                   Instance,\r
   IN EFI_GUID                 * CallerId,\r
   IN EFI_STATUS_CODE_DATA     * Data OPTIONAL\r
-  )\r
-;\r
+  );\r
 \r
 #endif\r

diff --git a/EdkCompatibilityPkg/Sample/Platform/Generic/MonoStatusCode/Library/Pei/Include/SimpleCpuIoLib.h b/EdkCompatibilityPkg/Sample/Platform/Generic/MonoStatusCode/Library/Pei/Include/SimpleCpuIoLib.h
index ca666def6ae7b29cc23fbb4861bd2508526eed74..4172ddabf93cbe6b4bd6ffdb6f9d9302b49d036d 100644 (file)
--- a/EdkCompatibilityPkg/Sample/Platform/Generic/MonoStatusCode/Library/Pei/Include/SimpleCpuIoLib.h
+++ b/EdkCompatibilityPkg/Sample/Platform/Generic/MonoStatusCode/Library/Pei/Include/SimpleCpuIoLib.h
@@ -28,66 +28,56 @@ Abstract:
 UINT8\r
 IoRead8 (\r
   IN  UINT64  Address\r
-  )\r
-;\r
+  );\r
 \r
 UINT16\r
 IoRead16 (\r
   IN  UINT64  Address\r
-  )\r
-;\r
+  );\r
 \r
 UINT32\r
 IoRead32 (\r
   IN  UINT64  Address\r
-  )\r
-;\r
+  );\r
 \r
 VOID\r
 IoWrite8 (\r
   IN  UINT64  Address,\r
   IN  UINT8   Data\r
-  )\r
-;\r
+  );\r
 \r
 VOID\r
 IoWrite16 (\r
   IN  UINT64  Address,\r
   IN  UINT16  Data\r
-  )\r
-;\r
+  );\r
 \r
 VOID\r
 IoWrite32 (\r
   IN  UINT64  Address,\r
   IN  UINT32  Data\r
-  )\r
-;\r
+  );\r
 \r
 UINT32\r
 MemRead32 (\r
   IN  UINT64  Address\r
-  )\r
-;\r
+  );\r
 \r
 UINT64\r
 MemRead64 (\r
   IN  UINT64  Address\r
-  )\r
-;\r
+  );\r
 \r
 VOID\r
 MemWrite32 (\r
   IN  UINT64  Address,\r
   IN  UINT32  Data\r
-  )\r
-;\r
+  );\r
 \r
 VOID\r
 MemWrite64 (\r
   IN  UINT64  Address,\r
   IN  UINT64  Data\r
-  )\r
-;\r
+  );\r
 \r
 #endif\r

diff --git a/EdkCompatibilityPkg/Sample/Platform/Generic/MonoStatusCode/Library/Pei/MemoryStatusCode/MemoryStatusCode.h b/EdkCompatibilityPkg/Sample/Platform/Generic/MonoStatusCode/Library/Pei/MemoryStatusCode/MemoryStatusCode.h
index b6660b045264099aeabd4f0cfcbaea0178e5fdaf..cdba078541598df6d36ca9541c39c12de004849e 100644 (file)
--- a/EdkCompatibilityPkg/Sample/Platform/Generic/MonoStatusCode/Library/Pei/MemoryStatusCode/MemoryStatusCode.h
+++ b/EdkCompatibilityPkg/Sample/Platform/Generic/MonoStatusCode/Library/Pei/MemoryStatusCode/MemoryStatusCode.h
@@ -97,7 +97,6 @@ LoadImageCallback (
   IN EFI_PEI_SERVICES           **PeiServices,\r
   IN EFI_PEI_NOTIFY_DESCRIPTOR  *NotifyDescriptor,\r
   IN VOID                       *Ppi\r
-  )\r
-;\r
+  );\r
 \r
 #endif\r

diff --git a/EdkCompatibilityPkg/Sample/Platform/Generic/MonoStatusCode/Pei/MonoStatusCode.h b/EdkCompatibilityPkg/Sample/Platform/Generic/MonoStatusCode/Pei/MonoStatusCode.h
index 7ff3140fa6507e4312cb39980ef6fec4b1b0732e..f8cc2fb0bd6e97cdb6115be1d7ca1ad1ce5a35e3 100644 (file)
--- a/EdkCompatibilityPkg/Sample/Platform/Generic/MonoStatusCode/Pei/MonoStatusCode.h
+++ b/EdkCompatibilityPkg/Sample/Platform/Generic/MonoStatusCode/Pei/MonoStatusCode.h
@@ -67,8 +67,7 @@ EFIAPI
 InstallMonoStatusCode (\r
   IN EFI_FFS_FILE_HEADER       *FfsHeader,\r
   IN EFI_PEI_SERVICES          **PeiServices\r
-  )\r
-;\r
+  );\r
 \r
 //\r
 // This is the platform function to initialize the listeners desired by the\r
@@ -78,8 +77,7 @@ VOID
 PlatformInitializeStatusCode (\r
   IN EFI_FFS_FILE_HEADER       *FfsHeader,\r
   IN EFI_PEI_SERVICES          **PeiServices\r
-  )\r
-;\r
+  );\r
 \r
 //\r
 // This is the platform function that calls all of the listeners desired by the\r
@@ -94,8 +92,7 @@ PlatformReportStatusCode (
   IN UINT32                   Instance,\r
   IN EFI_GUID                 * CallerId,\r
   IN EFI_STATUS_CODE_DATA     * Data OPTIONAL\r
-  )\r
-;\r
+  );\r
 \r
 //\r
 // Platform independent function Declarations\r
@@ -108,8 +105,7 @@ EFIAPI
 InitializeMonoStatusCode (\r
   IN EFI_FFS_FILE_HEADER       *FfsHeader,\r
   IN EFI_PEI_SERVICES          **PeiServices\r
-  )\r
-;\r
+  );\r
 \r
 //\r
 // Convert a DXE status code call into a PEI status code call.\r
@@ -122,8 +118,7 @@ TranslateDxeStatusCodeToPeiStatusCode (
   IN UINT32                   Instance,\r
   IN EFI_GUID                 * CallerId,\r
   IN EFI_STATUS_CODE_DATA     * Data OPTIONAL\r
-  )\r
-;\r
+  );\r
 \r
 //\r
 // Publish a HOB that contains the listener to be used by DXE.\r
@@ -132,7 +127,6 @@ EFI_STATUS
 EFIAPI\r
 InitializeDxeReportStatusCode (\r
   IN EFI_PEI_SERVICES       **PeiServices\r
-  )\r
-;\r
+  );\r
 \r
 #endif\r

diff --git a/EdkCompatibilityPkg/Sample/Platform/Generic/RuntimeDxe/StatusCode/Lib/BsSerialStatusCode/BsSerialStatusCode.h b/EdkCompatibilityPkg/Sample/Platform/Generic/RuntimeDxe/StatusCode/Lib/BsSerialStatusCode/BsSerialStatusCode.h
index 63165471b1233ef0dd6e7e6a7d42e1adf404b5ff..fabb9a2060d6d29a9bc5eee27088a18cecd9bac1 100644 (file)
--- a/EdkCompatibilityPkg/Sample/Platform/Generic/RuntimeDxe/StatusCode/Lib/BsSerialStatusCode/BsSerialStatusCode.h
+++ b/EdkCompatibilityPkg/Sample/Platform/Generic/RuntimeDxe/StatusCode/Lib/BsSerialStatusCode/BsSerialStatusCode.h
@@ -78,13 +78,11 @@ extern UINT8  gBreakSet;
 VOID\r
 DebugSerialPrint (\r
   IN UINT8    *OutputString\r
-  )\r
-;\r
+  );\r
 \r
 VOID\r
 DebugSerialWrite (\r
   IN UINT8  Character\r
-  )\r
-;\r
+  );\r
 \r
 #endif\r

diff --git a/EdkCompatibilityPkg/Sample/Platform/Generic/RuntimeDxe/StatusCode/Lib/Include/BsDataHubStatusCodeLib.h b/EdkCompatibilityPkg/Sample/Platform/Generic/RuntimeDxe/StatusCode/Lib/Include/BsDataHubStatusCodeLib.h
index c15ac01e51b8edb434d4934043225f31bd53abbc..181617d39b01afd04f5a9f59ede2c0fdabe99766 100644 (file)
--- a/EdkCompatibilityPkg/Sample/Platform/Generic/RuntimeDxe/StatusCode/Lib/Include/BsDataHubStatusCodeLib.h
+++ b/EdkCompatibilityPkg/Sample/Platform/Generic/RuntimeDxe/StatusCode/Lib/Include/BsDataHubStatusCodeLib.h
@@ -35,8 +35,7 @@ EFIAPI
 BsDataHubInitializeStatusCode (\r
   IN EFI_HANDLE         ImageHandle,\r
   IN EFI_SYSTEM_TABLE   *SystemTable\r
-  )\r
-;\r
+  );\r
 \r
 //\r
 // Status code reporting function\r
@@ -49,7 +48,6 @@ BsDataHubReportStatusCode (
   IN UINT32                   Instance,\r
   IN EFI_GUID                 * CallerId,\r
   IN EFI_STATUS_CODE_DATA     * Data OPTIONAL\r
-  )\r
-;\r
+  );\r
 \r
 #endif\r

diff --git a/EdkCompatibilityPkg/Sample/Platform/Generic/RuntimeDxe/StatusCode/Lib/Include/BsSerialStatusCodeLib.h b/EdkCompatibilityPkg/Sample/Platform/Generic/RuntimeDxe/StatusCode/Lib/Include/BsSerialStatusCodeLib.h
index 761f0da27da5e92d99513198707951c5ff4b6a49..c0b7a72899914a9f5d02d0a315eba26d68e45645 100644 (file)
--- a/EdkCompatibilityPkg/Sample/Platform/Generic/RuntimeDxe/StatusCode/Lib/Include/BsSerialStatusCodeLib.h
+++ b/EdkCompatibilityPkg/Sample/Platform/Generic/RuntimeDxe/StatusCode/Lib/Include/BsSerialStatusCodeLib.h
@@ -35,8 +35,7 @@ EFIAPI
 BsSerialInitializeStatusCode (\r
   IN EFI_HANDLE         ImageHandle,\r
   IN EFI_SYSTEM_TABLE   *SystemTable\r
-  )\r
-;\r
+  );\r
 \r
 //\r
 // Status code reporting function\r
@@ -49,7 +48,6 @@ BsSerialReportStatusCode (
   IN UINT32                   Instance,\r
   IN EFI_GUID                 * CallerId,\r
   IN EFI_STATUS_CODE_DATA     * Data OPTIONAL\r
-  )\r
-;\r
+  );\r
 \r
 #endif\r

diff --git a/EdkCompatibilityPkg/Sample/Platform/Generic/RuntimeDxe/StatusCode/Lib/Include/RtLedStatusCodeLib.h b/EdkCompatibilityPkg/Sample/Platform/Generic/RuntimeDxe/StatusCode/Lib/Include/RtLedStatusCodeLib.h
index 378d5dce8cbcdcca30dbe89104c574234348e4a2..6a9ec87c9be09754229caa1d7416c0eeaf2829d8 100644 (file)
--- a/EdkCompatibilityPkg/Sample/Platform/Generic/RuntimeDxe/StatusCode/Lib/Include/RtLedStatusCodeLib.h
+++ b/EdkCompatibilityPkg/Sample/Platform/Generic/RuntimeDxe/StatusCode/Lib/Include/RtLedStatusCodeLib.h
@@ -31,8 +31,7 @@ VOID
 RtLedInitializeStatusCode (\r
   IN EFI_HANDLE         ImageHandle,\r
   IN EFI_SYSTEM_TABLE   *SystemTable\r
-  )\r
-;\r
+  );\r
 \r
 //\r
 // Status code reporting function\r
@@ -44,6 +43,5 @@ RtLedReportStatusCode (
   IN UINT32                   Instance,\r
   IN EFI_GUID                 * CallerId,\r
   IN EFI_STATUS_CODE_DATA     * Data OPTIONAL\r
-  )\r
-;\r
+  );\r
 #endif\r

diff --git a/EdkCompatibilityPkg/Sample/Platform/Generic/RuntimeDxe/StatusCode/Lib/Include/RtMemoryStatusCodeLib.h b/EdkCompatibilityPkg/Sample/Platform/Generic/RuntimeDxe/StatusCode/Lib/Include/RtMemoryStatusCodeLib.h
index 24a74f335775535bd7e591da7f0d475bd5c3da67..1937791051d9a22f576957d168609eefc23f5a74 100644 (file)
--- a/EdkCompatibilityPkg/Sample/Platform/Generic/RuntimeDxe/StatusCode/Lib/Include/RtMemoryStatusCodeLib.h
+++ b/EdkCompatibilityPkg/Sample/Platform/Generic/RuntimeDxe/StatusCode/Lib/Include/RtMemoryStatusCodeLib.h
@@ -35,8 +35,7 @@ EFIAPI
 RtMemoryInitializeStatusCode (\r
   IN EFI_HANDLE         ImageHandle,\r
   IN EFI_SYSTEM_TABLE   *SystemTable\r
-  )\r
-;\r
+  );\r
 \r
 //\r
 // Status code reporting function\r
@@ -49,8 +48,7 @@ RtMemoryReportStatusCode (
   IN UINT32                   Instance,\r
   IN EFI_GUID                 * CallerId,\r
   IN EFI_STATUS_CODE_DATA     * Data OPTIONAL\r
-  )\r
-;\r
+  );\r
 \r
 //\r
 // Playback all prior status codes to a listener\r
@@ -69,7 +67,6 @@ VOID
 EFIAPI\r
 PlaybackStatusCodes (\r
   IN PLATFORM_REPORT_STATUS_CODE  ReportStatusCode\r
-  )\r
-;\r
+  );\r
 \r
 #endif\r

diff --git a/EdkCompatibilityPkg/Sample/Platform/Generic/RuntimeDxe/StatusCode/Lib/Include/RtPlatformStatusCodeLib.h b/EdkCompatibilityPkg/Sample/Platform/Generic/RuntimeDxe/StatusCode/Lib/Include/RtPlatformStatusCodeLib.h
index 22f02b763a9e5145aee31cf9c35bdb9383beb29a..6c94d83e81958c094380688e5020cc29348e154a 100644 (file)
--- a/EdkCompatibilityPkg/Sample/Platform/Generic/RuntimeDxe/StatusCode/Lib/Include/RtPlatformStatusCodeLib.h
+++ b/EdkCompatibilityPkg/Sample/Platform/Generic/RuntimeDxe/StatusCode/Lib/Include/RtPlatformStatusCodeLib.h
@@ -36,8 +36,7 @@ EFIAPI
 RtPlatformInitializeStatusCode (\r
   IN EFI_HANDLE         ImageHandle,\r
   IN EFI_SYSTEM_TABLE   *SystemTable\r
-  )\r
-;\r
+  );\r
 \r
 //\r
 // Status code reporting function\r
@@ -50,7 +49,6 @@ RtPlatformReportStatusCode (
   IN UINT32                   Instance,\r
   IN EFI_GUID                 * CallerId,\r
   IN EFI_STATUS_CODE_DATA     * Data OPTIONAL\r
-  )\r
-;\r
+  );\r
 \r
 #endif\r

diff --git a/EdkCompatibilityPkg/Sample/Platform/Generic/RuntimeDxe/StatusCode/Lib/Include/RtPort80StatusCodeLib.h b/EdkCompatibilityPkg/Sample/Platform/Generic/RuntimeDxe/StatusCode/Lib/Include/RtPort80StatusCodeLib.h
index 854de9b44365f95f69e00a8b32fb2afc6db49ceb..978939c61552633982e9feefb250b424d3e68cf9 100644 (file)
--- a/EdkCompatibilityPkg/Sample/Platform/Generic/RuntimeDxe/StatusCode/Lib/Include/RtPort80StatusCodeLib.h
+++ b/EdkCompatibilityPkg/Sample/Platform/Generic/RuntimeDxe/StatusCode/Lib/Include/RtPort80StatusCodeLib.h
@@ -38,7 +38,6 @@ RtPort80ReportStatusCode (
   IN UINT32                   Instance,\r
   IN EFI_GUID                 * CallerId,\r
   IN EFI_STATUS_CODE_DATA     * Data OPTIONAL\r
-  )\r
-;\r
+  );\r
 \r
 #endif\r

diff --git a/EdkCompatibilityPkg/Sample/Tools/Source/Common/CommonLib.h b/EdkCompatibilityPkg/Sample/Tools/Source/Common/CommonLib.h
index f36856e5fbfe15fcca9b268b3676fe519e60c341..44bc53e91c6d4754611baba7565ded2760147afc 100644 (file)
--- a/EdkCompatibilityPkg/Sample/Tools/Source/Common/CommonLib.h
+++ b/EdkCompatibilityPkg/Sample/Tools/Source/Common/CommonLib.h
@@ -32,80 +32,69 @@ VOID
 PeiZeroMem (\r
   IN VOID   *Buffer,\r
   IN UINTN  Size\r
-  )\r
-;\r
+  );\r
 \r
 VOID\r
 PeiCopyMem (\r
   IN VOID   *Destination,\r
   IN VOID   *Source,\r
   IN UINTN  Length\r
-  )\r
-;\r
+  );\r
 \r
 VOID\r
 ZeroMem (\r
   IN VOID   *Buffer,\r
   IN UINTN  Size\r
-  )\r
-;\r
+  );\r
 \r
 VOID\r
 CopyMem (\r
   IN VOID   *Destination,\r
   IN VOID   *Source,\r
   IN UINTN  Length\r
-  )\r
-;\r
+  );\r
 \r
 INTN\r
 CompareGuid (\r
   IN EFI_GUID     *Guid1,\r
   IN EFI_GUID     *Guid2\r
-  )\r
-;\r
+  );\r
 \r
 EFI_STATUS\r
 GetFileImage (\r
   IN CHAR8    *InputFileName,\r
   OUT CHAR8   **InputFileImage,\r
   OUT UINT32  *BytesRead\r
-  )\r
-;\r
+  );\r
 \r
 UINT8\r
 CalculateChecksum8 (\r
   IN UINT8        *Buffer,\r
   IN UINTN        Size\r
-  )\r
-;\r
+  );\r
 \r
 UINT8\r
 CalculateSum8 (\r
   IN UINT8        *Buffer,\r
   IN UINTN        Size\r
-  )\r
-;\r
+  );\r
 \r
 UINT16\r
 CalculateChecksum16 (\r
   IN UINT16       *Buffer,\r
   IN UINTN        Size\r
-  )\r
-;\r
+  );\r
 \r
 UINT16\r
 CalculateSum16 (\r
   IN UINT16       *Buffer,\r
   IN UINTN        Size\r
-  )\r
-;\r
+  );\r
 \r
 EFI_STATUS\r
 PrintGuid (\r
   IN EFI_GUID                     *Guid\r
-  )\r
-;\r
+  );\r
 \r
 #define PRINTED_GUID_BUFFER_SIZE  37  // including null-termination\r
 EFI_STATUS\r
@@ -114,7 +103,6 @@ PrintGuidToBuffer (
   IN OUT UINT8    *Buffer,\r
   IN UINT32       BufferLen,\r
   IN BOOLEAN      Uppercase\r
-  )\r
-;\r
+  );\r
 \r
 #endif\r

diff --git a/EdkCompatibilityPkg/Sample/Tools/Source/Common/Compress.h b/EdkCompatibilityPkg/Sample/Tools/Source/Common/Compress.h
index 43535936a64e6ecb0c4cb4086c204c8148abeaf8..f0e0ecb6cfbaf725ebaff523e3689bbb46bf608d 100644 (file)
--- a/EdkCompatibilityPkg/Sample/Tools/Source/Common/Compress.h
+++ b/EdkCompatibilityPkg/Sample/Tools/Source/Common/Compress.h
@@ -36,8 +36,7 @@ TianoCompress (
   IN      UINT32  SrcSize,\r
   IN      UINT8   *DstBuffer,\r
   IN OUT  UINT32  *DstSize\r
-  )\r
-;\r
+  );\r
 \r
 /*++\r
 \r
@@ -52,8 +51,7 @@ EfiCompress (
   IN      UINT32  SrcSize,\r
   IN      UINT8   *DstBuffer,\r
   IN OUT  UINT32  *DstSize\r
-  )\r
-;\r
+  );\r
 \r
 /*++\r
 \r

diff --git a/EdkCompatibilityPkg/Sample/Tools/Source/Common/Crc32.h b/EdkCompatibilityPkg/Sample/Tools/Source/Common/Crc32.h
index 170711a67707f0da752903dc4a57acd3e7602b24..c2d062d2567d818d18c3118964922ff062aac499 100644 (file)
--- a/EdkCompatibilityPkg/Sample/Tools/Source/Common/Crc32.h
+++ b/EdkCompatibilityPkg/Sample/Tools/Source/Common/Crc32.h
@@ -26,8 +26,7 @@ CalculateCrc32 (
   IN  UINT8                             *Data,\r
   IN  UINTN                             DataSize,\r
   IN OUT UINT32                         *CrcOut\r
-  )\r
-;\r
+  );\r
 \r
 /*++\r
 \r

diff --git a/EdkCompatibilityPkg/Sample/Tools/Source/Common/EfiCustomizedCompress.h b/EdkCompatibilityPkg/Sample/Tools/Source/Common/EfiCustomizedCompress.h
index d1fa22066eb414b5b2c8d0cbe8e91974be342a3f..2a7b8d156997ff74dafb34a961e8c8b3514e785e 100644 (file)
--- a/EdkCompatibilityPkg/Sample/Tools/Source/Common/EfiCustomizedCompress.h
+++ b/EdkCompatibilityPkg/Sample/Tools/Source/Common/EfiCustomizedCompress.h
@@ -24,8 +24,7 @@ Abstract:
 EFI_STATUS\r
 SetCustomizedCompressionType (\r
   IN  CHAR8   *Type\r
-  )\r
-;\r
+  );\r
 \r
 /*++\r
 \r
@@ -49,8 +48,7 @@ CustomizedGetInfo (
   IN      UINT32  SrcSize,\r
   OUT     UINT32  *DstSize,\r
   OUT     UINT32  *ScratchSize\r
-  )\r
-;\r
+  );\r
 \r
 /*++\r
 \r
@@ -79,8 +77,7 @@ CustomizedDecompress (
   IN      UINT32  DstSize,\r
   IN OUT  VOID    *Scratch,\r
   IN      UINT32  ScratchSize\r
-  )\r
-;\r
+  );\r
 \r
 /*++\r
 \r
@@ -110,8 +107,7 @@ CustomizedCompress (
   IN      UINT32  SrcSize,\r
   IN      UINT8   *DstBuffer,\r
   IN OUT  UINT32  *DstSize\r
-  )\r
-;\r
+  );\r
 \r
 /*++\r
 \r

diff --git a/EdkCompatibilityPkg/Sample/Tools/Source/Common/EfiUtilityMsgs.h b/EdkCompatibilityPkg/Sample/Tools/Source/Common/EfiUtilityMsgs.h
index 2da1fe58f6314f0b3a1d0a82c06613b5d36219ce..65b1c7f9c2ad32f7e194d33b7eca4e3277ac7c4c 100644 (file)
--- a/EdkCompatibilityPkg/Sample/Tools/Source/Common/EfiUtilityMsgs.h
+++ b/EdkCompatibilityPkg/Sample/Tools/Source/Common/EfiUtilityMsgs.h
@@ -53,8 +53,7 @@ GetUtilityStatus (
 void\r
 SetUtilityName (\r
   INT8 *ProgramName\r
-  )\r
-;\r
+  );\r
 \r
 void\r
 Error (\r
@@ -64,8 +63,7 @@ Error (
   INT8    *OffendingText,\r
   INT8    *MsgFmt,\r
   ...\r
-  )\r
-;\r
+  );\r
 \r
 void\r
 Warning (\r
@@ -75,8 +73,7 @@ Warning (
   INT8    *OffendingText,\r
   INT8    *MsgFmt,\r
   ...\r
-  )\r
-;\r
+  );\r
 \r
 void\r
 DebugMsg (\r
@@ -86,21 +83,18 @@ DebugMsg (
   INT8    *OffendingText,\r
   INT8    *MsgFmt,\r
   ...\r
-  )\r
-;\r
+  );\r
 \r
 void\r
 SetDebugMsgMask (\r
   UINT32    MsgMask\r
-  )\r
-;\r
+  );\r
 \r
 void\r
 ParserSetPosition (\r
   INT8    *SourceFileName,\r
   UINT32  LineNum\r
-  )\r
-;\r
+  );\r
 \r
 void\r
 ParserError (\r
@@ -108,8 +102,7 @@ ParserError (
   INT8    *OffendingText,\r
   INT8    *MsgFmt,\r
   ...\r
-  )\r
-;\r
+  );\r
 \r
 void\r
 ParserWarning (\r
@@ -117,16 +110,14 @@ ParserWarning (
   INT8    *OffendingText,\r
   INT8    *MsgFmt,\r
   ...\r
-  )\r
-;\r
+  );\r
 \r
 void\r
 SetPrintLimits (\r
   UINT32  NumErrors,\r
   UINT32  NumWarnings,\r
   UINT32  NumWarningsPlusErrors\r
-  )\r
-;\r
+  );\r
 \r
 #ifdef __cplusplus\r
 }\r

diff --git a/EdkCompatibilityPkg/Sample/Tools/Source/Common/FvLib.h b/EdkCompatibilityPkg/Sample/Tools/Source/Common/FvLib.h
index 4b7ef0a3325249267fb7fcc8a601a497b27adf0c..88c40cdbcbd84ac4346c0866dcb677c5783f7a62 100644 (file)
--- a/EdkCompatibilityPkg/Sample/Tools/Source/Common/FvLib.h
+++ b/EdkCompatibilityPkg/Sample/Tools/Source/Common/FvLib.h
@@ -34,37 +34,32 @@ EFI_STATUS
 InitializeFvLib (\r
   IN VOID                         *Fv,\r
   IN UINT32                       FvLength\r
-  )\r
-;\r
+  );\r
 \r
 EFI_STATUS\r
 GetFvHeader (\r
   OUT EFI_FIRMWARE_VOLUME_HEADER  **FvHeader,\r
   OUT UINT32                      *FvLength\r
-  )\r
-;\r
+  );\r
 \r
 EFI_STATUS\r
 GetNextFile (\r
   IN EFI_FFS_FILE_HEADER          *CurrentFile,\r
   OUT EFI_FFS_FILE_HEADER         **NextFile\r
-  )\r
-;\r
+  );\r
 \r
 EFI_STATUS\r
 GetFileByName (\r
   IN EFI_GUID                     *FileName,\r
   OUT EFI_FFS_FILE_HEADER         **File\r
-  )\r
-;\r
+  );\r
 \r
 EFI_STATUS\r
 GetFileByType (\r
   IN EFI_FV_FILETYPE              FileType,\r
   IN UINTN                        Instance,\r
   OUT EFI_FFS_FILE_HEADER         **File\r
-  )\r
-;\r
+  );\r
 \r
 EFI_STATUS\r
 GetSectionByType (\r
@@ -72,22 +67,19 @@ GetSectionByType (
   IN EFI_SECTION_TYPE             SectionType,\r
   IN UINTN                        Instance,\r
   OUT EFI_FILE_SECTION_POINTER    *Section\r
-  )\r
-;\r
+  );\r
 //\r
 // will not parse compressed sections\r
 //\r
 EFI_STATUS\r
 VerifyFv (\r
   IN EFI_FIRMWARE_VOLUME_HEADER   *FvHeader\r
-  )\r
-;\r
+  );\r
 \r
 EFI_STATUS\r
 VerifyFfsFile (\r
   IN EFI_FFS_FILE_HEADER          *FfsHeader\r
-  )\r
-;\r
+  );\r
 \r
 /*++\r
 \r
@@ -109,8 +101,7 @@ Returns:
 UINT32\r
 GetLength (\r
   UINT8                           *ThreeByteLength\r
-  )\r
-;\r
+  );\r
 \r
 /*++\r
 \r
@@ -130,8 +121,7 @@ Returns:
 EFI_STATUS\r
 GetErasePolarity (\r
   OUT BOOLEAN   *ErasePolarity\r
-  )\r
-;\r
+  );\r
 \r
 /*++\r
 \r
@@ -154,8 +144,7 @@ UINT8
 GetFileState (\r
   IN BOOLEAN              ErasePolarity,\r
   IN EFI_FFS_FILE_HEADER  *FfsHeader\r
-  )\r
-;\r
+  );\r
 \r
 /*++\r
 \r

diff --git a/EdkCompatibilityPkg/Sample/Tools/Source/Common/MyAlloc.h b/EdkCompatibilityPkg/Sample/Tools/Source/Common/MyAlloc.h
index 2d195c2561a904ba67f24befc50d0ae9ab6512e6..5cfb4e0caba9c6ffb7eeeb0edcd376350477f17e 100644 (file)
--- a/EdkCompatibilityPkg/Sample/Tools/Source/Common/MyAlloc.h
+++ b/EdkCompatibilityPkg/Sample/Tools/Source/Common/MyAlloc.h
@@ -89,8 +89,7 @@ MyCheck (
   BOOLEAN      Final,\r
   UINT8        File[],\r
   UINTN        Line\r
-  )\r
-;\r
+  );\r
 //\r
 // *++\r
 // Description:\r
@@ -121,8 +120,7 @@ MyAlloc (
   UINTN      Size,\r
   UINT8      File[],\r
   UINTN      Line\r
-  )\r
-;\r
+  );\r
 //\r
 // *++\r
 // Description:\r
@@ -153,8 +151,7 @@ MyRealloc (
   UINTN      Size,\r
   UINT8      File[],\r
   UINTN      Line\r
-  )\r
-;\r
+  );\r
 //\r
 // *++\r
 // Description:\r
@@ -185,8 +182,7 @@ MyFree (
   VOID       *Ptr,\r
   UINT8      File[],\r
   UINTN      Line\r
-  )\r
-;\r
+  );\r
 //\r
 // *++\r
 // Description:\r

diff --git a/EdkCompatibilityPkg/Sample/Tools/Source/Common/ParseInf.h b/EdkCompatibilityPkg/Sample/Tools/Source/Common/ParseInf.h
index 0b4fec7a1fcf09dcfcadd3e6638478c7cc35ecb8..32b94bc69ff8d2618739ea40a22acab41211e746 100644 (file)
--- a/EdkCompatibilityPkg/Sample/Tools/Source/Common/ParseInf.h
+++ b/EdkCompatibilityPkg/Sample/Tools/Source/Common/ParseInf.h
@@ -43,8 +43,7 @@ ReadLine (
   IN MEMORY_FILE    *InputFile,\r
   IN OUT CHAR8      *InputBuffer,\r
   IN UINT32         MaxLength\r
-  )\r
-;\r
+  );\r
 \r
 /*++\r
 \r
@@ -73,8 +72,7 @@ BOOLEAN
 FindSection (\r
   IN MEMORY_FILE    *InputFile,\r
   IN CHAR8          *Section\r
-  )\r
-;\r
+  );\r
 \r
 /*++\r
 \r
@@ -101,8 +99,7 @@ FindToken (
   IN CHAR8          *Token,\r
   IN UINTN          Instance,\r
   OUT CHAR8         *Value\r
-  )\r
-;\r
+  );\r
 \r
 /*++\r
 \r
@@ -131,8 +128,7 @@ EFI_STATUS
 StringToGuid (\r
   IN CHAR8        *AsciiGuidBuffer,\r
   OUT EFI_GUID    *GuidBuffer\r
-  )\r
-;\r
+  );\r
 \r
 /*++\r
 \r
@@ -157,8 +153,7 @@ AsciiStringToUint64 (
   IN CONST CHAR8  *AsciiString,\r
   IN BOOLEAN      IsHex,\r
   OUT UINT64      *ReturnValue\r
-  )\r
-;\r
+  );\r
 \r
 /*++\r
 \r
@@ -185,8 +180,7 @@ CHAR8 *
 ReadLineInStream (\r
   IN FILE       *InputFile,\r
   IN OUT CHAR8  *InputBuffer\r
-  )\r
-;\r
+  );\r
 \r
 /*++\r
 \r
@@ -209,8 +203,7 @@ BOOLEAN
 FindSectionInStream (\r
   IN FILE       *InputFile,\r
   IN CHAR8      *Section\r
-  )\r
-;\r
+  );\r
 \r
 /*++\r
 \r

diff --git a/EdkCompatibilityPkg/Sample/Tools/Source/Common/SimpleFileParsing.h b/EdkCompatibilityPkg/Sample/Tools/Source/Common/SimpleFileParsing.h
index ee59a6d8d4f7eff8e8ea4ac4f8a9819adcf40458..67e4fdf37bb203f4eeafdf774a38e246786bce05 100644 (file)
--- a/EdkCompatibilityPkg/Sample/Tools/Source/Common/SimpleFileParsing.h
+++ b/EdkCompatibilityPkg/Sample/Tools/Source/Common/SimpleFileParsing.h
@@ -27,40 +27,34 @@ Abstract:
 STATUS\r
 SFPInit (\r
   VOID\r
-  )\r
-;\r
+  );\r
 \r
 STATUS\r
 SFPOpenFile (\r
   char    *FileName\r
-  )\r
-;\r
+  );\r
 \r
 BOOLEAN\r
 SFPIsKeyword (\r
   T_CHAR *Str\r
-  )\r
-;\r
+  );\r
 \r
 BOOLEAN\r
 SFPIsToken (\r
   T_CHAR *Str\r
-  )\r
-;\r
+  );\r
 \r
 BOOLEAN\r
 SFPGetNextToken (\r
   T_CHAR        *Str,\r
   unsigned int  Len\r
-  )\r
-;\r
+  );\r
 \r
 BOOLEAN\r
 SFPGetGuidToken (\r
   T_CHAR *Str,\r
   UINT32 Len\r
-  )\r
-;\r
+  );\r
 \r
 #define PARSE_GUID_STYLE_5_FIELDS 0\r
 \r
@@ -68,51 +62,43 @@ BOOLEAN
 SFPGetGuid (\r
   int         GuidStyle,\r
   EFI_GUID    *Value\r
-  )\r
-;\r
+  );\r
 \r
 BOOLEAN\r
 SFPSkipToToken (\r
   T_CHAR *Str\r
-  )\r
-;\r
+  );\r
 \r
 BOOLEAN\r
 SFPGetNumber (\r
   unsigned int   *Value\r
-  )\r
-;\r
+  );\r
 \r
 BOOLEAN\r
 SFPGetQuotedString (\r
   T_CHAR      *Str,\r
   int         Length\r
-  )\r
-;\r
+  );\r
 \r
 BOOLEAN\r
 SFPIsEOF (\r
   VOID\r
-  )\r
-;\r
+  );\r
 \r
 STATUS\r
 SFPCloseFile (\r
   VOID\r
-  )\r
-;\r
+  );\r
 \r
 unsigned\r
 int\r
 SFPGetLineNumber (\r
   VOID\r
-  )\r
-;\r
+  );\r
 \r
 T_CHAR  *\r
 SFPGetFileName (\r
   VOID\r
-  )\r
-;\r
+  );\r
 \r
 #endif // #ifndef _SIMPLE_FILE_PARSING_H_\r

diff --git a/EdkCompatibilityPkg/Sample/Tools/Source/GenFvImage/GenFvImageLib.h b/EdkCompatibilityPkg/Sample/Tools/Source/GenFvImage/GenFvImageLib.h
index d275ffbc3a9eeb81c910cf8c3ef7bde2832b86ef..2670ed5cce80a0e7156243e6775140fae0564b14 100644 (file)
--- a/EdkCompatibilityPkg/Sample/Tools/Source/GenFvImage/GenFvImageLib.h
+++ b/EdkCompatibilityPkg/Sample/Tools/Source/GenFvImage/GenFvImageLib.h
@@ -62,8 +62,7 @@ GenerateFvImage (
   OUT UINT8   **SymImage,\r
   OUT UINTN   *SymImageSize,\r
   OUT CHAR8   **SymFileName\r
-  )\r
-;\r
+  );\r
 \r
 /*++\r
 \r
@@ -94,8 +93,7 @@ EFI_STATUS
 UpdatePeiCoreEntryInFit (\r
   IN FIT_TABLE     *FitTablePtr,\r
   IN UINT64        PeiCorePhysicalAddress\r
-  )\r
-;\r
+  );\r
 \r
 /*++\r
 \r
@@ -118,8 +116,7 @@ Returns:
 VOID\r
 UpdateFitCheckSum (\r
   IN FIT_TABLE   *FitTablePtr\r
-  )\r
-;\r
+  );\r
 \r
 /*++\r
 \r

diff --git a/EdkCompatibilityPkg/Sample/Tools/Source/GenFvImage/GenFvImageLibInternal.h b/EdkCompatibilityPkg/Sample/Tools/Source/GenFvImage/GenFvImageLibInternal.h
index 505188b495a464104ea3d3410748ab61367cbaba..5bc541ca88a4792778c8d566d591e32a4545abdb 100644 (file)
--- a/EdkCompatibilityPkg/Sample/Tools/Source/GenFvImage/GenFvImageLibInternal.h
+++ b/EdkCompatibilityPkg/Sample/Tools/Source/GenFvImage/GenFvImageLibInternal.h
@@ -206,7 +206,6 @@ EFI_STATUS
 ParseFvInf (\r
   IN MEMORY_FILE  *InfFile,\r
   IN FV_INFO      *FvInfo\r
-  )\r
-;\r
+  );\r
 \r
 #endif\r

diff --git a/EdkCompatibilityPkg/Sample/Tools/Source/GuidChk/CommonUtils.h b/EdkCompatibilityPkg/Sample/Tools/Source/GuidChk/CommonUtils.h
index f7a331e5d74086e9dab08920afb282e2f7753a6f..648f20f252a859013c1e2c20a8c9be0ed8add0b7 100644 (file)
--- a/EdkCompatibilityPkg/Sample/Tools/Source/GuidChk/CommonUtils.h
+++ b/EdkCompatibilityPkg/Sample/Tools/Source/GuidChk/CommonUtils.h
@@ -51,7 +51,6 @@ typedef struct _STRING_LIST {
 int\r
 CreateGuidList (\r
   INT8    *OutFileName\r
-  )\r
-;\r
+  );\r
 \r
 #endif // #ifndef _COMMON_UTILS_H_\r

diff --git a/EdkCompatibilityPkg/Sample/Tools/Source/GuidChk/FileSearch.h b/EdkCompatibilityPkg/Sample/Tools/Source/GuidChk/FileSearch.h
index bc40265366dea99b815af00dcc7aa112441293fc..81fd8672d317b378a61f16439a4f5570c63d82c0 100644 (file)
--- a/EdkCompatibilityPkg/Sample/Tools/Source/GuidChk/FileSearch.h
+++ b/EdkCompatibilityPkg/Sample/Tools/Source/GuidChk/FileSearch.h
@@ -64,45 +64,38 @@ typedef struct {
 STATUS\r
 FileSearchInit (\r
   FILE_SEARCH_DATA    *FSData\r
-  )\r
-;\r
+  );\r
 \r
 STATUS\r
 FileSearchDestroy (\r
   FILE_SEARCH_DATA    *FSData\r
-  )\r
-;\r
+  );\r
 \r
 STATUS\r
 FileSearchStart (\r
   FILE_SEARCH_DATA    *FSData,\r
   char                *FileMask,\r
   UINT32              SearchFlags\r
-  )\r
-;\r
+  );\r
 \r
 STATUS\r
 FileSearchFindNext (\r
   FILE_SEARCH_DATA    *FSData\r
-  )\r
-;\r
+  );\r
 \r
 STATUS\r
 FileSearchExcludeDirs (\r
   FILE_SEARCH_DATA    *FSData,\r
   STRING_LIST         *StrList\r
-  )\r
-;\r
+  );\r
 STATUS\r
 FileSearchExcludeExtensions (\r
   FILE_SEARCH_DATA    *FSData,\r
   STRING_LIST         *StrList\r
-  )\r
-;\r
+  );\r
 STATUS\r
 FileSearchExcludeFiles (\r
   FILE_SEARCH_DATA    *FSData,\r
   STRING_LIST         *StrList\r
-  )\r
-;\r
+  );\r
 #endif\r

diff --git a/EdkCompatibilityPkg/Sample/Tools/Source/GuidChk/UtilsMsgs.h b/EdkCompatibilityPkg/Sample/Tools/Source/GuidChk/UtilsMsgs.h
index 5f6c7010b402adc1469d9387883c71787930fdb6..f808ab03a9ae01065a96a314c73fbb2456eaf91e 100644 (file)
--- a/EdkCompatibilityPkg/Sample/Tools/Source/GuidChk/UtilsMsgs.h
+++ b/EdkCompatibilityPkg/Sample/Tools/Source/GuidChk/UtilsMsgs.h
@@ -25,8 +25,7 @@ Abstract:
 STATUS\r
 GetUtilityStatus (\r
   VOID\r
-  )\r
-;\r
+  );\r
 \r
 //\r
 // If someone prints an error message and didn't specify a source file name,\r
@@ -36,8 +35,7 @@ GetUtilityStatus (
 VOID\r
 SetUtilityName (\r
   INT8 *ProgramName\r
-  )\r
-;\r
+  );\r
 \r
 void\r
 Error (\r
@@ -47,8 +45,7 @@ Error (
   INT8    *OffendingText,\r
   INT8    *MsgFmt,\r
   ...\r
-  )\r
-;\r
+  );\r
 \r
 void\r
 Warning (\r
@@ -58,8 +55,7 @@ Warning (
   INT8    *OffendingText,\r
   INT8    *MsgFmt,\r
   ...\r
-  )\r
-;\r
+  );\r
 \r
 void\r
 DebugMsg (\r
@@ -69,21 +65,18 @@ DebugMsg (
   INT8    *OffendingText,\r
   INT8    *MsgFmt,\r
   ...\r
-  )\r
-;\r
+  );\r
 \r
 void\r
 SetDebugMsgMask (\r
   UINT32    MsgMask\r
-  )\r
-;\r
+  );\r
 \r
 void\r
 ParserSetPosition (\r
   INT8    *SourceFileName,\r
   UINT32  LineNum\r
-  )\r
-;\r
+  );\r
 \r
 void\r
 ParserError (\r
@@ -91,8 +84,7 @@ ParserError (
   INT8    *OffendingText,\r
   INT8    *MsgFmt,\r
   ...\r
-  )\r
-;\r
+  );\r
 \r
 void\r
 ParserWarning (\r
@@ -100,7 +92,6 @@ ParserWarning (
   INT8    *OffendingText,\r
   INT8    *MsgFmt,\r
   ...\r
-  )\r
-;\r
+  );\r
 \r
 #endif\r

diff --git a/EdkCompatibilityPkg/Sample/Tools/Source/ProcessDsc/DscFile.h b/EdkCompatibilityPkg/Sample/Tools/Source/ProcessDsc/DscFile.h
index 4dcad547ec508329f5b2c4b70d8714072c161130..0ed7128d882d8d98661dd6d82613bd10dc919b08 100644 (file)
--- a/EdkCompatibilityPkg/Sample/Tools/Source/ProcessDsc/DscFile.h
+++ b/EdkCompatibilityPkg/Sample/Tools/Source/ProcessDsc/DscFile.h
@@ -70,40 +70,33 @@ int
 DSCFileSetFile (\r
   DSC_FILE *DSC,\r
   char     *FileName\r
-  )\r
-;\r
+  );\r
 SECTION *\r
 DSCFileFindSection (\r
   DSC_FILE *DSC,\r
   char     *Name\r
-  )\r
-;\r
+  );\r
 int\r
 DSCFileSavePosition (\r
   DSC_FILE *DSC\r
-  )\r
-;\r
+  );\r
 int\r
 DSCFileRestorePosition (\r
   DSC_FILE *DSC\r
-  )\r
-;\r
+  );\r
 char    *\r
 DSCFileGetLine (\r
   DSC_FILE *DSC,\r
   char     *Line,\r
   int      LineLen\r
-  )\r
-;\r
+  );\r
 int\r
 DSCFileInit (\r
   DSC_FILE *DSC\r
-  )\r
-;\r
+  );\r
 int\r
 DSCFileDestroy (\r
   DSC_FILE *DSC\r
-  )\r
-;\r
+  );\r
 \r
 #endif // ifndef _DSC_FILE_H_\r

diff --git a/EdkCompatibilityPkg/Sample/Tools/Source/ProcessDsc/Exceptions.h b/EdkCompatibilityPkg/Sample/Tools/Source/ProcessDsc/Exceptions.h
index 1425d4387a750d2819546ed18d6dda44fad62a5a..625d1e13e4625e48d7f1ba83eafd340d988f63ff 100644 (file)
--- a/EdkCompatibilityPkg/Sample/Tools/Source/ProcessDsc/Exceptions.h
+++ b/EdkCompatibilityPkg/Sample/Tools/Source/ProcessDsc/Exceptions.h
@@ -31,27 +31,22 @@ Abstract:
 int\r
 InitExceptions (\r
   VOID\r
-  )\r
-;\r
+  );\r
 int\r
 TryException (\r
   VOID\r
-  )\r
-;\r
+  );\r
 char  *\r
 CatchException (\r
   VOID\r
-  )\r
-;\r
+  );\r
 int\r
 ExceptionThrown (\r
   VOID\r
-  )\r
-;\r
+  );\r
 int\r
 ThrowException (\r
   char *EMsg\r
-  )\r
-;\r
+  );\r
 \r
 #endif // ifndef _EXCEPTIONS_H_\r

diff --git a/EdkCompatibilityPkg/Sample/Tools/Source/ProcessDsc/FWVolume.h b/EdkCompatibilityPkg/Sample/Tools/Source/ProcessDsc/FWVolume.h
index 4a7af36e73f5623cc9f2db9ea3a2223d5a6ea9a2..f42f97777e9243aa9337353ed4d271d8bbda3ff2 100644 (file)
--- a/EdkCompatibilityPkg/Sample/Tools/Source/ProcessDsc/FWVolume.h
+++ b/EdkCompatibilityPkg/Sample/Tools/Source/ProcessDsc/FWVolume.h
@@ -31,13 +31,11 @@ Abstract:
 void\r
 CFVConstructor (\r
   VOID\r
-  )\r
-;\r
+  );\r
 void\r
 CFVDestructor (\r
   VOID\r
-  )\r
-;\r
+  );\r
 \r
 int\r
 CFVAddFVFile (\r
@@ -50,27 +48,23 @@ CFVAddFVFile (
   char  *Apriori,\r
   char  *BaseName,\r
   char  *Guid\r
-  )\r
-;\r
+  );\r
 \r
 int\r
 CFVSetXRefFileName (\r
   char    *FileName\r
-  )\r
-;\r
+  );\r
 \r
 int\r
 CFVWriteInfFiles (\r
   DSC_FILE  *DSC,\r
   FILE      *MakeFptr\r
-  )\r
-;\r
+  );\r
 \r
 int\r
 NonFFSFVWriteInfFiles (\r
   DSC_FILE  *DSC,\r
   char      *FileName\r
-  )\r
-;\r
+  );\r
 \r
 #endif // ifndef _FW_VOLUME_H_\r

diff --git a/EdkCompatibilityPkg/Sample/Tools/Source/StrGather/StringDB.h b/EdkCompatibilityPkg/Sample/Tools/Source/StrGather/StringDB.h
index 4dc05a3642fe9785400d64cd378fd2b94c2db418..66494c8eeee615ae5201ea55c67815ff4af1690d 100644 (file)
--- a/EdkCompatibilityPkg/Sample/Tools/Source/StrGather/StringDB.h
+++ b/EdkCompatibilityPkg/Sample/Tools/Source/StrGather/StringDB.h
@@ -28,13 +28,11 @@ Abstract:
 void\r
 StringDBConstructor (\r
   void\r
-  )\r
-;\r
+  );\r
 void\r
 StringDBDestructor (\r
   void\r
-  )\r
-;\r
+  );\r
 \r
 STATUS\r
 StringDBAddString (\r
@@ -44,14 +42,12 @@ StringDBAddString (
   WCHAR   *String,\r
   BOOLEAN Format,\r
   UINT16  Flags\r
-  )\r
-;\r
+  );\r
 \r
 STATUS\r
 StringDBSetScope (\r
   WCHAR   *Scope\r
-  )\r
-;\r
+  );\r
 \r
 #define STRING_FLAGS_REFERENCED           0x0001  // if referenced somewhere\r
 #define STRING_FLAGS_UNDEFINED            0x0002  // if we added it for padding purposes\r
@@ -65,38 +61,33 @@ StringDBAddStringIdentifier (
   WCHAR     *StringIdentifier,\r
   UINT16    *NewId,\r
   UINT16    Flags\r
-  )\r
-;\r
+  );\r
 \r
 STATUS\r
 StringDBReadDatabase (\r
   INT8    *DBFileName,\r
   BOOLEAN IgnoreIfNotExist,\r
   BOOLEAN Verbose\r
-  )\r
-;\r
+  );\r
 \r
 STATUS\r
 StringDBWriteDatabase (\r
   INT8    *DBFileName,\r
   BOOLEAN Verbose\r
-  )\r
-;\r
+  );\r
 \r
 STATUS\r
 StringDBDumpDatabase (\r
   INT8                *DBFileName,\r
   INT8                *OutputFileName,\r
   BOOLEAN             Verbose\r
-  )\r
-;\r
+  );\r
 \r
 STATUS\r
 StringDBAddLanguage (\r
   WCHAR *LanguageName,\r
   WCHAR *PrintableLanguageName\r
-  )\r
-;\r
+  );\r
 \r
 STATUS\r
 StringDBDumpCStrings (\r
@@ -104,33 +95,28 @@ StringDBDumpCStrings (
   INT8                        *BaseName,\r
   WCHAR_STRING_LIST           *LanguagesOfInterest,\r
   WCHAR_MATCHING_STRING_LIST  *IndirectionList\r
-  )\r
-;\r
+  );\r
 \r
 STATUS\r
 StringDBDumpStringDefines (\r
   INT8                *FileName,\r
   INT8                *BaseName\r
-  )\r
-;\r
+  );\r
 \r
 STATUS\r
 StringDBSetCurrentLanguage (\r
   WCHAR *LanguageName\r
-  )\r
-;\r
+  );\r
 \r
 STATUS\r
 StringDBSetStringReferenced (\r
   INT8      *StringIdentifierName,\r
   BOOLEAN   IgnoreNotFound\r
-  )\r
-;\r
+  );\r
 \r
 void\r
 StringDBFormatString (\r
   WCHAR   *String\r
-  )\r
-;\r
+  );\r
 \r
 #endif // #ifndef _STRING_DB_H_\r

diff --git a/EdkCompatibilityPkg/Sample/Tools/Source/UefiStrGather/StringDB.h b/EdkCompatibilityPkg/Sample/Tools/Source/UefiStrGather/StringDB.h
index 6b485c7c9eec175e8818b3442a95e80763a9c25d..3a5ad387bfe3f0053d3d7e2c5b33afad4dfd9176 100644 (file)
--- a/EdkCompatibilityPkg/Sample/Tools/Source/UefiStrGather/StringDB.h
+++ b/EdkCompatibilityPkg/Sample/Tools/Source/UefiStrGather/StringDB.h
@@ -134,13 +134,11 @@ typedef struct _SPkgBlkBuffer {
 void\r
 StringDBConstructor (\r
   void\r
-  )\r
-;\r
+  );\r
 void\r
 StringDBDestructor (\r
   void\r
-  )\r
-;\r
+  );\r
 \r
 STATUS\r
 StringDBAddString (\r
@@ -150,14 +148,12 @@ StringDBAddString (
   WCHAR   *String,\r
   BOOLEAN Format,\r
   UINT16  Flags\r
-  )\r
-;\r
+  );\r
 \r
 STATUS\r
 StringDBSetScope (\r
   WCHAR   *Scope\r
-  )\r
-;\r
+  );\r
 \r
 #define STRING_FLAGS_REFERENCED           0x0001  // if referenced somewhere\r
 #define STRING_FLAGS_UNDEFINED            0x0002  // if we added it for padding purposes\r
@@ -171,84 +167,72 @@ StringDBAddStringIdentifier (
   WCHAR     *StringIdentifier,\r
   UINT16    *NewId,\r
   UINT16    Flags\r
-  )\r
-;\r
+  );\r
 \r
 STATUS\r
 StringDBReadDatabase (\r
   INT8    *DBFileName,\r
   BOOLEAN IgnoreIfNotExist,\r
   BOOLEAN Verbose\r
-  )\r
-;\r
+  );\r
 \r
 STATUS\r
 StringDBWriteDatabase (\r
   INT8    *DBFileName,\r
   BOOLEAN Verbose\r
-  )\r
-;\r
+  );\r
 \r
 STATUS\r
 StringDBDumpDatabase (\r
   INT8                *DBFileName,\r
   INT8                *OutputFileName,\r
   BOOLEAN             Verbose\r
-  )\r
-;\r
+  );\r
 \r
 STATUS\r
 StringDBAddLanguage (\r
   WCHAR *LanguageName,\r
   WCHAR *PrintableLanguageName,\r
   WCHAR *SecondaryLanguageList\r
-  )\r
-;\r
+  );\r
 \r
 STATUS\r
 StringDBAddSecondaryLanguage (\r
   WCHAR *LanguageName,\r
   WCHAR *SecondaryLanguageList\r
-  )\r
-;\r
+  );\r
 \r
 STATUS\r
 StringDBDumpCStrings (\r
   INT8                            *BaseName,\r
   INT8                            *FileName\r
-  )\r
-;\r
+  );\r
 \r
 STATUS\r
 StringDBDumpStringDefines (\r
   INT8                *FileName,\r
   INT8                *BaseName\r
-  )\r
-;\r
+  );\r
 \r
 STATUS\r
 StringDBSetCurrentLanguage (\r
   WCHAR *LanguageName\r
-  )\r
-;\r
+  );\r
 \r
 STATUS\r
 StringDBSetStringReferenced (\r
   INT8      *StringIdentifierName,\r
   BOOLEAN   IgnoreNotFound\r
-  )\r
-;\r
+  );\r
 \r
 void\r
 StringDBFormatString (\r
   WCHAR   *String\r
-  )\r
-;\r
+  );\r
 \r
 LANGUAGE_LIST *\r
 StringDBFindLanguageList (\r
   WCHAR *LanguageName\r
-  )\r
-;\r
+  );\r
 \r
 #endif // #ifndef _STRING_DB_H_\r