SecurityPkg: Reproduce builds across source format changes

REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3688

Use DEBUG_LINE_NUMBER instead of __LINE__.

Cc: Jiewen Yao <jiewen.yao@intel.com>
Cc: Jian J Wang <jian.j.wang@intel.com>
Cc: Michael Kubacki <michael.kubacki@microsoft.com>
Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
Reviewed-by: Jiewen Yao <Jiewen.yao@intel.com>
Tested-by: Michael Kubacki <michael.kubacki@microsoft.com>

diff --git a/SecurityPkg/Include/Library/TcgStorageCoreLib.h b/SecurityPkg/Include/Library/TcgStorageCoreLib.h
index 01a44c667c801377f9ce23aff5eb78369a3ea1ef..a426251d69782d99b2a0a7a680fca9e11a8c5940 100644 (file)
--- a/SecurityPkg/Include/Library/TcgStorageCoreLib.h
+++ b/SecurityPkg/Include/Library/TcgStorageCoreLib.h
@@ -16,13 +16,13 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 \r
 #include <IndustryStandard/TcgStorageCore.h>\r
 \r
-#define ERROR_CHECK(arg)                                                         \\r
-  {                                                                              \\r
-    TCG_RESULT ret = (arg);                                                      \\r
-    if (ret != TcgResultSuccess) {                                               \\r
-      DEBUG ((DEBUG_INFO, "ERROR_CHECK failed at %a:%u\n", __FILE__, __LINE__)); \\r
-      return ret;                                                                \\r
-    }                                                                            \\r
+#define ERROR_CHECK(arg)                                                                  \\r
+  {                                                                                       \\r
+    TCG_RESULT ret = (arg);                                                               \\r
+    if (ret != TcgResultSuccess) {                                                        \\r
+      DEBUG ((DEBUG_INFO, "ERROR_CHECK failed at %a:%u\n", __FILE__, DEBUG_LINE_NUMBER)); \\r
+      return ret;                                                                         \\r
+    }                                                                                     \\r
   }\r
 \r
 #define METHOD_STATUS_ERROR_CHECK(arg, failRet)                                                  \\r
@@ -31,12 +31,12 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
     return (failRet);                                                                            \\r
   }\r
 \r
-#define NULL_CHECK(arg)                                                                   \\r
-  do {                                                                                    \\r
-    if ((arg) == NULL) {                                                                  \\r
-      DEBUG ((DEBUG_INFO, "NULL_CHECK(%a) failed at %a:%u\n", #arg, __FILE__, __LINE__)); \\r
-      return TcgResultFailureNullPointer;                                                 \\r
-    }                                                                                     \\r
+#define NULL_CHECK(arg)                                                                            \\r
+  do {                                                                                             \\r
+    if ((arg) == NULL) {                                                                           \\r
+      DEBUG ((DEBUG_INFO, "NULL_CHECK(%a) failed at %a:%u\n", #arg, __FILE__, DEBUG_LINE_NUMBER)); \\r
+      return TcgResultFailureNullPointer;                                                          \\r
+    }                                                                                              \\r
   } while (0)\r
 \r
 #pragma pack(1)\r