Add Missing invocations to VA_END() for VA_START().

[mirror_edk2.git] / EdkCompatibilityPkg / Foundation / Library / Dxe / GraphicsLite / Print.c

diff --git a/EdkCompatibilityPkg/Foundation/Library/Dxe/GraphicsLite/Print.c b/EdkCompatibilityPkg/Foundation/Library/Dxe/GraphicsLite/Print.c
index 5b815e610e452bfaf6e38cca352e2ccf678b3666..1492e53d681b818e8d58ad3dd39ef72731b0ee50 100644 (file)
--- a/EdkCompatibilityPkg/Foundation/Library/Dxe/GraphicsLite/Print.c
+++ b/EdkCompatibilityPkg/Foundation/Library/Dxe/GraphicsLite/Print.c
@@ -1,6 +1,6 @@
 /*++\r
 \r
-Copyright (c) 2004 - 2010, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2004 - 2012, Intel Corporation. All rights reserved.<BR>\r
 This program and the accompanying materials                          \r
 are licensed and made available under the terms and conditions of the BSD License         \r
 which accompanies this distribution.  The full text of the license may be found at        \r
@@ -155,6 +155,7 @@ Returns:
   //\r
   // For now, allocate an arbitrarily long buffer\r
   //\r
+  BufferLen = 0;\r
   Buffer = EfiLibAllocateZeroPool (0x10000);\r
   if (Buffer == NULL) {\r
     return 0;\r
@@ -389,19 +390,19 @@ Returns:
   EFI_SIMPLE_TEXT_OUT_PROTOCOL  *Sto;\r
   EFI_STATUS                    Status;\r
   VA_LIST                       Args;\r
-\r
-  VA_START (Args, Fmt);\r
+  UINTN                         LengthOfPrinted;\r
 \r
   Handle = gST->ConsoleOutHandle;\r
 \r
+  GraphicsOutput = NULL;\r
+  UgaDraw = NULL;\r
   Status = gBS->HandleProtocol (\r
                   Handle,\r
                   &gEfiGraphicsOutputProtocolGuid,\r
                   (VOID **) &GraphicsOutput\r
                   );\r
 \r
-  UgaDraw = NULL;\r
-  if (EFI_ERROR (Status)) {\r
+  if (EFI_ERROR (Status) || (GraphicsOutput == NULL)) {\r
     GraphicsOutput = NULL;\r
 \r
     Status = gBS->HandleProtocol (\r
@@ -410,7 +411,7 @@ Returns:
                     (VOID **) &UgaDraw\r
                     );\r
 \r
-    if (EFI_ERROR (Status) || (UgaDraw != NULL)) {\r
+    if (EFI_ERROR (Status) || (UgaDraw == NULL)) {\r
       return 0;\r
     }\r
   }\r
@@ -422,11 +423,14 @@ Returns:
                   (VOID **) &Sto\r
                   );\r
 \r
-  if (EFI_ERROR (Status) || (Sto != NULL)) {\r
+  if (EFI_ERROR (Status) || (Sto == NULL)) {\r
     return 0;\r
   }\r
 \r
-  return _IPrint (GraphicsOutput, UgaDraw, Sto, X, Y, ForeGround, BackGround, Fmt, Args);\r
+  VA_START (Args, Fmt);\r
+  LengthOfPrinted = _IPrint (GraphicsOutput, UgaDraw, Sto, X, Y, ForeGround, BackGround, Fmt, Args);\r
+  VA_END (Args);\r
+  return LengthOfPrinted;\r
 }\r
 \r
 \r