update code to pass K8.

[mirror_edk2.git] / MdeModulePkg / Universal / PCD / Dxe / Service.c

diff --git a/MdeModulePkg/Universal/PCD/Dxe/Service.c b/MdeModulePkg/Universal/PCD/Dxe/Service.c
index c08ac54b618d5db1eea8b08b1ea2116e90667c9f..64bbe4c799fe2e110297ddc921184854366d5efb 100644 (file)
--- a/MdeModulePkg/Universal/PCD/Dxe/Service.c
+++ b/MdeModulePkg/Universal/PCD/Dxe/Service.c
@@ -106,8 +106,13 @@ GetWorker (
   }\r
 \r
   PcdDb = IsPeiDb ? ((UINT8 *) &mPcdDatabase->PeiDb) : ((UINT8 *) &mPcdDatabase->DxeDb);\r
-  StringTable = (UINT16 *) (IsPeiDb ? mPcdDatabase->PeiDb.Init.StringTable :\r
-                                      mPcdDatabase->DxeDb.Init.StringTable);\r
+                                    \r
+  if (IsPeiDb) {\r
+    StringTable = (UINT16 *) (&mPcdDatabase->PeiDb.Init.StringTable[0]);\r
+  } else {\r
+    StringTable = (UINT16 *) (&mPcdDatabase->DxeDb.Init.StringTable[0]);\r
+  }\r
+                                      \r
   \r
   Offset     = LocalTokenNumber & PCD_DATABASE_OFFSET_MASK;\r
   \r
@@ -118,8 +123,11 @@ GetWorker (
       break;\r
       \r
     case PCD_TYPE_HII:\r
-      GuidTable   = (EFI_GUID *) (IsPeiDb ? mPcdDatabase->PeiDb.Init.GuidTable :\r
-                                            mPcdDatabase->DxeDb.Init.GuidTable);\r
+      if (IsPeiDb) {\r
+        GuidTable = (EFI_GUID *) (&mPcdDatabase->PeiDb.Init.GuidTable[0]);\r
+      } else {\r
+        GuidTable = (EFI_GUID *) (&mPcdDatabase->DxeDb.Init.GuidTable[0]);\r
+      }\r
                               \r
       VariableHead = (VARIABLE_HEAD *) (PcdDb + Offset);\r
       \r
@@ -761,8 +769,12 @@ SetWorker (
 \r
   PcdDb = IsPeiDb ? ((UINT8 *) &mPcdDatabase->PeiDb) : ((UINT8 *) &mPcdDatabase->DxeDb);\r
 \r
-  StringTable = (UINT16*) (IsPeiDb ? mPcdDatabase->PeiDb.Init.StringTable :\r
-                                     mPcdDatabase->DxeDb.Init.StringTable);\r
+  if (IsPeiDb) {\r
+    StringTable = (UINT16 *) (&mPcdDatabase->PeiDb.Init.StringTable[0]);\r
+  } else {\r
+    StringTable = (UINT16 *) (&mPcdDatabase->DxeDb.Init.StringTable[0]);\r
+  }\r
+\r
   \r
   InternalData = PcdDb + Offset;\r
 \r
@@ -789,8 +801,11 @@ SetWorker (
         }\r
       }\r
       \r
-      GuidTable   = (EFI_GUID *)(IsPeiDb ? mPcdDatabase->PeiDb.Init.GuidTable :\r
-                                           mPcdDatabase->DxeDb.Init.GuidTable);\r
+      if (IsPeiDb) {\r
+        GuidTable = (EFI_GUID *) (&mPcdDatabase->PeiDb.Init.GuidTable[0]);\r
+      } else {\r
+        GuidTable = (EFI_GUID *) (&mPcdDatabase->DxeDb.Init.GuidTable[0]);\r
+      }\r
                               \r
       VariableHead = (VARIABLE_HEAD *) (PcdDb + Offset);\r
       \r