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/QemuVideoDxe | |
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/QemuVideoDxe')
-rw-r--r-- | OvmfPkg/QemuVideoDxe/Gop.c | 2 | ||||
-rw-r--r-- | OvmfPkg/QemuVideoDxe/Initialize.c | 14 | ||||
-rw-r--r-- | OvmfPkg/QemuVideoDxe/VbeShim.c | 12 |
3 files changed, 14 insertions, 14 deletions
diff --git a/OvmfPkg/QemuVideoDxe/Gop.c b/OvmfPkg/QemuVideoDxe/Gop.c index 7a9fe208c9..b11eed7558 100644 --- a/OvmfPkg/QemuVideoDxe/Gop.c +++ b/OvmfPkg/QemuVideoDxe/Gop.c @@ -37,7 +37,7 @@ QemuVideoCompleteModeInfo ( Info->PixelInformation.BlueMask = 0;
Info->PixelInformation.ReservedMask = 0;
} else {
- DEBUG ((DEBUG_ERROR, "%a: Invalid ColorDepth %u", __FUNCTION__, ModeData->ColorDepth));
+ DEBUG ((DEBUG_ERROR, "%a: Invalid ColorDepth %u", __func__, ModeData->ColorDepth));
ASSERT (FALSE);
}
diff --git a/OvmfPkg/QemuVideoDxe/Initialize.c b/OvmfPkg/QemuVideoDxe/Initialize.c index 2a3cbc65c3..050ae878ec 100644 --- a/OvmfPkg/QemuVideoDxe/Initialize.c +++ b/OvmfPkg/QemuVideoDxe/Initialize.c @@ -310,7 +310,7 @@ QemuVideoBochsEdid ( DEBUG ((
DEBUG_INFO,
"%a: mmio read failed\n",
- __FUNCTION__
+ __func__
));
return;
}
@@ -321,7 +321,7 @@ QemuVideoBochsEdid ( DEBUG ((
DEBUG_INFO,
"%a: magic check failed\n",
- __FUNCTION__
+ __func__
));
return;
}
@@ -329,7 +329,7 @@ QemuVideoBochsEdid ( DEBUG ((
DEBUG_INFO,
"%a: blob found (extensions: %d)\n",
- __FUNCTION__,
+ __func__,
Private->Edid[126]
));
@@ -339,7 +339,7 @@ QemuVideoBochsEdid ( DEBUG ((
DEBUG_INFO,
"%a: no detailed timing descriptor\n",
- __FUNCTION__
+ __func__
));
return;
}
@@ -349,7 +349,7 @@ QemuVideoBochsEdid ( DEBUG ((
DEBUG_INFO,
"%a: default resolution: %dx%d\n",
- __FUNCTION__,
+ __func__,
*XRes,
*YRes
));
@@ -436,7 +436,7 @@ QemuVideoBochsModeSetup ( DEBUG_ERROR,
"%a: can't read size of drawable buffer from QXL "
"ROM\n",
- __FUNCTION__
+ __func__
));
return EFI_NOT_FOUND;
}
@@ -448,7 +448,7 @@ QemuVideoBochsModeSetup ( DEBUG ((
DEBUG_INFO,
"%a: AvailableFbSize=0x%x\n",
- __FUNCTION__,
+ __func__,
AvailableFbSize
));
diff --git a/OvmfPkg/QemuVideoDxe/VbeShim.c b/OvmfPkg/QemuVideoDxe/VbeShim.c index 2a048211a8..8f151b96f9 100644 --- a/OvmfPkg/QemuVideoDxe/VbeShim.c +++ b/OvmfPkg/QemuVideoDxe/VbeShim.c @@ -73,12 +73,12 @@ InstallVbeShim ( DEBUG ((
DEBUG_WARN,
"%a: page 0 protected, not installing VBE shim\n",
- __FUNCTION__
+ __func__
));
DEBUG ((
DEBUG_WARN,
"%a: page 0 protection prevents Windows 7 from booting anyway\n",
- __FUNCTION__
+ __func__
));
return;
}
@@ -117,7 +117,7 @@ InstallVbeShim ( DEBUG ((
DEBUG_INFO,
"%a: Video BIOS handler found at %04x:%04x\n",
- __FUNCTION__,
+ __func__,
Int0x10->Segment,
Int0x10->Offset
));
@@ -131,7 +131,7 @@ InstallVbeShim ( DEBUG ((
DEBUG_INFO,
"%a: failed to allocate page at zero: %r\n",
- __FUNCTION__,
+ __func__,
Segment0AllocationStatus
));
} else {
@@ -162,7 +162,7 @@ InstallVbeShim ( DEBUG ((
DEBUG_ERROR,
"%a: unknown host bridge device ID: 0x%04x\n",
- __FUNCTION__,
+ __func__,
HostBridgeDevId
));
ASSERT (FALSE);
@@ -324,5 +324,5 @@ InstallVbeShim ( Int0x10->Segment = (UINT16)((UINT32)SegmentC >> 4);
Int0x10->Offset = (UINT16)((UINTN)(VbeModeInfo + 1) - SegmentC);
- DEBUG ((DEBUG_INFO, "%a: VBE shim installed\n", __FUNCTION__));
+ DEBUG ((DEBUG_INFO, "%a: VBE shim installed\n", __func__));
}
|