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@8437 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
mdkinney 2009-06-01 22:42:42 +00:00
parent be71cc9f73
commit d94f1f35a1
2 changed files with 16 additions and 16 deletions

View File

@ -121,7 +121,7 @@ OemHookStatusCodeReport (
// //
CharCount = AsciiSPrint ( CharCount = AsciiSPrint (
Buffer, Buffer,
EFI_STATUS_CODE_DATA_MAX_SIZE, sizeof (Buffer),
"\n\rASSERT!: %a (%d): %a\n\r", "\n\rASSERT!: %a (%d): %a\n\r",
Filename, Filename,
LineNumber, LineNumber,
@ -146,7 +146,7 @@ OemHookStatusCodeReport (
// //
CharCount = AsciiBSPrint ( CharCount = AsciiBSPrint (
Buffer, Buffer,
EFI_STATUS_CODE_DATA_MAX_SIZE, sizeof (Buffer),
Format, Format,
Marker Marker
); );
@ -156,7 +156,7 @@ OemHookStatusCodeReport (
// //
CharCount = AsciiSPrint ( CharCount = AsciiSPrint (
Buffer, Buffer,
EFI_STATUS_CODE_DATA_MAX_SIZE, sizeof (Buffer),
"ERROR: C%x:V%x I%x", "ERROR: C%x:V%x I%x",
CodeType, CodeType,
Value, Value,
@ -170,7 +170,7 @@ OemHookStatusCodeReport (
if (CallerId != NULL) { if (CallerId != NULL) {
CharCount += AsciiSPrint ( CharCount += AsciiSPrint (
&Buffer[CharCount - 1], &Buffer[CharCount - 1],
(EFI_STATUS_CODE_DATA_MAX_SIZE - (sizeof (Buffer[0]) * CharCount)), (sizeof (Buffer) - (sizeof (Buffer[0]) * CharCount)),
" %g", " %g",
CallerId CallerId
); );
@ -179,7 +179,7 @@ OemHookStatusCodeReport (
if (Data != NULL) { if (Data != NULL) {
CharCount += AsciiSPrint ( CharCount += AsciiSPrint (
&Buffer[CharCount - 1], &Buffer[CharCount - 1],
(EFI_STATUS_CODE_DATA_MAX_SIZE - (sizeof (Buffer[0]) * CharCount)), (sizeof (Buffer) - (sizeof (Buffer[0]) * CharCount)),
" %x", " %x",
Data Data
); );
@ -187,13 +187,13 @@ OemHookStatusCodeReport (
CharCount += AsciiSPrint ( CharCount += AsciiSPrint (
&Buffer[CharCount - 1], &Buffer[CharCount - 1],
(EFI_STATUS_CODE_DATA_MAX_SIZE - (sizeof (Buffer[0]) * CharCount)), (sizeof (Buffer) - (sizeof (Buffer[0]) * CharCount)),
"\n\r" "\n\r"
); );
} else if ((CodeType & EFI_STATUS_CODE_TYPE_MASK) == EFI_PROGRESS_CODE) { } else if ((CodeType & EFI_STATUS_CODE_TYPE_MASK) == EFI_PROGRESS_CODE) {
CharCount = AsciiSPrint ( CharCount = AsciiSPrint (
Buffer, Buffer,
EFI_STATUS_CODE_DATA_MAX_SIZE, sizeof (Buffer),
"PROGRESS CODE: V%x I%x\n\r", "PROGRESS CODE: V%x I%x\n\r",
Value, Value,
Instance Instance
@ -201,7 +201,7 @@ OemHookStatusCodeReport (
} else { } else {
CharCount = AsciiSPrint ( CharCount = AsciiSPrint (
Buffer, Buffer,
EFI_STATUS_CODE_DATA_MAX_SIZE, sizeof (Buffer),
"Undefined: C%x:V%x I%x\n\r", "Undefined: C%x:V%x I%x\n\r",
CodeType, CodeType,
Value, Value,

View File

@ -129,7 +129,7 @@ OemHookStatusCodeReport (
// //
CharCount = AsciiSPrint ( CharCount = AsciiSPrint (
Buffer, Buffer,
EFI_STATUS_CODE_DATA_MAX_SIZE, sizeof (Buffer),
"\n\rASSERT!: %a (%d): %a\n\r", "\n\rASSERT!: %a (%d): %a\n\r",
Filename, Filename,
LineNumber, LineNumber,
@ -154,7 +154,7 @@ OemHookStatusCodeReport (
// //
CharCount = AsciiBSPrint ( CharCount = AsciiBSPrint (
Buffer, Buffer,
EFI_STATUS_CODE_DATA_MAX_SIZE, sizeof (Buffer),
Format, Format,
Marker Marker
); );
@ -164,7 +164,7 @@ OemHookStatusCodeReport (
// //
CharCount = AsciiSPrint ( CharCount = AsciiSPrint (
Buffer, Buffer,
EFI_STATUS_CODE_DATA_MAX_SIZE, sizeof (Buffer),
"ERROR: C%x:V%x I%x", "ERROR: C%x:V%x I%x",
CodeType, CodeType,
Value, Value,
@ -178,7 +178,7 @@ OemHookStatusCodeReport (
if (CallerId != NULL) { if (CallerId != NULL) {
CharCount += AsciiSPrint ( CharCount += AsciiSPrint (
&Buffer[CharCount - 1], &Buffer[CharCount - 1],
(EFI_STATUS_CODE_DATA_MAX_SIZE - (sizeof (Buffer[0]) * CharCount)), (sizeof (Buffer) - (sizeof (Buffer[0]) * CharCount)),
" %g", " %g",
CallerId CallerId
); );
@ -187,7 +187,7 @@ OemHookStatusCodeReport (
if (Data != NULL) { if (Data != NULL) {
CharCount += AsciiSPrint ( CharCount += AsciiSPrint (
&Buffer[CharCount - 1], &Buffer[CharCount - 1],
(EFI_STATUS_CODE_DATA_MAX_SIZE - (sizeof (Buffer[0]) * CharCount)), (sizeof (Buffer) - (sizeof (Buffer[0]) * CharCount)),
" %x", " %x",
Data Data
); );
@ -195,13 +195,13 @@ OemHookStatusCodeReport (
CharCount += AsciiSPrint ( CharCount += AsciiSPrint (
&Buffer[CharCount - 1], &Buffer[CharCount - 1],
(EFI_STATUS_CODE_DATA_MAX_SIZE - (sizeof (Buffer[0]) * CharCount)), (sizeof (Buffer) - (sizeof (Buffer[0]) * CharCount)),
"\n\r" "\n\r"
); );
} else if ((CodeType & EFI_STATUS_CODE_TYPE_MASK) == EFI_PROGRESS_CODE) { } else if ((CodeType & EFI_STATUS_CODE_TYPE_MASK) == EFI_PROGRESS_CODE) {
CharCount = AsciiSPrint ( CharCount = AsciiSPrint (
Buffer, Buffer,
EFI_STATUS_CODE_DATA_MAX_SIZE, sizeof (Buffer),
"PROGRESS CODE: V%x I%x\n\r", "PROGRESS CODE: V%x I%x\n\r",
Value, Value,
Instance Instance
@ -209,7 +209,7 @@ OemHookStatusCodeReport (
} else { } else {
CharCount = AsciiSPrint ( CharCount = AsciiSPrint (
Buffer, Buffer,
EFI_STATUS_CODE_DATA_MAX_SIZE, sizeof (Buffer),
"Undefined: C%x:V%x I%x\n\r", "Undefined: C%x:V%x I%x\n\r",
CodeType, CodeType,
Value, Value,