sravan/system76-edk2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
Signed-off-by: rsun3
Reviewed-by: lgao4

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@12979 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
rsun3
2012-02-01 06:06:08 +00:00
parent 571e9831be
commit 3bbe68a362
28 changed files with 156 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
MdePkg/Library/BasePrintLib/PrintLib.c
View File

@@ -1,7 +1,7 @@
/** @file
Base Print Library instance implementation.
Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.<BR>
Copyright (c) 2006 - 2012, Intel Corporation. All rights reserved.<BR>
Portions copyright (c) 2008 - 2009, Apple Inc. All rights reserved.<BR>
This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License
@@ -165,9 +165,12 @@ UnicodeSPrint (
)
{
VA_LIST Marker;
UINTN NumberOfPrinted;
VA_START (Marker, FormatString);
return UnicodeVSPrint (StartOfBuffer, BufferSize, FormatString, Marker);
NumberOfPrinted = UnicodeVSPrint (StartOfBuffer, BufferSize, FormatString, Marker);
VA_END (Marker);
return NumberOfPrinted;
}
/**
@@ -306,9 +309,12 @@ UnicodeSPrintAsciiFormat (
)
{
VA_LIST Marker;
UINTN NumberOfPrinted;
VA_START (Marker, FormatString);
return UnicodeVSPrintAsciiFormat (StartOfBuffer, BufferSize, FormatString, Marker);
NumberOfPrinted = UnicodeVSPrintAsciiFormat (StartOfBuffer, BufferSize, FormatString, Marker);
VA_END (Marker);
return NumberOfPrinted;
}
/**
@@ -496,9 +502,12 @@ AsciiSPrint (
)
{
VA_LIST Marker;
UINTN NumberOfPrinted;
VA_START (Marker, FormatString);
return AsciiVSPrint (StartOfBuffer, BufferSize, FormatString, Marker);
NumberOfPrinted = AsciiVSPrint (StartOfBuffer, BufferSize, FormatString, Marker);
VA_END (Marker);
return NumberOfPrinted;
}
/**
@@ -637,9 +646,12 @@ AsciiSPrintUnicodeFormat (
)
{
VA_LIST Marker;
UINTN NumberOfPrinted;
VA_START (Marker, FormatString);
return AsciiVSPrintUnicodeFormat (StartOfBuffer, BufferSize, FormatString, Marker);
NumberOfPrinted = AsciiVSPrintUnicodeFormat (StartOfBuffer, BufferSize, FormatString, Marker);
VA_END (Marker);
return NumberOfPrinted;
}

7
MdePkg/Library/BasePrintLib/PrintLibInternal.c
View File

@@ -1,7 +1,7 @@
/** @file
Print Library internal worker functions.
Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.<BR>
Copyright (c) 2006 - 2012, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License
which accompanies this distribution. The full text of the license may be found at
@@ -982,7 +982,10 @@ BasePrintLibSPrint (
)
{
VA_LIST Marker;
UINTN NumberOfPrinted;
VA_START (Marker, FormatString);
return BasePrintLibSPrintMarker (StartOfBuffer, BufferSize, Flags, FormatString, Marker, NULL);
NumberOfPrinted = BasePrintLibSPrintMarker (StartOfBuffer, BufferSize, Flags, FormatString, Marker, NULL);
VA_END (Marker);
return NumberOfPrinted;
}

4
MdePkg/Library/DxeExtendedSalLib/ExtendedSalLib.c
View File

@@ -1,7 +1,7 @@
/** @file
The library implements the Extended SAL Library Class for boot service only modules.
Copyright (c) 2007 - 2011, Intel Corporation. All rights reserved.<BR>
Copyright (c) 2007 - 2012, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License
which accompanies this distribution. The full text of the license may be found at
@@ -196,6 +196,8 @@ RegisterEsalClass (
Status = RegisterEsalFunction (FunctionId, ClassGuidLo, ClassGuidHi, Function, ModuleGlobal);
}
VA_END (Args);
if (EFI_ERROR (Status)) {
return Status;
}

4
MdePkg/Library/DxeRuntimeExtendedSalLib/ExtendedSalLib.c
View File

@@ -1,7 +1,7 @@
/** @file
This library implements the Extended SAL Library Class for use in boot services and runtime.
Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.<BR>
Copyright (c) 2006 - 2012, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License
which accompanies this distribution. The full text of the license may be found at
@@ -319,6 +319,8 @@ RegisterEsalClass (
Status = RegisterEsalFunction (FunctionId, ClassGuidLo, ClassGuidHi, Function, ModuleGlobal);
}
VA_END (Args);
if (EFI_ERROR (Status)) {
return Status;
}

12
MdePkg/Library/UefiLib/UefiLibPrint.c
View File

@@ -2,7 +2,7 @@
Mde UEFI library API implementation.
Print to StdErr or ConOut defined in EFI_SYSTEM_TABLE
Copyright (c) 2007 - 2011, Intel Corporation. All rights reserved.<BR>
Copyright (c) 2007 - 2012, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License
which accompanies this distribution. The full text of the license may be found at
@@ -623,6 +623,8 @@ PrintXY (
PrintNum = UnicodeVSPrint (Buffer, BufferSize, Format, Marker);
VA_END (Marker);
ReturnNum = InternalPrintGraphic (PointX, PointY, ForeGround, BackGround, Buffer, PrintNum);
FreePool (Buffer);
@@ -699,6 +701,8 @@ AsciiPrintXY (
PrintNum = UnicodeSPrintAsciiFormat (Buffer, BufferSize, Format, Marker);
VA_END (Marker);
ReturnNum = InternalPrintGraphic (PointX, PointY, ForeGround, BackGround, Buffer, PrintNum);
FreePool (Buffer);
@@ -796,7 +800,11 @@ CatSPrint (
)
{
VA_LIST Marker;
CHAR16 *NewString;
VA_START (Marker, FormatString);
return (CatVSPrint(String, FormatString, Marker));
NewString = CatVSPrint(String, FormatString, Marker);
VA_END (Marker);
return NewString;
}