From 9c721071d30e69fd47f583cde370c3954cba974d Mon Sep 17 00:00:00 2001 From: Michael D Kinney Date: Thu, 2 Dec 2021 18:00:45 -0800 Subject: [PATCH] FmpDevicePkg: 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 Cc: Leif Lindholm Cc: Michael Kubacki Signed-off-by: Michael D Kinney Reviewed-by: Liming Gao --- FmpDevicePkg/Include/Library/FmpDependencyCheckLib.h | 2 +- FmpDevicePkg/Include/Library/FmpDependencyLib.h | 2 +- FmpDevicePkg/Include/Library/FmpDeviceLib.h | 8 ++++---- .../Library/FmpDependencyCheckLib/FmpDependencyCheckLib.c | 2 +- .../FmpDependencyCheckLibNull/FmpDependencyCheckLibNull.c | 2 +- FmpDevicePkg/Library/FmpDependencyLib/FmpDependencyLib.c | 3 +-- FmpDevicePkg/Library/FmpDeviceLibNull/FmpDeviceLib.c | 8 ++++---- 7 files changed, 13 insertions(+), 14 deletions(-) diff --git a/FmpDevicePkg/Include/Library/FmpDependencyCheckLib.h b/FmpDevicePkg/Include/Library/FmpDependencyCheckLib.h index 785bda9401..d8962c426a 100644 --- a/FmpDevicePkg/Include/Library/FmpDependencyCheckLib.h +++ b/FmpDevicePkg/Include/Library/FmpDependencyCheckLib.h @@ -36,7 +36,7 @@ EFIAPI CheckFmpDependency ( IN EFI_GUID ImageTypeId, IN UINT32 Version, - IN EFI_FIRMWARE_IMAGE_DEP *Dependencies, OPTIONAL + IN EFI_FIRMWARE_IMAGE_DEP *Dependencies OPTIONAL, IN UINT32 DependenciesSize, OUT UINT32 *LastAttemptStatus OPTIONAL ); diff --git a/FmpDevicePkg/Include/Library/FmpDependencyLib.h b/FmpDevicePkg/Include/Library/FmpDependencyLib.h index f460f0f078..f4013484a2 100644 --- a/FmpDevicePkg/Include/Library/FmpDependencyLib.h +++ b/FmpDevicePkg/Include/Library/FmpDependencyLib.h @@ -96,7 +96,7 @@ EFIAPI EvaluateDependency ( IN EFI_FIRMWARE_IMAGE_DEP *Dependencies, IN UINTN DependenciesSize, - IN FMP_DEPEX_CHECK_VERSION_DATA *FmpVersions, OPTIONAL + IN FMP_DEPEX_CHECK_VERSION_DATA *FmpVersions OPTIONAL, IN UINTN FmpVersionsCount, OUT UINT32 *LastAttemptStatus OPTIONAL ); diff --git a/FmpDevicePkg/Include/Library/FmpDeviceLib.h b/FmpDevicePkg/Include/Library/FmpDeviceLib.h index 6abd99fa1f..a93c3b8e94 100644 --- a/FmpDevicePkg/Include/Library/FmpDeviceLib.h +++ b/FmpDevicePkg/Include/Library/FmpDeviceLib.h @@ -504,8 +504,8 @@ EFIAPI FmpDeviceSetImage ( IN CONST VOID *Image, IN UINTN ImageSize, - IN CONST VOID *VendorCode, OPTIONAL - IN EFI_FIRMWARE_MANAGEMENT_UPDATE_IMAGE_PROGRESS Progress, OPTIONAL + IN CONST VOID *VendorCode OPTIONAL, + IN EFI_FIRMWARE_MANAGEMENT_UPDATE_IMAGE_PROGRESS Progress OPTIONAL, IN UINT32 CapsuleFwVersion, OUT CHAR16 **AbortReason ); @@ -578,8 +578,8 @@ EFIAPI FmpDeviceSetImageWithStatus ( IN CONST VOID *Image, IN UINTN ImageSize, - IN CONST VOID *VendorCode, OPTIONAL - IN EFI_FIRMWARE_MANAGEMENT_UPDATE_IMAGE_PROGRESS Progress, OPTIONAL + IN CONST VOID *VendorCode OPTIONAL, + IN EFI_FIRMWARE_MANAGEMENT_UPDATE_IMAGE_PROGRESS Progress OPTIONAL, IN UINT32 CapsuleFwVersion, OUT CHAR16 **AbortReason, OUT UINT32 *LastAttemptStatus diff --git a/FmpDevicePkg/Library/FmpDependencyCheckLib/FmpDependencyCheckLib.c b/FmpDevicePkg/Library/FmpDependencyCheckLib/FmpDependencyCheckLib.c index cca83dbe4a..31a801657f 100644 --- a/FmpDevicePkg/Library/FmpDependencyCheckLib/FmpDependencyCheckLib.c +++ b/FmpDevicePkg/Library/FmpDependencyCheckLib/FmpDependencyCheckLib.c @@ -42,7 +42,7 @@ EFIAPI CheckFmpDependency ( IN EFI_GUID ImageTypeId, IN UINT32 Version, - IN EFI_FIRMWARE_IMAGE_DEP *Dependencies, OPTIONAL + IN EFI_FIRMWARE_IMAGE_DEP *Dependencies OPTIONAL, IN UINT32 DependenciesSize, OUT UINT32 *LastAttemptStatus OPTIONAL ) diff --git a/FmpDevicePkg/Library/FmpDependencyCheckLibNull/FmpDependencyCheckLibNull.c b/FmpDevicePkg/Library/FmpDependencyCheckLibNull/FmpDependencyCheckLibNull.c index 74247957ac..a48cfac490 100644 --- a/FmpDevicePkg/Library/FmpDependencyCheckLibNull/FmpDependencyCheckLibNull.c +++ b/FmpDevicePkg/Library/FmpDependencyCheckLibNull/FmpDependencyCheckLibNull.c @@ -31,7 +31,7 @@ EFIAPI CheckFmpDependency ( IN EFI_GUID ImageTypeId, IN UINT32 Version, - IN EFI_FIRMWARE_IMAGE_DEP *Dependencies, OPTIONAL + IN EFI_FIRMWARE_IMAGE_DEP *Dependencies OPTIONAL, IN UINT32 DependenciesSize, OUT UINT32 *LastAttemptStatus OPTIONAL ) diff --git a/FmpDevicePkg/Library/FmpDependencyLib/FmpDependencyLib.c b/FmpDevicePkg/Library/FmpDependencyLib/FmpDependencyLib.c index b222ace6d6..ad0fa6532e 100644 --- a/FmpDevicePkg/Library/FmpDependencyLib/FmpDependencyLib.c +++ b/FmpDevicePkg/Library/FmpDependencyLib/FmpDependencyLib.c @@ -220,7 +220,7 @@ EFIAPI EvaluateDependency ( IN EFI_FIRMWARE_IMAGE_DEP *Dependencies, IN UINTN DependenciesSize, - IN FMP_DEPEX_CHECK_VERSION_DATA *FmpVersions, OPTIONAL + IN FMP_DEPEX_CHECK_VERSION_DATA *FmpVersions OPTIONAL, IN UINTN FmpVersionsCount, OUT UINT32 *LastAttemptStatus OPTIONAL ) @@ -610,4 +610,3 @@ GetImageDependency ( return NULL; } - diff --git a/FmpDevicePkg/Library/FmpDeviceLibNull/FmpDeviceLib.c b/FmpDevicePkg/Library/FmpDeviceLibNull/FmpDeviceLib.c index f4f57b29bd..92f202112f 100644 --- a/FmpDevicePkg/Library/FmpDeviceLibNull/FmpDeviceLib.c +++ b/FmpDevicePkg/Library/FmpDeviceLibNull/FmpDeviceLib.c @@ -519,8 +519,8 @@ EFIAPI FmpDeviceSetImage ( IN CONST VOID *Image, IN UINTN ImageSize, - IN CONST VOID *VendorCode, OPTIONAL - IN EFI_FIRMWARE_MANAGEMENT_UPDATE_IMAGE_PROGRESS Progress, OPTIONAL + IN CONST VOID *VendorCode OPTIONAL, + IN EFI_FIRMWARE_MANAGEMENT_UPDATE_IMAGE_PROGRESS Progress OPTIONAL, IN UINT32 CapsuleFwVersion, OUT CHAR16 **AbortReason ) @@ -606,8 +606,8 @@ EFIAPI FmpDeviceSetImageWithStatus ( IN CONST VOID *Image, IN UINTN ImageSize, - IN CONST VOID *VendorCode, OPTIONAL - IN EFI_FIRMWARE_MANAGEMENT_UPDATE_IMAGE_PROGRESS Progress, OPTIONAL + IN CONST VOID *VendorCode OPTIONAL, + IN EFI_FIRMWARE_MANAGEMENT_UPDATE_IMAGE_PROGRESS Progress OPTIONAL, IN UINT32 CapsuleFwVersion, OUT CHAR16 **AbortReason, OUT UINT32 *LastAttemptStatus -- 2.39.2