Sync EDKII BaseTools to BaseTools project r1903.

[mirror_edk2.git] / BaseTools / Source / C / Common / EfiUtilityMsgs.c

diff --git a/BaseTools/Source/C/Common/EfiUtilityMsgs.c b/BaseTools/Source/C/Common/EfiUtilityMsgs.c
index 68cf02469e18a4de9ab9d6f4c4bb037a4f7254f5..0e7608d1cfbd2d5218442b4b23521153e0d4c73b 100644 (file)
--- a/BaseTools/Source/C/Common/EfiUtilityMsgs.c
+++ b/BaseTools/Source/C/Common/EfiUtilityMsgs.c
@@ -44,18 +44,6 @@ STATIC UINT32 mMaxWarnings            = 0;
 STATIC UINT32 mMaxWarningsPlusErrors  = 0;\r
 STATIC INT8   mPrintLimitsSet         = 0;\r
 \r
-STATIC\r
-VOID\r
-PrintMessage (\r
-  CHAR8   *Type,\r
-  CHAR8   *FileName,\r
-  UINT32  LineNumber,\r
-  UINT32  MessageCode,\r
-  CHAR8   *Text,\r
-  CHAR8   *MsgFmt,\r
-  va_list List\r
-  );\r
-\r
 STATIC\r
 VOID\r
 PrintLimitExceeded (\r
@@ -151,12 +139,6 @@ Notes:
   va_start (List, MsgFmt);\r
   PrintMessage ("ERROR", FileName, LineNumber, MessageCode, Text, MsgFmt, List);\r
   va_end (List);\r
-  //\r
-  // Set status accordingly\r
-  //\r
-  if (mStatus < STATUS_ERROR) {\r
-    mStatus = STATUS_ERROR;\r
-  }\r
 }\r
 \r
 VOID\r
@@ -211,12 +193,6 @@ Returns:
   va_start (List, MsgFmt);\r
   PrintMessage ("ERROR", mSourceFileName, mSourceFileLineNum, MessageCode, Text, MsgFmt, List);\r
   va_end (List);\r
-  //\r
-  // Set status accordingly\r
-  //\r
-  if (mStatus < STATUS_ERROR) {\r
-    mStatus = STATUS_ERROR;\r
-  }\r
 }\r
 \r
 VOID\r
@@ -396,7 +372,6 @@ Returns:
   va_end (List);\r
 }\r
 \r
-STATIC\r
 VOID\r
 PrintMessage (\r
   CHAR8   *Type,\r
@@ -517,6 +492,15 @@ Notes:
         sprintf (Line, "%s", mUtilityName);\r
       }\r
     }\r
+\r
+    if (strcmp (Type, "ERROR") == 0) {\r
+      //\r
+      // Set status accordingly for ERROR information.\r
+      //\r
+      if (mStatus < STATUS_ERROR) {\r
+        mStatus = STATUS_ERROR;\r
+      }\r
+    }\r
   }\r
 \r
   //\r
@@ -545,6 +529,7 @@ Notes:
     vsprintf (Line2, MsgFmt, List);\r
     fprintf (stdout, "  %s\n", Line2);\r
   }\r
+\r
 }\r
 \r
 STATIC\r