From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) by mx.groups.io with SMTP id smtpd.web11.906.1635802670411204424 for ; Mon, 01 Nov 2021 14:37:52 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: intel.com, ip: 134.134.136.31, mailfrom: michael.d.kinney@intel.com) X-IronPort-AV: E=McAfee;i="6200,9189,10155"; a="291964419" X-IronPort-AV: E=Sophos;i="5.87,200,1631602800"; d="scan'208";a="291964419" Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Nov 2021 14:37:50 -0700 X-IronPort-AV: E=Sophos;i="5.87,200,1631602800"; d="scan'208";a="449113036" Received: from mdkinney-mobl2.amr.corp.intel.com ([10.209.76.205]) by orsmga006-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Nov 2021 14:37:50 -0700 From: "Michael D Kinney" To: devel@edk2.groups.io Cc: Jiewen Yao , Jian J Wang , Michael Kubacki Subject: [Patch V2 6/7] SecurityPkg: Reproduce builds across source format changes Date: Mon, 1 Nov 2021 14:37:36 -0700 Message-Id: <20211101213737.586-7-michael.d.kinney@intel.com> X-Mailer: git-send-email 2.32.0.windows.1 In-Reply-To: <20211101213737.586-1-michael.d.kinney@intel.com> References: <20211101213737.586-1-michael.d.kinney@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3688 Use DEBUG_LINE_NUMBER instead of __LINE__. Cc: Jiewen Yao Cc: Jian J Wang Cc: Michael Kubacki Signed-off-by: Michael D Kinney --- .../Include/Library/TcgStorageCoreLib.h | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/SecurityPkg/Include/Library/TcgStorageCoreLib.h b/SecurityPkg/Include/Library/TcgStorageCoreLib.h index 01a44c667c80..a426251d6978 100644 --- a/SecurityPkg/Include/Library/TcgStorageCoreLib.h +++ b/SecurityPkg/Include/Library/TcgStorageCoreLib.h @@ -16,13 +16,13 @@ SPDX-License-Identifier: BSD-2-Clause-Patent #include -#define ERROR_CHECK(arg) \ - { \ - TCG_RESULT ret = (arg); \ - if (ret != TcgResultSuccess) { \ - DEBUG ((DEBUG_INFO, "ERROR_CHECK failed at %a:%u\n", __FILE__, __LINE__)); \ - return ret; \ - } \ +#define ERROR_CHECK(arg) \ + { \ + TCG_RESULT ret = (arg); \ + if (ret != TcgResultSuccess) { \ + DEBUG ((DEBUG_INFO, "ERROR_CHECK failed at %a:%u\n", __FILE__, DEBUG_LINE_NUMBER)); \ + return ret; \ + } \ } #define METHOD_STATUS_ERROR_CHECK(arg, failRet) \ @@ -31,12 +31,12 @@ SPDX-License-Identifier: BSD-2-Clause-Patent return (failRet); \ } -#define NULL_CHECK(arg) \ - do { \ - if ((arg) == NULL) { \ - DEBUG ((DEBUG_INFO, "NULL_CHECK(%a) failed at %a:%u\n", #arg, __FILE__, __LINE__)); \ - return TcgResultFailureNullPointer; \ - } \ +#define NULL_CHECK(arg) \ + do { \ + if ((arg) == NULL) { \ + DEBUG ((DEBUG_INFO, "NULL_CHECK(%a) failed at %a:%u\n", #arg, __FILE__, DEBUG_LINE_NUMBER)); \ + return TcgResultFailureNullPointer; \ + } \ } while (0) #pragma pack(1) -- 2.32.0.windows.1