From 8ba392687b6f7fcb6e333756edd090003c57402e Mon Sep 17 00:00:00 2001 From: Rebecca Cran Date: Thu, 6 Apr 2023 13:49:41 -0600 Subject: 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 Reviewed-by: Michael D Kinney Reviewed-by: Ard Biesheuvel Reviewed-by: Sunil V L --- OvmfPkg/VirtioFsDxe/FuseFlush.c | 2 +- OvmfPkg/VirtioFsDxe/FuseFsync.c | 2 +- OvmfPkg/VirtioFsDxe/FuseGetAttr.c | 2 +- OvmfPkg/VirtioFsDxe/FuseInit.c | 2 +- OvmfPkg/VirtioFsDxe/FuseLookup.c | 2 +- OvmfPkg/VirtioFsDxe/FuseMkDir.c | 2 +- OvmfPkg/VirtioFsDxe/FuseOpen.c | 2 +- OvmfPkg/VirtioFsDxe/FuseOpenDir.c | 2 +- OvmfPkg/VirtioFsDxe/FuseOpenOrCreate.c | 2 +- OvmfPkg/VirtioFsDxe/FuseRead.c | 2 +- OvmfPkg/VirtioFsDxe/FuseRelease.c | 2 +- OvmfPkg/VirtioFsDxe/FuseRename.c | 2 +- OvmfPkg/VirtioFsDxe/FuseSetAttr.c | 2 +- OvmfPkg/VirtioFsDxe/FuseStatFs.c | 2 +- OvmfPkg/VirtioFsDxe/FuseUnlink.c | 2 +- OvmfPkg/VirtioFsDxe/FuseWrite.c | 2 +- OvmfPkg/VirtioFsDxe/Helpers.c | 2 +- OvmfPkg/VirtioFsDxe/SimpleFsOpen.c | 4 ++-- 18 files changed, 19 insertions(+), 19 deletions(-) (limited to 'OvmfPkg/VirtioFsDxe') diff --git a/OvmfPkg/VirtioFsDxe/FuseFlush.c b/OvmfPkg/VirtioFsDxe/FuseFlush.c index ff5d6f3f5a..26cc12087b 100644 --- a/OvmfPkg/VirtioFsDxe/FuseFlush.c +++ b/OvmfPkg/VirtioFsDxe/FuseFlush.c @@ -111,7 +111,7 @@ VirtioFsFuseFlush ( DEBUG_ERROR, "%a: Label=\"%s\" NodeId=%Lu FuseHandle=%Lu " "Errno=%d\n", - __FUNCTION__, + __func__, VirtioFs->Label, NodeId, FuseHandle, diff --git a/OvmfPkg/VirtioFsDxe/FuseFsync.c b/OvmfPkg/VirtioFsDxe/FuseFsync.c index c537b064e6..11a4ab4e77 100644 --- a/OvmfPkg/VirtioFsDxe/FuseFsync.c +++ b/OvmfPkg/VirtioFsDxe/FuseFsync.c @@ -116,7 +116,7 @@ VirtioFsFuseFsyncFileOrDir ( DEBUG_ERROR, "%a: Label=\"%s\" NodeId=%Lu FuseHandle=%Lu " "IsDir=%d Errno=%d\n", - __FUNCTION__, + __func__, VirtioFs->Label, NodeId, FuseHandle, diff --git a/OvmfPkg/VirtioFsDxe/FuseGetAttr.c b/OvmfPkg/VirtioFsDxe/FuseGetAttr.c index 1dc0349a55..6f6e89c4fd 100644 --- a/OvmfPkg/VirtioFsDxe/FuseGetAttr.c +++ b/OvmfPkg/VirtioFsDxe/FuseGetAttr.c @@ -116,7 +116,7 @@ VirtioFsFuseGetAttr ( DEBUG (( DEBUG_ERROR, "%a: Label=\"%s\" NodeId=%Lu Errno=%d\n", - __FUNCTION__, + __func__, VirtioFs->Label, NodeId, CommonResp.Error diff --git a/OvmfPkg/VirtioFsDxe/FuseInit.c b/OvmfPkg/VirtioFsDxe/FuseInit.c index d34fc05a50..590ef441ef 100644 --- a/OvmfPkg/VirtioFsDxe/FuseInit.c +++ b/OvmfPkg/VirtioFsDxe/FuseInit.c @@ -125,7 +125,7 @@ VirtioFsFuseInitSession ( DEBUG (( DEBUG_ERROR, "%a: Label=\"%s\" Errno=%d\n", - __FUNCTION__, + __func__, VirtioFs->Label, CommonResp.Error )); diff --git a/OvmfPkg/VirtioFsDxe/FuseLookup.c b/OvmfPkg/VirtioFsDxe/FuseLookup.c index f2bda8a547..277a19fb1f 100644 --- a/OvmfPkg/VirtioFsDxe/FuseLookup.c +++ b/OvmfPkg/VirtioFsDxe/FuseLookup.c @@ -128,7 +128,7 @@ VirtioFsFuseLookup ( DEBUG_VERBOSE : DEBUG_ERROR), "%a: Label=\"%s\" DirNodeId=%Lu Name=\"%a\" Errno=%d\n", - __FUNCTION__, + __func__, VirtioFs->Label, DirNodeId, Name, diff --git a/OvmfPkg/VirtioFsDxe/FuseMkDir.c b/OvmfPkg/VirtioFsDxe/FuseMkDir.c index 409e09a418..847d0c0798 100644 --- a/OvmfPkg/VirtioFsDxe/FuseMkDir.c +++ b/OvmfPkg/VirtioFsDxe/FuseMkDir.c @@ -127,7 +127,7 @@ VirtioFsFuseMkDir ( DEBUG_ERROR, "%a: Label=\"%s\" ParentNodeId=%Lu Name=\"%a\" " "Errno=%d\n", - __FUNCTION__, + __func__, VirtioFs->Label, ParentNodeId, Name, diff --git a/OvmfPkg/VirtioFsDxe/FuseOpen.c b/OvmfPkg/VirtioFsDxe/FuseOpen.c index 64015bb6cc..99ea5f3b71 100644 --- a/OvmfPkg/VirtioFsDxe/FuseOpen.c +++ b/OvmfPkg/VirtioFsDxe/FuseOpen.c @@ -119,7 +119,7 @@ VirtioFsFuseOpen ( DEBUG_ERROR, "%a: Label=\"%s\" NodeId=%Lu ReadWrite=%d " "Errno=%d\n", - __FUNCTION__, + __func__, VirtioFs->Label, NodeId, ReadWrite, diff --git a/OvmfPkg/VirtioFsDxe/FuseOpenDir.c b/OvmfPkg/VirtioFsDxe/FuseOpenDir.c index e49c046b9d..11249ef0a8 100644 --- a/OvmfPkg/VirtioFsDxe/FuseOpenDir.c +++ b/OvmfPkg/VirtioFsDxe/FuseOpenDir.c @@ -113,7 +113,7 @@ VirtioFsFuseOpenDir ( DEBUG (( DEBUG_ERROR, "%a: Label=\"%s\" NodeId=%Lu Errno=%d\n", - __FUNCTION__, + __func__, VirtioFs->Label, NodeId, CommonResp.Error diff --git a/OvmfPkg/VirtioFsDxe/FuseOpenOrCreate.c b/OvmfPkg/VirtioFsDxe/FuseOpenOrCreate.c index 4d9846ab3b..db586dc76d 100644 --- a/OvmfPkg/VirtioFsDxe/FuseOpenOrCreate.c +++ b/OvmfPkg/VirtioFsDxe/FuseOpenOrCreate.c @@ -146,7 +146,7 @@ VirtioFsFuseOpenOrCreate ( DEBUG_ERROR, "%a: Label=\"%s\" ParentNodeId=%Lu Name=\"%a\" " "Errno=%d\n", - __FUNCTION__, + __func__, VirtioFs->Label, ParentNodeId, Name, diff --git a/OvmfPkg/VirtioFsDxe/FuseRead.c b/OvmfPkg/VirtioFsDxe/FuseRead.c index 013dac7e52..882d433045 100644 --- a/OvmfPkg/VirtioFsDxe/FuseRead.c +++ b/OvmfPkg/VirtioFsDxe/FuseRead.c @@ -178,7 +178,7 @@ VirtioFsFuseReadFileOrDir ( DEBUG_ERROR, "%a: Label=\"%s\" NodeId=%Lu FuseHandle=%Lu " "IsDir=%d Offset=0x%Lx Size=0x%x Data@%p Errno=%d\n", - __FUNCTION__, + __func__, VirtioFs->Label, NodeId, FuseHandle, diff --git a/OvmfPkg/VirtioFsDxe/FuseRelease.c b/OvmfPkg/VirtioFsDxe/FuseRelease.c index c8363158f5..75bb171a13 100644 --- a/OvmfPkg/VirtioFsDxe/FuseRelease.c +++ b/OvmfPkg/VirtioFsDxe/FuseRelease.c @@ -116,7 +116,7 @@ VirtioFsFuseReleaseFileOrDir ( DEBUG_ERROR, "%a: Label=\"%s\" NodeId=%Lu FuseHandle=%Lu " "IsDir=%d Errno=%d\n", - __FUNCTION__, + __func__, VirtioFs->Label, NodeId, FuseHandle, diff --git a/OvmfPkg/VirtioFsDxe/FuseRename.c b/OvmfPkg/VirtioFsDxe/FuseRename.c index a3a1050506..3ec5363037 100644 --- a/OvmfPkg/VirtioFsDxe/FuseRename.c +++ b/OvmfPkg/VirtioFsDxe/FuseRename.c @@ -130,7 +130,7 @@ VirtioFsFuseRename ( DEBUG_ERROR, "%a: Label=\"%s\" OldParentNodeId=%Lu OldName=\"%a\" " "NewParentNodeId=%Lu NewName=\"%a\" Errno=%d\n", - __FUNCTION__, + __func__, VirtioFs->Label, OldParentNodeId, OldName, diff --git a/OvmfPkg/VirtioFsDxe/FuseSetAttr.c b/OvmfPkg/VirtioFsDxe/FuseSetAttr.c index 9d0ea93fd9..719584fa32 100644 --- a/OvmfPkg/VirtioFsDxe/FuseSetAttr.c +++ b/OvmfPkg/VirtioFsDxe/FuseSetAttr.c @@ -164,7 +164,7 @@ VirtioFsFuseSetAttr ( DEBUG (( DEBUG_ERROR, "%a: Label=\"%s\" NodeId=%Lu", - __FUNCTION__, + __func__, VirtioFs->Label, NodeId )); diff --git a/OvmfPkg/VirtioFsDxe/FuseStatFs.c b/OvmfPkg/VirtioFsDxe/FuseStatFs.c index d93a62080e..55b4edc5b9 100644 --- a/OvmfPkg/VirtioFsDxe/FuseStatFs.c +++ b/OvmfPkg/VirtioFsDxe/FuseStatFs.c @@ -102,7 +102,7 @@ VirtioFsFuseStatFs ( DEBUG (( DEBUG_ERROR, "%a: Label=\"%s\" NodeId=%Lu Errno=%d\n", - __FUNCTION__, + __func__, VirtioFs->Label, NodeId, CommonResp.Error diff --git a/OvmfPkg/VirtioFsDxe/FuseUnlink.c b/OvmfPkg/VirtioFsDxe/FuseUnlink.c index 14cbdec5f5..d83a175dc6 100644 --- a/OvmfPkg/VirtioFsDxe/FuseUnlink.c +++ b/OvmfPkg/VirtioFsDxe/FuseUnlink.c @@ -109,7 +109,7 @@ VirtioFsFuseRemoveFileOrDir ( DEBUG_ERROR, "%a: Label=\"%s\" ParentNodeId=%Lu Name=\"%a\" " "IsDir=%d Errno=%d\n", - __FUNCTION__, + __func__, VirtioFs->Label, ParentNodeId, Name, diff --git a/OvmfPkg/VirtioFsDxe/FuseWrite.c b/OvmfPkg/VirtioFsDxe/FuseWrite.c index fe65c0bdbe..98dbd6decc 100644 --- a/OvmfPkg/VirtioFsDxe/FuseWrite.c +++ b/OvmfPkg/VirtioFsDxe/FuseWrite.c @@ -147,7 +147,7 @@ VirtioFsFuseWrite ( DEBUG_ERROR, "%a: Label=\"%s\" NodeId=%Lu FuseHandle=%Lu " "Offset=0x%Lx Size=0x%x Data@%p Errno=%d\n", - __FUNCTION__, + __func__, VirtioFs->Label, NodeId, FuseHandle, diff --git a/OvmfPkg/VirtioFsDxe/Helpers.c b/OvmfPkg/VirtioFsDxe/Helpers.c index f32fb1d48a..bc3c58cf41 100644 --- a/OvmfPkg/VirtioFsDxe/Helpers.c +++ b/OvmfPkg/VirtioFsDxe/Helpers.c @@ -320,7 +320,7 @@ VirtioFsExitBoot ( DEBUG (( DEBUG_VERBOSE, "%a: VirtioFs=0x%p Label=\"%s\"\n", - __FUNCTION__, + __func__, VirtioFsAsVoid, VirtioFs->Label )); diff --git a/OvmfPkg/VirtioFsDxe/SimpleFsOpen.c b/OvmfPkg/VirtioFsDxe/SimpleFsOpen.c index d479f76f5b..a13d4f6a1e 100644 --- a/OvmfPkg/VirtioFsDxe/SimpleFsOpen.c +++ b/OvmfPkg/VirtioFsDxe/SimpleFsOpen.c @@ -378,7 +378,7 @@ VirtioFsSimpleFileOpen ( ("%a: Label=\"%s\" CanonicalPathname=\"%a\" FileName=\"%s\" " "OpenMode=0x%Lx Attributes=0x%Lx: nonsensical request to possibly " "create a file marked read-only, for read-write access\n"), - __FUNCTION__, + __func__, VirtioFs->Label, VirtioFsFile->CanonicalPathname, FileName, @@ -403,7 +403,7 @@ VirtioFsSimpleFileOpen ( ("%a: Label=\"%s\" CanonicalPathname=\"%a\" FileName=\"%s\": " "nonsensical request to open a file or directory relative to a regular " "file\n"), - __FUNCTION__, + __func__, VirtioFs->Label, VirtioFsFile->CanonicalPathname, FileName -- cgit v1.2.3