From be71cc9f73ecad2aed800796c33cd8fbca7aad06 Mon Sep 17 00:00:00 2001 From: mdkinney Date: Mon, 1 Jun 2009 22:42:21 +0000 Subject: [PATCH] Increase source portability by replace the use of EFI_STATUS_CODE_DATA_MAX_SIZE with sizeof(Buffer) git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@8436 6f19259b-4bc3-4df7-8a09-765794883524 --- .../Nt32OemHookStatusCodeLib.c | 16 ++++++++-------- .../Nt32OemHookStatusCodeLib.c | 16 ++++++++-------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/Nt32Pkg/Library/DxeNt32OemHookStatusCodeLib/Nt32OemHookStatusCodeLib.c b/Nt32Pkg/Library/DxeNt32OemHookStatusCodeLib/Nt32OemHookStatusCodeLib.c index f3d9efcaad..97d42237b7 100644 --- a/Nt32Pkg/Library/DxeNt32OemHookStatusCodeLib/Nt32OemHookStatusCodeLib.c +++ b/Nt32Pkg/Library/DxeNt32OemHookStatusCodeLib/Nt32OemHookStatusCodeLib.c @@ -133,7 +133,7 @@ OemHookStatusCodeReport ( // CharCount = AsciiSPrint ( Buffer, - EFI_STATUS_CODE_DATA_MAX_SIZE, + sizeof (Buffer), "\n\rASSERT!: %a (%d): %a\n\r", Filename, LineNumber, @@ -160,7 +160,7 @@ OemHookStatusCodeReport ( // CharCount = AsciiBSPrint ( Buffer, - EFI_STATUS_CODE_DATA_MAX_SIZE, + sizeof (Buffer), Format, Marker ); @@ -170,7 +170,7 @@ OemHookStatusCodeReport ( // CharCount = AsciiSPrint ( Buffer, - EFI_STATUS_CODE_DATA_MAX_SIZE, + sizeof (Buffer), "ERROR: C%x:V%x I%x", CodeType, Value, @@ -184,7 +184,7 @@ OemHookStatusCodeReport ( if (CallerId != NULL) { CharCount += AsciiSPrint ( &Buffer[CharCount - 1], - (EFI_STATUS_CODE_DATA_MAX_SIZE - (sizeof (Buffer[0]) * CharCount)), + (sizeof (Buffer) - (sizeof (Buffer[0]) * CharCount)), " %g", CallerId ); @@ -193,7 +193,7 @@ OemHookStatusCodeReport ( if (Data != NULL) { CharCount += AsciiSPrint ( &Buffer[CharCount - 1], - (EFI_STATUS_CODE_DATA_MAX_SIZE - (sizeof (Buffer[0]) * CharCount)), + (sizeof (Buffer) - (sizeof (Buffer[0]) * CharCount)), " %p", Data ); @@ -201,13 +201,13 @@ OemHookStatusCodeReport ( CharCount += AsciiSPrint ( &Buffer[CharCount - 1], - (EFI_STATUS_CODE_DATA_MAX_SIZE - (sizeof (Buffer[0]) * CharCount)), + (sizeof (Buffer) - (sizeof (Buffer[0]) * CharCount)), "\n\r" ); } else if ((CodeType & EFI_STATUS_CODE_TYPE_MASK) == EFI_PROGRESS_CODE) { CharCount = AsciiSPrint ( Buffer, - EFI_STATUS_CODE_DATA_MAX_SIZE, + sizeof (Buffer), "PROGRESS CODE: V%x I%x\n\r", Value, Instance @@ -215,7 +215,7 @@ OemHookStatusCodeReport ( } else { CharCount = AsciiSPrint ( Buffer, - EFI_STATUS_CODE_DATA_MAX_SIZE, + sizeof (Buffer), "Undefined: C%x:V%x I%x\n\r", CodeType, Value, diff --git a/Nt32Pkg/Library/PeiNt32OemHookStatusCodeLib/Nt32OemHookStatusCodeLib.c b/Nt32Pkg/Library/PeiNt32OemHookStatusCodeLib/Nt32OemHookStatusCodeLib.c index ff73c1c84a..56d402c84c 100644 --- a/Nt32Pkg/Library/PeiNt32OemHookStatusCodeLib/Nt32OemHookStatusCodeLib.c +++ b/Nt32Pkg/Library/PeiNt32OemHookStatusCodeLib/Nt32OemHookStatusCodeLib.c @@ -142,7 +142,7 @@ OemHookStatusCodeReport ( // CharCount = AsciiSPrint ( Buffer, - EFI_STATUS_CODE_DATA_MAX_SIZE, + sizeof (Buffer), "\n\rASSERT!: %a (%d): %a\n\r", Filename, LineNumber, @@ -169,7 +169,7 @@ OemHookStatusCodeReport ( // CharCount = AsciiBSPrint ( Buffer, - EFI_STATUS_CODE_DATA_MAX_SIZE, + sizeof (Buffer), Format, Marker ); @@ -179,7 +179,7 @@ OemHookStatusCodeReport ( // CharCount = AsciiSPrint ( Buffer, - EFI_STATUS_CODE_DATA_MAX_SIZE, + sizeof (Buffer), "ERROR: C%x:V%x I%x", CodeType, Value, @@ -193,7 +193,7 @@ OemHookStatusCodeReport ( if (CallerId != NULL) { CharCount += AsciiSPrint ( &Buffer[CharCount - 1], - (EFI_STATUS_CODE_DATA_MAX_SIZE - (sizeof (Buffer[0]) * CharCount)), + (sizeof (Buffer) - (sizeof (Buffer[0]) * CharCount)), " %g", CallerId ); @@ -202,7 +202,7 @@ OemHookStatusCodeReport ( if (Data != NULL) { CharCount += AsciiSPrint ( &Buffer[CharCount - 1], - (EFI_STATUS_CODE_DATA_MAX_SIZE - (sizeof (Buffer[0]) * CharCount)), + (sizeof (Buffer) - (sizeof (Buffer[0]) * CharCount)), " %p", Data ); @@ -210,13 +210,13 @@ OemHookStatusCodeReport ( CharCount += AsciiSPrint ( &Buffer[CharCount - 1], - (EFI_STATUS_CODE_DATA_MAX_SIZE - (sizeof (Buffer[0]) * CharCount)), + (sizeof (Buffer) - (sizeof (Buffer[0]) * CharCount)), "\n\r" ); } else if ((CodeType & EFI_STATUS_CODE_TYPE_MASK) == EFI_PROGRESS_CODE) { CharCount = AsciiSPrint ( Buffer, - EFI_STATUS_CODE_DATA_MAX_SIZE, + sizeof (Buffer), "PROGRESS CODE: V%x I%x\n\r", Value, Instance @@ -224,7 +224,7 @@ OemHookStatusCodeReport ( } else { CharCount = AsciiSPrint ( Buffer, - EFI_STATUS_CODE_DATA_MAX_SIZE, + sizeof (Buffer), "Undefined: C%x:V%x I%x\n\r", CodeType, Value, -- 2.39.2