From 5541c0cae8ae0c7258f6b2cac35d6a10e661d8ed Mon Sep 17 00:00:00 2001 From: Robert Moore Date: Wed, 25 Mar 2009 14:23:48 -0700 Subject: [PATCH] Update error/warning interfaces. Moved the module name and line number to the end of the message. --- source/components/utilities/utmisc.c | 17 ++++++----------- source/include/acpixf.h | 5 ++++- 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/source/components/utilities/utmisc.c b/source/components/utilities/utmisc.c index a6be769ae..165b45ebf 100644 --- a/source/components/utilities/utmisc.c +++ b/source/components/utilities/utmisc.c @@ -1279,11 +1279,11 @@ AcpiError ( va_list args; - AcpiOsPrintf ("ACPI Error (%s-%04d): ", ModuleName, LineNumber); + AcpiOsPrintf ("ACPI Error: "); va_start (args, Format); AcpiOsVprintf (Format, args); - AcpiOsPrintf (" [%X]\n", ACPI_CA_VERSION); + AcpiOsPrintf (" %8.8X %s-%u\n", ACPI_CA_VERSION, ModuleName, LineNumber); va_end (args); } @@ -1298,12 +1298,11 @@ AcpiException ( va_list args; - AcpiOsPrintf ("ACPI Exception (%s-%04d): %s, ", ModuleName, LineNumber, - AcpiFormatException (Status)); + AcpiOsPrintf ("ACPI Exception: %s, ", AcpiFormatException (Status)); va_start (args, Format); AcpiOsVprintf (Format, args); - AcpiOsPrintf (" [%X]\n", ACPI_CA_VERSION); + AcpiOsPrintf (" %8.8X %s-%u\n", ACPI_CA_VERSION, ModuleName, LineNumber); va_end (args); } @@ -1317,11 +1316,11 @@ AcpiWarning ( va_list args; - AcpiOsPrintf ("ACPI Warning (%s-%04d): ", ModuleName, LineNumber); + AcpiOsPrintf ("ACPI Warning: "); va_start (args, Format); AcpiOsVprintf (Format, args); - AcpiOsPrintf (" [%X]\n", ACPI_CA_VERSION); + AcpiOsPrintf (" %8.8X %s-%u\n", ACPI_CA_VERSION, ModuleName, LineNumber); va_end (args); } @@ -1335,10 +1334,6 @@ AcpiInfo ( va_list args; - /* - * Removed ModuleName, LineNumber, and acpica version, not needed - * for info output - */ AcpiOsPrintf ("ACPI: "); va_start (args, Format); diff --git a/source/include/acpixf.h b/source/include/acpixf.h index d6192d437..e5c8912b8 100644 --- a/source/include/acpixf.h +++ b/source/include/acpixf.h @@ -617,7 +617,7 @@ AcpiSetFirmwareWakingVector64 ( /* - * Debug output + * Error/Warning output */ void ACPI_INTERNAL_VAR_XFACE AcpiError ( @@ -649,6 +649,9 @@ AcpiInfo ( ...) ACPI_PRINTF_LIKE(3); +/* + * Debug output + */ #ifdef ACPI_DEBUG_OUTPUT void ACPI_INTERNAL_VAR_XFACE