Increase source portability by replace the use of EFI_STATUS_CODE_DATA_MAX_SIZE with...

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@8437 6f19259b-4bc3-4df7-8a09-765794883524

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

diff --git a/UnixPkg/Library/PeiUnixOemHookStatusCodeLib/UnixOemHookStatusCodeLib.c b/UnixPkg/Library/PeiUnixOemHookStatusCodeLib/UnixOemHookStatusCodeLib.c
index e3a918ddfdf2d3c704417dd428bd4f87c002690b..ae5883c2646848232467c371e48dad0851fbeb22 100644 (file)
--- a/UnixPkg/Library/PeiUnixOemHookStatusCodeLib/UnixOemHookStatusCodeLib.c
+++ b/UnixPkg/Library/PeiUnixOemHookStatusCodeLib/UnixOemHookStatusCodeLib.c
@@ -129,7 +129,7 @@ OemHookStatusCodeReport (
     //
     CharCount = AsciiSPrint (
                   Buffer,
-                  EFI_STATUS_CODE_DATA_MAX_SIZE,
+                  sizeof (Buffer),
                   "\n\rASSERT!: %a (%d): %a\n\r",
                   Filename,
                   LineNumber,
@@ -154,7 +154,7 @@ OemHookStatusCodeReport (
     //
     CharCount = AsciiBSPrint (
                   Buffer, 
-                  EFI_STATUS_CODE_DATA_MAX_SIZE, 
+                  sizeof (Buffer), 
                   Format, 
                   Marker
                   );
@@ -164,7 +164,7 @@ OemHookStatusCodeReport (
     //
     CharCount = AsciiSPrint (
                   Buffer, 
-                  EFI_STATUS_CODE_DATA_MAX_SIZE, 
+                  sizeof (Buffer), 
                   "ERROR: C%x:V%x I%x", 
                   CodeType, 
                   Value, 
@@ -178,7 +178,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
                      );
@@ -187,7 +187,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)),
                      " %x",
                      Data
                      );
@@ -195,13 +195,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
@@ -209,7 +209,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,