From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by mx.groups.io with SMTP id smtpd.web09.413.1635791946568759619 for ; Mon, 01 Nov 2021 11:39:06 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: intel.com, ip: 134.134.136.126, mailfrom: michael.d.kinney@intel.com) X-IronPort-AV: E=McAfee;i="6200,9189,10155"; a="217997881" X-IronPort-AV: E=Sophos;i="5.87,200,1631602800"; d="scan'208";a="217997881" Received: from orsmga007.jf.intel.com ([10.7.209.58]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Nov 2021 11:29:54 -0700 X-IronPort-AV: E=Sophos;i="5.87,200,1631602800"; d="scan'208";a="488751828" Received: from mdkinney-mobl2.amr.corp.intel.com ([10.209.76.205]) by orsmga007-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Nov 2021 11:29:53 -0700 From: "Michael D Kinney" To: devel@edk2.groups.io Cc: Jian J Wang , Liming Gao , Michael Kubacki Subject: [Patch 3/6] MdeModulePkg: Reproduce builds across source format changes Date: Mon, 1 Nov 2021 11:29:39 -0700 Message-Id: <20211101182942.321-4-michael.d.kinney@intel.com> X-Mailer: git-send-email 2.32.0.windows.1 In-Reply-To: <20211101182942.321-1-michael.d.kinney@intel.com> References: <20211101182942.321-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: Jian J Wang Cc: Liming Gao Cc: Michael Kubacki Signed-off-by: Michael D Kinney --- MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciHostBridge.c | 2 +- MdeModulePkg/Library/UefiBootManagerLib/BmDriverHealth.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciHostBridge.c b/MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciHostBridge.c index 4ab9415c9600..163e931dd9e8 100644 --- a/MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciHostBridge.c +++ b/MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciHostBridge.c @@ -874,7 +874,7 @@ NotifyPhase ( Translation = GetTranslationByResourceType (RootBridge, Index); if ((Translation & Alignment) != 0) { DEBUG ((DEBUG_ERROR, "[%a:%d] Translation %lx is not aligned to %lx!\n", - __FUNCTION__, __LINE__, Translation, Alignment + __FUNCTION__, DEBUG_LINE_NUMBER, Translation, Alignment )); ASSERT ((Translation & Alignment) == 0); // diff --git a/MdeModulePkg/Library/UefiBootManagerLib/BmDriverHealth.c b/MdeModulePkg/Library/UefiBootManagerLib/BmDriverHealth.c index 52e35e45185d..fa1fd87d15ef 100644 --- a/MdeModulePkg/Library/UefiBootManagerLib/BmDriverHealth.c +++ b/MdeModulePkg/Library/UefiBootManagerLib/BmDriverHealth.c @@ -574,7 +574,7 @@ BmRepairAllControllers ( BmRepairAllControllers (ReconnectRepairCount + 1); } else { DEBUG ((DEBUG_ERROR, "[%a:%d] Repair failed after %d retries.\n", - __FUNCTION__, __LINE__, ReconnectRepairCount)); + __FUNCTION__, DEBUG_LINE_NUMBER, ReconnectRepairCount)); } } -- 2.32.0.windows.1