Make MDE package pass intel IPF compiler with /W4 /WX switched on.

[mirror_edk2.git] / MdePkg / Library / PeiDxeDebugLibReportStatusCode / DebugLib.c

diff --git a/MdePkg/Library/PeiDxeDebugLibReportStatusCode/DebugLib.c b/MdePkg/Library/PeiDxeDebugLibReportStatusCode/DebugLib.c
index 53f206332419309a804b581818bdf913438466b2..c14c100f425bfe7d1e9be5a828937bbeec1ff1e3 100644 (file)
--- a/MdePkg/Library/PeiDxeDebugLibReportStatusCode/DebugLib.c
+++ b/MdePkg/Library/PeiDxeDebugLibReportStatusCode/DebugLib.c
@@ -122,11 +122,15 @@ DebugAssert (
   EFI_DEBUG_ASSERT_DATA  *AssertData;\r
   UINTN                  TotalSize;\r
   CHAR8                  *Temp;\r
+  UINTN                  FileNameLength;\r
+  UINTN                  DescriptionLength;\r
 \r
   //\r
   // Make sure it will all fit in the passed in buffer\r
   //\r
-  TotalSize = sizeof (EFI_DEBUG_ASSERT_DATA) + AsciiStrLen (FileName) + 1 + AsciiStrLen (Description) + 1;\r
+  FileNameLength    = AsciiStrLen (FileName);\r
+  DescriptionLength = AsciiStrLen (Description);\r
+  TotalSize = sizeof (EFI_DEBUG_ASSERT_DATA) + FileNameLength + 1 + DescriptionLength + 1;\r
   if (TotalSize <= EFI_STATUS_CODE_DATA_MAX_SIZE) {\r
     //\r
     // Fill in EFI_DEBUG_ASSERT_DATA\r
@@ -216,7 +220,7 @@ DebugAssertEnabled (
   VOID\r
   )\r
 {\r
-  return ((PcdGet8(PcdDebugPropertyMask) & DEBUG_PROPERTY_DEBUG_ASSERT_ENABLED) != 0);\r
+  return (BOOLEAN) ((PcdGet8(PcdDebugPropertyMask) & DEBUG_PROPERTY_DEBUG_ASSERT_ENABLED) != 0);\r
 }\r
 \r
 \r
@@ -237,7 +241,7 @@ DebugPrintEnabled (
   VOID\r
   )\r
 {\r
-  return ((PcdGet8(PcdDebugPropertyMask) & DEBUG_PROPERTY_DEBUG_PRINT_ENABLED) != 0);\r
+  return (BOOLEAN) ((PcdGet8(PcdDebugPropertyMask) & DEBUG_PROPERTY_DEBUG_PRINT_ENABLED) != 0);\r
 }\r
 \r
 \r
@@ -258,7 +262,7 @@ DebugCodeEnabled (
   VOID\r
   )\r
 {\r
-  return ((PcdGet8(PcdDebugPropertyMask) & DEBUG_PROPERTY_DEBUG_CODE_ENABLED) != 0);\r
+  return (BOOLEAN) ((PcdGet8(PcdDebugPropertyMask) & DEBUG_PROPERTY_DEBUG_CODE_ENABLED) != 0);\r
 }\r
 \r
 \r
@@ -279,5 +283,5 @@ DebugClearMemoryEnabled (
   VOID\r
   )\r
 {\r
-  return ((PcdGet8(PcdDebugPropertyMask) & DEBUG_PROPERTY_CLEAR_MEMORY_ENABLED) != 0);\r
+  return (BOOLEAN) ((PcdGet8(PcdDebugPropertyMask) & DEBUG_PROPERTY_CLEAR_MEMORY_ENABLED) != 0);\r
 }\r