MdePkg: 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
MdePkg.

Visual Studio versions before VS 2015 don't support __func__ and so
will fail to compile. A workaround is to define __func__ as
__FUNCTION__ :

 #define __func__ __FUNCTION__

Signed-off-by: Rebecca Cran <rebecca@quicinc.com>
Reviewed-by: Michael D Kinney <michael.d.kinney@intel.com>
Reviewed-by: Sunil V L <sunilvl@ventanamicro.com>

2 files changed, 15 insertions, 15 deletions

diff --git a/MdePkg/Include/Library/PerformanceLib.h b/MdePkg/Include/Library/PerformanceLib.h
index 34ec956b9c..d0f2dfb070 100644
--- a/MdePkg/Include/Library/PerformanceLib.h
+++ b/MdePkg/Include/Library/PerformanceLib.h
@@ -526,7 +526,7 @@ LogPerformanceMeasurement (
 #define PERF_EVENT_SIGNAL_BEGIN(EventGuid) \

   do { \

     if (LogPerformanceMeasurementEnabled (PERF_GENERAL_TYPE)) { \

-      LogPerformanceMeasurement (&gEfiCallerIdGuid, EventGuid, __FUNCTION__ , 0, PERF_EVENTSIGNAL_START_ID); \

+      LogPerformanceMeasurement (&gEfiCallerIdGuid, EventGuid, __func__ , 0, PERF_EVENTSIGNAL_START_ID); \

     } \

   } while (FALSE)

 

@@ -542,7 +542,7 @@ LogPerformanceMeasurement (
 #define PERF_EVENT_SIGNAL_END(EventGuid) \

   do { \

     if (LogPerformanceMeasurementEnabled (PERF_GENERAL_TYPE)) { \

-      LogPerformanceMeasurement (&gEfiCallerIdGuid, EventGuid, __FUNCTION__ , 0, PERF_EVENTSIGNAL_END_ID); \

+      LogPerformanceMeasurement (&gEfiCallerIdGuid, EventGuid, __func__ , 0, PERF_EVENTSIGNAL_END_ID); \

     } \

   } while (FALSE)

 

@@ -558,7 +558,7 @@ LogPerformanceMeasurement (
 #define PERF_CALLBACK_BEGIN(TriggerGuid) \

   do { \

     if (LogPerformanceMeasurementEnabled (PERF_GENERAL_TYPE)) { \

-      LogPerformanceMeasurement (&gEfiCallerIdGuid, TriggerGuid, __FUNCTION__ , 0, PERF_CALLBACK_START_ID); \

+      LogPerformanceMeasurement (&gEfiCallerIdGuid, TriggerGuid, __func__ , 0, PERF_CALLBACK_START_ID); \

     } \

   } while (FALSE)

 

@@ -574,7 +574,7 @@ LogPerformanceMeasurement (
 #define PERF_CALLBACK_END(TriggerGuid) \

   do { \

     if (LogPerformanceMeasurementEnabled (PERF_GENERAL_TYPE)) { \

-      LogPerformanceMeasurement (&gEfiCallerIdGuid, TriggerGuid, __FUNCTION__ , 0, PERF_CALLBACK_END_ID); \

+      LogPerformanceMeasurement (&gEfiCallerIdGuid, TriggerGuid, __func__ , 0, PERF_CALLBACK_END_ID); \

     } \

   } while (FALSE)

 

@@ -589,7 +589,7 @@ LogPerformanceMeasurement (
 #define PERF_FUNCTION_BEGIN() \

   do { \

     if (LogPerformanceMeasurementEnabled (PERF_GENERAL_TYPE)) { \

-      LogPerformanceMeasurement (&gEfiCallerIdGuid, NULL, __FUNCTION__ , 0, PERF_FUNCTION_START_ID); \

+      LogPerformanceMeasurement (&gEfiCallerIdGuid, NULL, __func__ , 0, PERF_FUNCTION_START_ID); \

     } \

   } while (FALSE)

 

@@ -604,7 +604,7 @@ LogPerformanceMeasurement (
 #define PERF_FUNCTION_END() \

   do { \

     if (LogPerformanceMeasurementEnabled (PERF_GENERAL_TYPE)) { \

-      LogPerformanceMeasurement (&gEfiCallerIdGuid, NULL, __FUNCTION__ , 0, PERF_FUNCTION_END_ID); \

+      LogPerformanceMeasurement (&gEfiCallerIdGuid, NULL, __func__ , 0, PERF_FUNCTION_END_ID); \

     } \

   } while (FALSE)

 

diff --git a/MdePkg/Include/Library/UnitTestLib.h b/MdePkg/Include/Library/UnitTestLib.h
index 71c205b1b1..321a310602 100644
--- a/MdePkg/Include/Library/UnitTestLib.h
+++ b/MdePkg/Include/Library/UnitTestLib.h
@@ -348,7 +348,7 @@ SaveFrameworkState (
   @param[in]  Expression  Expression to be evaluated for TRUE.

 **/

 #define UT_ASSERT_TRUE(Expression)                                                                 \

-  if(!UnitTestAssertTrue ((Expression), __FUNCTION__, DEBUG_LINE_NUMBER, __FILE__, #Expression)) { \

+  if(!UnitTestAssertTrue ((Expression), __func__, DEBUG_LINE_NUMBER, __FILE__, #Expression)) { \

     return UNIT_TEST_ERROR_TEST_FAILED;                                                            \

   }

 

@@ -360,7 +360,7 @@ SaveFrameworkState (
   @param[in]  Expression  Expression to be evaluated for FALSE.

 **/

 #define UT_ASSERT_FALSE(Expression)                                                                 \

-  if(!UnitTestAssertFalse ((Expression), __FUNCTION__, DEBUG_LINE_NUMBER, __FILE__, #Expression)) { \

+  if(!UnitTestAssertFalse ((Expression), __func__, DEBUG_LINE_NUMBER, __FILE__, #Expression)) { \

     return UNIT_TEST_ERROR_TEST_FAILED;                                                             \

   }

 

@@ -373,7 +373,7 @@ SaveFrameworkState (
   @param[in]  ValueB  Value to be compared for equality (64-bit comparison).

 **/

 #define UT_ASSERT_EQUAL(ValueA, ValueB)                                                                           \

-  if(!UnitTestAssertEqual ((UINT64)(ValueA), (UINT64)(ValueB), __FUNCTION__, DEBUG_LINE_NUMBER, __FILE__, #ValueA, #ValueB)) { \

+  if(!UnitTestAssertEqual ((UINT64)(ValueA), (UINT64)(ValueB), __func__, DEBUG_LINE_NUMBER, __FILE__, #ValueA, #ValueB)) { \

     return UNIT_TEST_ERROR_TEST_FAILED;                                                                           \

   }

 

@@ -387,7 +387,7 @@ SaveFrameworkState (
   @param[in]  Length   Number of bytes to compare in BufferA and BufferB.

 **/

 #define UT_ASSERT_MEM_EQUAL(BufferA, BufferB, Length)                                                                                                              \

-  if(!UnitTestAssertMemEqual ((VOID *)(UINTN)(BufferA), (VOID *)(UINTN)(BufferB), (UINTN)Length, __FUNCTION__, DEBUG_LINE_NUMBER, __FILE__, #BufferA, #BufferB)) { \

+  if(!UnitTestAssertMemEqual ((VOID *)(UINTN)(BufferA), (VOID *)(UINTN)(BufferB), (UINTN)Length, __func__, DEBUG_LINE_NUMBER, __FILE__, #BufferA, #BufferB)) { \

     return UNIT_TEST_ERROR_TEST_FAILED;                                                                                                                            \

   }

 

@@ -400,7 +400,7 @@ SaveFrameworkState (
   @param[in]  ValueB  Value to be compared for inequality (64-bit comparison).

 **/

 #define UT_ASSERT_NOT_EQUAL(ValueA, ValueB)                                                                                       \

-  if(!UnitTestAssertNotEqual ((UINT64)(ValueA), (UINT64)(ValueB), __FUNCTION__, DEBUG_LINE_NUMBER, __FILE__, #ValueA, #ValueB)) { \

+  if(!UnitTestAssertNotEqual ((UINT64)(ValueA), (UINT64)(ValueB), __func__, DEBUG_LINE_NUMBER, __FILE__, #ValueA, #ValueB)) { \

     return UNIT_TEST_ERROR_TEST_FAILED;                                                                                           \

   }

 

@@ -412,7 +412,7 @@ SaveFrameworkState (
   @param[in]  Status  EFI_STATUS value to check.

 **/

 #define UT_ASSERT_NOT_EFI_ERROR(Status)                                                           \

-  if(!UnitTestAssertNotEfiError ((Status), __FUNCTION__, DEBUG_LINE_NUMBER, __FILE__, #Status)) { \

+  if(!UnitTestAssertNotEfiError ((Status), __func__, DEBUG_LINE_NUMBER, __FILE__, #Status)) { \

     return UNIT_TEST_ERROR_TEST_FAILED;                                                           \

   }

 

@@ -425,7 +425,7 @@ SaveFrameworkState (
   @param[in]  Expected  EFI_STATUS values to compare for equality.

 **/

 #define UT_ASSERT_STATUS_EQUAL(Status, Expected)                                                              \

-  if(!UnitTestAssertStatusEqual ((Status), (Expected), __FUNCTION__, DEBUG_LINE_NUMBER, __FILE__, #Status)) { \

+  if(!UnitTestAssertStatusEqual ((Status), (Expected), __func__, DEBUG_LINE_NUMBER, __FILE__, #Status)) { \

     return UNIT_TEST_ERROR_TEST_FAILED;                                                                       \

   }

 

@@ -437,7 +437,7 @@ SaveFrameworkState (
   @param[in]  Pointer  Pointer to be checked against NULL.

 **/

 #define UT_ASSERT_NOT_NULL(Pointer)                                                             \

-  if(!UnitTestAssertNotNull ((Pointer), __FUNCTION__, DEBUG_LINE_NUMBER, __FILE__, #Pointer)) { \

+  if(!UnitTestAssertNotNull ((Pointer), __func__, DEBUG_LINE_NUMBER, __FILE__, #Pointer)) { \

     return UNIT_TEST_ERROR_TEST_FAILED;                                                         \

   }

 

@@ -482,7 +482,7 @@ extern BASE_LIBRARY_JUMP_BUFFER  *gUnitTestExpectAssertFailureJumpBuffer;
       }                                                                \

       if (!UnitTestExpectAssertFailure (                               \

              UnitTestJumpStatus,                                       \

-             __FUNCTION__, DEBUG_LINE_NUMBER, __FILE__,                \

+             __func__, DEBUG_LINE_NUMBER, __FILE__,                \

              #FunctionCall, Status)) {                                 \

         return UNIT_TEST_ERROR_TEST_FAILED;                            \

       }                                                                \