From b7f76514ec387392b54659edb7b3e1ada60a751b Mon Sep 17 00:00:00 2001 From: AJFISH Date: Wed, 26 Aug 2009 21:09:37 +0000 Subject: Minor bugs fixes from testing on Xcode 3.2 and with the iPhone SDK 3.0 compiler. git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@9202 6f19259b-4bc3-4df7-8a09-765794883524 --- MdeModulePkg/Library/DxePrintLibPrint2Protocol/PrintLib.c | 1 - MdeModulePkg/Universal/Console/TerminalDxe/TerminalConOut.c | 2 +- UnixPkg/MiscSubClassPlatformDxe/MiscSubclassDriverEntryPoint.c | 4 ++-- UnixPkg/Sec/SecMain.c | 2 +- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/MdeModulePkg/Library/DxePrintLibPrint2Protocol/PrintLib.c b/MdeModulePkg/Library/DxePrintLibPrint2Protocol/PrintLib.c index 079b2a9bd0..8af1c86fe9 100644 --- a/MdeModulePkg/Library/DxePrintLibPrint2Protocol/PrintLib.c +++ b/MdeModulePkg/Library/DxePrintLibPrint2Protocol/PrintLib.c @@ -92,7 +92,6 @@ DxePrintLibPrint2ProtocolVaListToBaseList ( BOOLEAN Done; ASSERT (Format != NULL); - ASSERT (VaListMarker != NULL); ASSERT (BaseListMarker != NULL); BaseListStart = BaseListMarker; diff --git a/MdeModulePkg/Universal/Console/TerminalDxe/TerminalConOut.c b/MdeModulePkg/Universal/Console/TerminalDxe/TerminalConOut.c index 3c2f45bb6b..17b02a5c29 100644 --- a/MdeModulePkg/Universal/Console/TerminalDxe/TerminalConOut.c +++ b/MdeModulePkg/Universal/Console/TerminalDxe/TerminalConOut.c @@ -182,7 +182,7 @@ TerminalConOutOutputString ( UINTN Length; UTF8_CHAR Utf8Char; CHAR8 GraphicChar; - CHAR8 AsciiChar; + CHAR8 AsciiChar = 0; EFI_STATUS Status; UINT8 ValidBytes; // diff --git a/UnixPkg/MiscSubClassPlatformDxe/MiscSubclassDriverEntryPoint.c b/UnixPkg/MiscSubClassPlatformDxe/MiscSubclassDriverEntryPoint.c index 8732677c95..99a778ac45 100644 --- a/UnixPkg/MiscSubClassPlatformDxe/MiscSubclassDriverEntryPoint.c +++ b/UnixPkg/MiscSubClassPlatformDxe/MiscSubclassDriverEntryPoint.c @@ -317,8 +317,8 @@ Returns: } MemorySubClassData.Record.ArrayStartAddress.MemoryArrayStartAddress = 0; - MemorySubClassData.Record.ArrayStartAddress.MemoryArrayEndAddress = LShiftU64 (TotalMemorySize, 20) - 1; - MemorySubClassData.Record.ArrayStartAddress.PhysicalMemoryArrayLink.ProducerName = gEfiCallerIdGuid; + MemorySubClassData.Record.ArrayStartAddress.MemoryArrayEndAddress = LShiftU64 (TotalMemorySize, 20) - 1; + CopyGuid (&MemorySubClassData.Record.ArrayStartAddress.PhysicalMemoryArrayLink.ProducerName, &gEfiCallerIdGuid); MemorySubClassData.Record.ArrayStartAddress.PhysicalMemoryArrayLink.Instance = 1; MemorySubClassData.Record.ArrayStartAddress.PhysicalMemoryArrayLink.SubInstance = EFI_SUBCLASS_INSTANCE_NON_APPLICABLE; MemorySubClassData.Record.ArrayStartAddress.MemoryArrayPartitionWidth = 0; diff --git a/UnixPkg/Sec/SecMain.c b/UnixPkg/Sec/SecMain.c index b1490aef56..98a7a4db9d 100644 --- a/UnixPkg/Sec/SecMain.c +++ b/UnixPkg/Sec/SecMain.c @@ -494,7 +494,7 @@ Returns: // Process DEBUG () macro // AsciiBSPrint (PrintBuffer, BYTES_PER_RECORD, Format, Marker); - printf (PrintBuffer); + printf ("%s", PrintBuffer); } return EFI_SUCCESS; -- cgit v1.2.3