[edk2-devel] [Patch 2/6] ArmPkg: Reproduce builds across source format changes

[Leif Lindholm]

On Mon, Nov 01, 2021 at 11:29:38 -0700, Michael D Kinney wrote:
> REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3688
> 
> Use DEBUG_LINE_NUMBER instead of __LINE__.
> 
> Cc: Leif Lindholm <leif at nuviainc.com>
> Cc: Ard Biesheuvel <ardb+tianocore at kernel.org>
> Cc: Michael Kubacki <michael.kubacki at microsoft.com>
> Signed-off-by: Michael D Kinney <michael.d.kinney at intel.com>

Reviewed-by: Leif Lindholm <leif at nuviainc.com>

> ---
>  .../Universal/Smbios/ProcessorSubClassDxe/ProcessorSubClass.c   | 2 +-
>  .../Smbios/SmbiosMiscDxe/Type00/MiscBiosVendorFunction.c        | 2 +-
>  .../SmbiosMiscDxe/Type01/MiscSystemManufacturerFunction.c       | 2 +-
>  .../SmbiosMiscDxe/Type02/MiscBaseBoardManufacturerFunction.c    | 2 +-
>  .../SmbiosMiscDxe/Type03/MiscChassisManufacturerFunction.c      | 2 +-
>  .../Type13/MiscNumberOfInstallableLanguagesFunction.c           | 2 +-
>  .../Smbios/SmbiosMiscDxe/Type32/MiscBootInformationFunction.c   | 2 +-
>  7 files changed, 7 insertions(+), 7 deletions(-)
> 
> diff --git a/ArmPkg/Universal/Smbios/ProcessorSubClassDxe/ProcessorSubClass.c b/ArmPkg/Universal/Smbios/ProcessorSubClassDxe/ProcessorSubClass.c
> index 4b409ff7458c..cbdf6df01ee0 100644
> --- a/ArmPkg/Universal/Smbios/ProcessorSubClassDxe/ProcessorSubClass.c
> +++ b/ArmPkg/Universal/Smbios/ProcessorSubClassDxe/ProcessorSubClass.c
> @@ -689,7 +689,7 @@ AddSmbiosProcessorTypeTable (
>  
>    if (EFI_ERROR (Status)) {
>      DEBUG ((DEBUG_ERROR, "[%a]:[%dL] Smbios Type04 Table Log Failed! %r \n",
> -            __FUNCTION__, __LINE__, Status));
> +            __FUNCTION__, DEBUG_LINE_NUMBER, Status));
>    }
>    FreePool (Type4Record);
>  
> diff --git a/ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type00/MiscBiosVendorFunction.c b/ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type00/MiscBiosVendorFunction.c
> index 5679ebaac8a5..2506c03d64b1 100644
> --- a/ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type00/MiscBiosVendorFunction.c
> +++ b/ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type00/MiscBiosVendorFunction.c
> @@ -271,7 +271,7 @@ SMBIOS_MISC_TABLE_FUNCTION (MiscBiosVendor)
>    Status = SmbiosMiscAddRecord ((UINT8*)SmbiosRecord, NULL);
>    if (EFI_ERROR (Status)) {
>      DEBUG ((DEBUG_ERROR, "[%a]:[%dL] Smbios Type00 Table Log Failed! %r \n",
> -           __FUNCTION__, __LINE__, Status));
> +           __FUNCTION__, DEBUG_LINE_NUMBER, Status));
>    }
>  
>    FreePool (SmbiosRecord);
> diff --git a/ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type01/MiscSystemManufacturerFunction.c b/ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type01/MiscSystemManufacturerFunction.c
> index 2c69c2593f5d..555557a2a946 100644
> --- a/ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type01/MiscSystemManufacturerFunction.c
> +++ b/ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type01/MiscSystemManufacturerFunction.c
> @@ -162,7 +162,7 @@ SMBIOS_MISC_TABLE_FUNCTION(MiscSystemManufacturer)
>    Status = SmbiosMiscAddRecord ((UINT8*)SmbiosRecord, NULL);
>    if (EFI_ERROR (Status)) {
>      DEBUG ((DEBUG_ERROR, "[%a]:[%dL] Smbios Type01 Table Log Failed! %r \n",
> -            __FUNCTION__, __LINE__, Status));
> +            __FUNCTION__, DEBUG_LINE_NUMBER, Status));
>    }
>  
>    FreePool (SmbiosRecord);
> diff --git a/ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type02/MiscBaseBoardManufacturerFunction.c b/ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type02/MiscBaseBoardManufacturerFunction.c
> index 097777a23904..f11295b199b3 100644
> --- a/ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type02/MiscBaseBoardManufacturerFunction.c
> +++ b/ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type02/MiscBaseBoardManufacturerFunction.c
> @@ -196,7 +196,7 @@ SMBIOS_MISC_TABLE_FUNCTION(MiscBaseBoardManufacturer)
>    Status = SmbiosMiscAddRecord ((UINT8 *)SmbiosRecord, NULL);
>    if (EFI_ERROR (Status)) {
>      DEBUG ((DEBUG_ERROR, "[%a]:[%dL] Smbios Type02 Table Log Failed! %r \n",
> -            __FUNCTION__, __LINE__, Status));
> +            __FUNCTION__, DEBUG_LINE_NUMBER, Status));
>    }
>  
>    FreePool (SmbiosRecord);
> diff --git a/ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type03/MiscChassisManufacturerFunction.c b/ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type03/MiscChassisManufacturerFunction.c
> index 66e3e5327fc3..d64046182b96 100644
> --- a/ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type03/MiscChassisManufacturerFunction.c
> +++ b/ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type03/MiscChassisManufacturerFunction.c
> @@ -178,7 +178,7 @@ SMBIOS_MISC_TABLE_FUNCTION(MiscChassisManufacturer)
>    Status = SmbiosMiscAddRecord ((UINT8*)SmbiosRecord, NULL);
>    if (EFI_ERROR (Status)) {
>      DEBUG ((DEBUG_ERROR, "[%a]:[%dL] Smbios Type03 Table Log Failed! %r \n",
> -            __FUNCTION__, __LINE__, Status));
> +            __FUNCTION__, DEBUG_LINE_NUMBER, Status));
>    }
>  
>    FreePool (SmbiosRecord);
> diff --git a/ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type13/MiscNumberOfInstallableLanguagesFunction.c b/ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type13/MiscNumberOfInstallableLanguagesFunction.c
> index 7c941b5c0709..017b410a16d0 100644
> --- a/ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type13/MiscNumberOfInstallableLanguagesFunction.c
> +++ b/ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type13/MiscNumberOfInstallableLanguagesFunction.c
> @@ -158,7 +158,7 @@ SMBIOS_MISC_TABLE_FUNCTION(MiscNumberOfInstallableLanguages)
>    Status = SmbiosMiscAddRecord ((UINT8*)SmbiosRecord, NULL);
>    if (EFI_ERROR (Status)) {
>      DEBUG ((DEBUG_ERROR, "[%a]:[%dL] Smbios Type13 Table Log Failed! %r \n",
> -            __FUNCTION__, __LINE__, Status));
> +            __FUNCTION__, DEBUG_LINE_NUMBER, Status));
>    }
>  
>    FreePool (SmbiosRecord);
> diff --git a/ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type32/MiscBootInformationFunction.c b/ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type32/MiscBootInformationFunction.c
> index 4be1e1cd29a9..c4ce6a5e7608 100644
> --- a/ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type32/MiscBootInformationFunction.c
> +++ b/ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type32/MiscBootInformationFunction.c
> @@ -68,7 +68,7 @@ SMBIOS_MISC_TABLE_FUNCTION(MiscBootInformation)
>    Status = SmbiosMiscAddRecord ((UINT8*)SmbiosRecord, NULL);
>    if (EFI_ERROR (Status)) {
>      DEBUG ((DEBUG_ERROR, "[%a]:[%dL] Smbios Type32 Table Log Failed! %r \n",
> -            __FUNCTION__, __LINE__, Status));
> +            __FUNCTION__, DEBUG_LINE_NUMBER, Status));
>    }
>  
>    FreePool (SmbiosRecord);
> -- 
> 2.32.0.windows.1
> 
> 
> 
> 
> 
> 


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#83025): https://edk2.groups.io/g/devel/message/83025
Mute This Topic: https://groups.io/mt/86748726/1813853
Group Owner: devel+owner at edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [edk2-devel-archive at redhat.com]
-=-=-=-=-=-=-=-=-=-=-=-