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

diff --git a/MdeModulePkg/Library/DxePrintLibPrint2Protocol/PrintLib.c b/MdeModulePkg/Library/DxePrintLibPrint2Protocol/PrintLib.c
index 079b2a9bd0785288263dfd59ed78327a62b2ec50..8af1c86fe9a4ba5a901f9f0484f87a04be2e207a 100644 (file)
--- a/MdeModulePkg/Library/DxePrintLibPrint2Protocol/PrintLib.c
+++ b/MdeModulePkg/Library/DxePrintLibPrint2Protocol/PrintLib.c
@@ -92,7 +92,6 @@ DxePrintLibPrint2ProtocolVaListToBaseList (
   BOOLEAN    Done;\r
 \r
   ASSERT (Format         != NULL);\r
-  ASSERT (VaListMarker   != NULL);\r
   ASSERT (BaseListMarker != NULL);\r
 \r
   BaseListStart = BaseListMarker;\r

diff --git a/MdeModulePkg/Universal/Console/TerminalDxe/TerminalConOut.c b/MdeModulePkg/Universal/Console/TerminalDxe/TerminalConOut.c
index 3c2f45bb6b21b01892a18bfdb6215071fa7babd0..17b02a5c2933bf2d7c4841876ed0cd0863ec58c0 100644 (file)
--- a/MdeModulePkg/Universal/Console/TerminalDxe/TerminalConOut.c
+++ b/MdeModulePkg/Universal/Console/TerminalDxe/TerminalConOut.c
@@ -182,7 +182,7 @@ TerminalConOutOutputString (
   UINTN                       Length;\r
   UTF8_CHAR                   Utf8Char;\r
   CHAR8                       GraphicChar;\r
-  CHAR8                       AsciiChar;\r
+  CHAR8                       AsciiChar = 0;\r
   EFI_STATUS                  Status;\r
   UINT8                       ValidBytes;\r
   //\r

diff --git a/UnixPkg/MiscSubClassPlatformDxe/MiscSubclassDriverEntryPoint.c b/UnixPkg/MiscSubClassPlatformDxe/MiscSubclassDriverEntryPoint.c
index 8732677c95259e1bcbbe1a20b997a0b44e275fde..99a778ac45857363994083d8e0708c8b9bdf5541 100644 (file)
--- a/UnixPkg/MiscSubClassPlatformDxe/MiscSubclassDriverEntryPoint.c
+++ b/UnixPkg/MiscSubClassPlatformDxe/MiscSubclassDriverEntryPoint.c
@@ -317,8 +317,8 @@ Returns:
   }\r
 \r
   MemorySubClassData.Record.ArrayStartAddress.MemoryArrayStartAddress               = 0;\r
-  MemorySubClassData.Record.ArrayStartAddress.MemoryArrayEndAddress                 = LShiftU64 (TotalMemorySize, 20) - 1;\r
-  MemorySubClassData.Record.ArrayStartAddress.PhysicalMemoryArrayLink.ProducerName  = gEfiCallerIdGuid;\r
+  MemorySubClassData.Record.ArrayStartAddress.MemoryArrayEndAddress                 = LShiftU64 (TotalMemorySize, 20) - 1;  \r
+  CopyGuid (&MemorySubClassData.Record.ArrayStartAddress.PhysicalMemoryArrayLink.ProducerName, &gEfiCallerIdGuid);\r
   MemorySubClassData.Record.ArrayStartAddress.PhysicalMemoryArrayLink.Instance      = 1;\r
   MemorySubClassData.Record.ArrayStartAddress.PhysicalMemoryArrayLink.SubInstance   = EFI_SUBCLASS_INSTANCE_NON_APPLICABLE;\r
   MemorySubClassData.Record.ArrayStartAddress.MemoryArrayPartitionWidth             = 0;\r

diff --git a/UnixPkg/Sec/SecMain.c b/UnixPkg/Sec/SecMain.c
index b1490aef56e6c92daf1901306e25a623f299ef58..98a7a4db9df9499578ba1c5215230afdc5b3fab6 100644 (file)
--- 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;