Fix GCC build failure.
authorRuiyu Ni <ruiyu.ni@intel.com>
Tue, 30 Jul 2013 06:41:43 +0000 (06:41 +0000)
committerniruiyu <niruiyu@6f19259b-4bc3-4df7-8a09-765794883524>
Tue, 30 Jul 2013 06:41:43 +0000 (06:41 +0000)
Signed-off-by: Ruiyu Ni <ruiyu.ni@intel.com>
git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@14519 6f19259b-4bc3-4df7-8a09-765794883524

ShellPkg/Application/Shell/ShellProtocol.c
ShellPkg/Library/UefiShellDebug1CommandsLib/Bcfg.c
ShellPkg/Library/UefiShellInstall1CommandsLib/Bcfg.c

index d39114f50e08f1bd56554146b2bea86ed0206f80..e1aadb845d4eb7c49a971d9ba1919efced0c84f7 100644 (file)
@@ -118,6 +118,7 @@ InternalShellProtocolDebugPrintMessage (
   EFI_STATUS                        Status;\r
   CHAR16                            *Temp;\r
 \r
   EFI_STATUS                        Status;\r
   CHAR16                            *Temp;\r
 \r
+  Status = EFI_SUCCESS;\r
   DEBUG_CODE_BEGIN();\r
 \r
   if (Mapping != NULL) {\r
   DEBUG_CODE_BEGIN();\r
 \r
   if (Mapping != NULL) {\r
index 87f2383fad7acffd3bfb8b6709915b0592f9e24e..73831d267e1cbf249ef9760e94351ee90c01d6b7 100644 (file)
@@ -525,6 +525,7 @@ BcfgAddDebug1(
 \r
       CopyMem (TempByteBuffer, Desc, DescSize);\r
       TempByteBuffer += DescSize;\r
 \r
       CopyMem (TempByteBuffer, Desc, DescSize);\r
       TempByteBuffer += DescSize;\r
+      ASSERT (FilePath != NULL);\r
       CopyMem (TempByteBuffer, FilePath, FilePathSize);\r
 \r
       UnicodeSPrint (OptionStr, sizeof(OptionStr), L"%s%04x", Target == BcfgTargetBootOrder?L"Boot":L"Driver", TargetLocation);\r
       CopyMem (TempByteBuffer, FilePath, FilePathSize);\r
 \r
       UnicodeSPrint (OptionStr, sizeof(OptionStr), L"%s%04x", Target == BcfgTargetBootOrder?L"Boot":L"Driver", TargetLocation);\r
index 390f1b6da9148a5899700d1933f52464e79e85fe..543ae376e9c8a2c6372107292f951d6a1c419015 100644 (file)
@@ -523,6 +523,7 @@ BcfgAddInstall1(
 \r
       CopyMem (TempByteBuffer, Desc, DescSize);\r
       TempByteBuffer += DescSize;\r
 \r
       CopyMem (TempByteBuffer, Desc, DescSize);\r
       TempByteBuffer += DescSize;\r
+      ASSERT (FilePath != NULL);\r
       CopyMem (TempByteBuffer, FilePath, FilePathSize);\r
 \r
       UnicodeSPrint (OptionStr, sizeof(OptionStr), L"%s%04x", Target == BcfgTargetBootOrder?L"Boot":L"Driver", TargetLocation);\r
       CopyMem (TempByteBuffer, FilePath, FilePathSize);\r
 \r
       UnicodeSPrint (OptionStr, sizeof(OptionStr), L"%s%04x", Target == BcfgTargetBootOrder?L"Boot":L"Driver", TargetLocation);\r