diff options
| author | Rebecca Cran <rebecca@bsdio.com> | 2023-04-06 13:49:41 -0600 |
|---|---|---|
| committer | mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> | 2023-04-10 14:19:57 +0000 |
| commit | 8ba392687b6f7fcb6e333756edd090003c57402e (patch) | |
| tree | 040194cbfaa73f764e86e050e9bc00b58e4fc60b /OvmfPkg/VirtNorFlashDxe | |
| parent | 089013a69724687f4051fc88367c9eb74def4284 (diff) | |
| download | edk2-8ba392687b6f7fcb6e333756edd090003c57402e.tar.gz edk2-8ba392687b6f7fcb6e333756edd090003c57402e.tar.bz2 edk2-8ba392687b6f7fcb6e333756edd090003c57402e.zip | |
OvmfPkg: Update code to be more C11 compliant by using __func__
__FUNCTION__ is a pre-standard extension that gcc and Visual C++ among
others support, while __func__ was standardized in C99.
Since it's more standard, replace __FUNCTION__ with __func__ throughout
OvmfPkg.
Signed-off-by: Rebecca Cran <rebecca@bsdio.com>
Reviewed-by: Michael D Kinney <michael.d.kinney@intel.com>
Reviewed-by: Ard Biesheuvel <ardb@kernel.org>
Reviewed-by: Sunil V L <sunilvl@ventanamicro.com>
Diffstat (limited to 'OvmfPkg/VirtNorFlashDxe')
| -rw-r--r-- | OvmfPkg/VirtNorFlashDxe/VirtNorFlashDxe.c | 4 | ||||
| -rw-r--r-- | OvmfPkg/VirtNorFlashDxe/VirtNorFlashFvb.c | 22 |
2 files changed, 13 insertions, 13 deletions
diff --git a/OvmfPkg/VirtNorFlashDxe/VirtNorFlashDxe.c b/OvmfPkg/VirtNorFlashDxe/VirtNorFlashDxe.c index f9a41f6aab..6b9ef26133 100644 --- a/OvmfPkg/VirtNorFlashDxe/VirtNorFlashDxe.c +++ b/OvmfPkg/VirtNorFlashDxe/VirtNorFlashDxe.c @@ -422,11 +422,11 @@ NorFlashFvbInitialize ( // Install the Default FVB header if required
if (EFI_ERROR (Status)) {
// There is no valid header, so time to install one.
- DEBUG ((DEBUG_INFO, "%a: The FVB Header is not valid.\n", __FUNCTION__));
+ DEBUG ((DEBUG_INFO, "%a: The FVB Header is not valid.\n", __func__));
DEBUG ((
DEBUG_INFO,
"%a: Installing a correct one for this volume.\n",
- __FUNCTION__
+ __func__
));
// Erase all the NorFlash that is reserved for variable storage
diff --git a/OvmfPkg/VirtNorFlashDxe/VirtNorFlashFvb.c b/OvmfPkg/VirtNorFlashDxe/VirtNorFlashFvb.c index cc5eefaaf3..5ee98e9b59 100644 --- a/OvmfPkg/VirtNorFlashDxe/VirtNorFlashFvb.c +++ b/OvmfPkg/VirtNorFlashDxe/VirtNorFlashFvb.c @@ -74,7 +74,7 @@ InitializeFvAndVariableStoreHeaders ( DEBUG ((
DEBUG_ERROR,
"%a: NvStorageFtwWorkingBase is not contiguous with NvStorageVariableBase region\n",
- __FUNCTION__
+ __func__
));
return EFI_INVALID_PARAMETER;
}
@@ -83,7 +83,7 @@ InitializeFvAndVariableStoreHeaders ( DEBUG ((
DEBUG_ERROR,
"%a: NvStorageFtwSpareBase is not contiguous with NvStorageFtwWorkingBase region\n",
- __FUNCTION__
+ __func__
));
return EFI_INVALID_PARAMETER;
}
@@ -93,7 +93,7 @@ InitializeFvAndVariableStoreHeaders ( DEBUG ((
DEBUG_ERROR,
"%a: NvStorageVariableSize is 0x%x, should be atleast one block size\n",
- __FUNCTION__,
+ __func__,
NvStorageVariableSize
));
return EFI_INVALID_PARAMETER;
@@ -103,7 +103,7 @@ InitializeFvAndVariableStoreHeaders ( DEBUG ((
DEBUG_ERROR,
"%a: NvStorageFtwWorkingSize is 0x%x, should be atleast one block size\n",
- __FUNCTION__,
+ __func__,
NvStorageFtwWorkingSize
));
return EFI_INVALID_PARAMETER;
@@ -113,7 +113,7 @@ InitializeFvAndVariableStoreHeaders ( DEBUG ((
DEBUG_ERROR,
"%a: NvStorageFtwSpareSize is 0x%x, should be atleast one block size\n",
- __FUNCTION__,
+ __func__,
NvStorageFtwSpareSize
));
return EFI_INVALID_PARAMETER;
@@ -124,7 +124,7 @@ InitializeFvAndVariableStoreHeaders ( (NvStorageFtwWorkingBase % Instance->BlockSize != 0) ||
(NvStorageFtwSpareBase % Instance->BlockSize != 0))
{
- DEBUG ((DEBUG_ERROR, "%a: NvStorage Base addresses must be aligned to block size boundaries", __FUNCTION__));
+ DEBUG ((DEBUG_ERROR, "%a: NvStorage Base addresses must be aligned to block size boundaries", __func__));
return EFI_INVALID_PARAMETER;
}
@@ -209,7 +209,7 @@ ValidateFvHeader ( DEBUG ((
DEBUG_INFO,
"%a: No Firmware Volume header present\n",
- __FUNCTION__
+ __func__
));
return EFI_NOT_FOUND;
}
@@ -219,7 +219,7 @@ ValidateFvHeader ( DEBUG ((
DEBUG_INFO,
"%a: Firmware Volume Guid non-compatible\n",
- __FUNCTION__
+ __func__
));
return EFI_NOT_FOUND;
}
@@ -230,7 +230,7 @@ ValidateFvHeader ( DEBUG ((
DEBUG_INFO,
"%a: FV checksum is invalid (Checksum:0x%X)\n",
- __FUNCTION__,
+ __func__,
Checksum
));
return EFI_NOT_FOUND;
@@ -245,7 +245,7 @@ ValidateFvHeader ( DEBUG ((
DEBUG_INFO,
"%a: Variable Store Guid non-compatible\n",
- __FUNCTION__
+ __func__
));
return EFI_NOT_FOUND;
}
@@ -255,7 +255,7 @@ ValidateFvHeader ( DEBUG ((
DEBUG_INFO,
"%a: Variable Store Length does not match\n",
- __FUNCTION__
+ __func__
));
return EFI_NOT_FOUND;
}
|