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

6
EdkCompatibilityPkg/Foundation/Library/Dxe/EfiDriverLib/Handle.c
View File

@@ -1,6 +1,6 @@
/*++
Copyright (c) 2004, Intel Corporation. All rights reserved.<BR>
Copyright (c) 2004 - 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
@@ -71,6 +71,7 @@ Returns:
AnInterface = NULL;
VA_START (args, Interface);
ProtocolFirst = VA_ARG (args, EFI_GUID *);
VA_END (args);
//
// Get list of all handles that support the first protocol.
@@ -146,6 +147,8 @@ Returns:
);
}
VA_END (args);
goto lbl_out;
}
@@ -163,6 +166,7 @@ Returns:
}
}
VA_END (args);
}
//

10
EdkCompatibilityPkg/Foundation/Library/Dxe/Graphics/Print.c
View File

@@ -1,6 +1,6 @@
/*++
Copyright (c) 2004 - 2010, Intel Corporation. All rights reserved.<BR>
Copyright (c) 2004 - 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
@@ -416,8 +416,7 @@ Returns:
EFI_SIMPLE_TEXT_OUT_PROTOCOL *Sto;
EFI_STATUS Status;
VA_LIST Args;
VA_START (Args, Fmt);
UINTN LengthOfPrinted;
Handle = gST->ConsoleOutHandle;
@@ -454,7 +453,10 @@ Returns:
return 0;
}
return _IPrint (GraphicsOutput, UgaDraw, Sto, X, Y, ForeGround, BackGround, Fmt, Args);
VA_START (Args, Fmt);
LengthOfPrinted = _IPrint (GraphicsOutput, UgaDraw, Sto, X, Y, ForeGround, BackGround, Fmt, Args);
VA_END (Args);
return LengthOfPrinted;
}

10
EdkCompatibilityPkg/Foundation/Library/Dxe/GraphicsLite/Print.c
View File

@@ -1,6 +1,6 @@
/*++
Copyright (c) 2004 - 2010, Intel Corporation. All rights reserved.<BR>
Copyright (c) 2004 - 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
@@ -390,8 +390,7 @@ Returns:
EFI_SIMPLE_TEXT_OUT_PROTOCOL *Sto;
EFI_STATUS Status;
VA_LIST Args;
VA_START (Args, Fmt);
UINTN LengthOfPrinted;
Handle = gST->ConsoleOutHandle;
@@ -428,7 +427,10 @@ Returns:
return 0;
}
return _IPrint (GraphicsOutput, UgaDraw, Sto, X, Y, ForeGround, BackGround, Fmt, Args);
VA_START (Args, Fmt);
LengthOfPrinted = _IPrint (GraphicsOutput, UgaDraw, Sto, X, Y, ForeGround, BackGround, Fmt, Args);
VA_END (Args);
return LengthOfPrinted;
}

6
EdkCompatibilityPkg/Foundation/Library/Dxe/UefiEfiIfrSupportLib/UefiIfrForm.c
View File

@@ -1,6 +1,6 @@
/*++
Copyright (c) 2007 - 2010, 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
@@ -508,6 +508,7 @@ Returns:
StackString = VA_ARG (Marker, CHAR16 *);
if (StackString == NULL) {
VA_END (Marker);
return EFI_INVALID_PARAMETER;
}
@@ -517,6 +518,7 @@ Returns:
LargestString = StringLen;
}
}
VA_END (Marker);
if ((LargestString + 2) > DimensionsWidth) {
LargestString = DimensionsWidth - 2;
@@ -682,6 +684,7 @@ ExtractDefault(
BufferPos += Width;
if ((UINTN)(Offset + Width) > *BufferSize) {
VA_END (Args);
return EFI_BUFFER_TOO_SMALL;
}
@@ -1025,6 +1028,7 @@ ConstructConfigAltResp (
BufToHexString (StringPtr + 8, &StrBufferLen, (UINT8 *) &AltCfgId, sizeof (UINT16));
Status = ExtractBlockConfig (DefaultValueArray, &AltCfg[Index]);
if (EFI_ERROR (Status)) {
VA_END (Args);
return Status;
}
AltRespLen += EfiStrLen (AltCfg[Index]);

3
EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/SwitchStack.c
View File

@@ -1,6 +1,6 @@
/*++
Copyright (c) 2004 - 2006, Intel Corporation. All rights reserved.<BR>
Copyright (c) 2004 - 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
@@ -65,6 +65,7 @@ SwitchStack (
InternalSwitchStack (EntryPoint, Context1, Context2, NewStack, Marker);
VA_END (Marker);
//
// InternalSwitchStack () will never return
//

27
EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BasePrintLib/PrintLib.c
View File

@@ -1,6 +1,6 @@
/*++
Copyright (c) 2004 - 2009, Intel Corporation. All rights reserved.<BR>
Copyright (c) 2004 - 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
@@ -601,9 +601,12 @@ BasePrintLibSPrint (
)
{
VA_LIST Marker;
UINTN NumberOfPrinted;
VA_START (Marker, FormatString);
return BasePrintLibVSPrint (StartOfBuffer, BufferSize, Flags, FormatString, Marker);
NumberOfPrinted = BasePrintLibVSPrint (StartOfBuffer, BufferSize, Flags, FormatString, Marker);
VA_END (Marker);
return NumberOfPrinted;
}
/**
@@ -696,9 +699,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;
}
/**
@@ -789,9 +795,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;
}
/**
@@ -933,9 +942,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;
}
/**
@@ -1026,9 +1038,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;
}

4
EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/EdkDxeSalLib/Ipf/EsalServiceLib.c
View File

@@ -1,6 +1,6 @@
/*++
Copyright (c) 2004 - 2006, Intel Corporation. All rights reserved.<BR>
Copyright (c) 2004 - 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
@@ -143,6 +143,8 @@ Returns:
Status = RegisterEsalFunction (FunctionId, ClassGuid, Function, ModuleGlobal);
}
VA_END (Args);
if (EFI_ERROR (Status)) {
return Status;
}

4
EdkCompatibilityPkg/Foundation/Library/Pei/PeiLib/Debug.c
View File

@@ -1,6 +1,6 @@
/*++
Copyright (c) 2004 - 2005, Intel Corporation. All rights reserved.<BR>
Copyright (c) 2004 - 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
@@ -113,6 +113,7 @@ Returns:
VA_START (Marker, Format);
EfiDebugVPrintWorker (ErrorLevel, Format, Marker, sizeof (Buffer), Buffer);
VA_END (Marker);
//
// We choose NOT to use PEI_REPORT_STATUS_CODE here, because when debug is enable,
@@ -127,5 +128,4 @@ Returns:
(EFI_STATUS_CODE_DATA *) Buffer
);
return ;
}

4
EdkCompatibilityPkg/Foundation/Library/RuntimeDxe/EfiRuntimeLib/Ipf/RuntimeLib.c
View File

@@ -1,6 +1,6 @@
/*++
Copyright (c) 2004 - 2010, Intel Corporation. All rights reserved.<BR>
Copyright (c) 2004 - 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
@@ -311,6 +311,8 @@ Returns:
Status = RegisterEsalFunction (FunctionId, ClassGuid, Function, ModuleGlobal);
}
VA_END (Args);
if (EFI_ERROR (Status)) {
return Status;
}