From 4e1005eca7186cbe61aaae09108f6fdf29959f22 Mon Sep 17 00:00:00 2001
From: Eric Dong <eric.dong@intel.com>
Date: Mon, 28 Jul 2014 07:52:57 +0000
Subject: Update code to support VS2013 tool chain.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Eric Dong <eric.dong@intel.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>

git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@15695 6f19259b-4bc3-4df7-8a09-765794883524
---
 MdeModulePkg/Universal/HiiDatabaseDxe/ConfigRouting.c |  6 ++++++
 MdeModulePkg/Universal/HiiDatabaseDxe/Database.c      | 11 ++++++++---
 2 files changed, 14 insertions(+), 3 deletions(-)

(limited to 'MdeModulePkg/Universal/HiiDatabaseDxe')

diff --git a/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigRouting.c b/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigRouting.c
index f5e054d265..4caf361bd2 100644
--- a/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigRouting.c
+++ b/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigRouting.c
@@ -2329,6 +2329,8 @@ GetBlockElement (
   IFR_BLOCK_DATA       *NextBlockData;
   UINTN                Length;
 
+  TmpBuffer = NULL;
+
   //
   // Init RequestBlockArray
   //
@@ -4432,6 +4434,8 @@ HiiBlockToConfig (
   CHAR16                              *TemString;
   CHAR16                              TemChar;
 
+  TmpBuffer = NULL;
+
   if (This == NULL || Progress == NULL || Config == NULL) {
     return EFI_INVALID_PARAMETER;
   }
@@ -4728,6 +4732,8 @@ HiiConfigToBlock (
   UINTN                               BufferSize;
   UINTN                               MaxBlockSize;
 
+  TmpBuffer = NULL;
+
   if (This == NULL || BlockSize == NULL || Progress == NULL) {
     return EFI_INVALID_PARAMETER;
   }
diff --git a/MdeModulePkg/Universal/HiiDatabaseDxe/Database.c b/MdeModulePkg/Universal/HiiDatabaseDxe/Database.c
index 01d7f02234..70c0385d88 100644
--- a/MdeModulePkg/Universal/HiiDatabaseDxe/Database.c
+++ b/MdeModulePkg/Universal/HiiDatabaseDxe/Database.c
@@ -2417,9 +2417,14 @@ AddPackages (
   //
   // Initialize Variables
   //
-  StringPkgIsAdd = FALSE;
-  FontPackage = NULL;
-  StringPackage = NULL;
+  StringPkgIsAdd        = FALSE;
+  FontPackage           = NULL;
+  StringPackage         = NULL;
+  GuidPackage           = NULL;
+  FormPackage           = NULL;
+  ImagePackage          = NULL;
+  SimpleFontPackage     = NULL;
+  KeyboardLayoutPackage = NULL;
 
   //
   // Process the package list header
-- 
cgit v1.2.3