Update the copyright notice format

[mirror_edk2.git] / IntelFrameworkModulePkg / Universal / BdsDxe / String.c

diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/String.c b/IntelFrameworkModulePkg/Universal/BdsDxe/String.c
index a509a85df11131603eff7f1d947d678186e23a8a..9924352234f65782647af80a00ec56492c9bb2ea 100644 (file)
--- a/IntelFrameworkModulePkg/Universal/BdsDxe/String.c
+++ b/IntelFrameworkModulePkg/Universal/BdsDxe/String.c
@@ -1,8 +1,8 @@
 /** @file\r
   String support\r
 \r
-Copyright (c) 2004 - 2008, Intel Corporation. <BR>\r
-All rights reserved. This program and the accompanying materials\r
+Copyright (c) 2004 - 2009, Intel Corporation. All rights reserved.<BR>\r
+This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 http://opensource.org/licenses/bsd-license.php\r
@@ -23,36 +23,21 @@ EFI_GUID mBdsStringPackGuid = {
 };\r
 \r
 /**\r
-  Initialize HII global accessor for string support\r
-\r
-  @retval  EFI_SUCCESS  String support initialize success.\r
+  Initialize HII global accessor for string support.\r
 \r
 **/\r
-EFI_STATUS\r
+VOID\r
 InitializeStringSupport (\r
   VOID\r
   )\r
 {\r
-  EFI_STATUS                   Status;\r
-  EFI_HII_PACKAGE_LIST_HEADER  *PackageList;\r
-\r
-  Status = gBS->LocateProtocol (&gEfiHiiDatabaseProtocolGuid, NULL, (VOID **) &gHiiDatabase);\r
-  if (EFI_ERROR (Status)) {\r
-    return Status;\r
-  }\r
-\r
-  PackageList = HiiLibPreparePackageList (1, &mBdsStringPackGuid, &BdsDxeStrings);\r
-  ASSERT (PackageList != NULL);\r
-\r
-  Status = gHiiDatabase->NewPackageList (\r
-                           gHiiDatabase,\r
-                           PackageList,\r
-                           mBdsImageHandle,\r
-                           &gStringPackHandle\r
-                           );\r
-\r
-  FreePool (PackageList);\r
-  return Status;\r
+  gStringPackHandle = HiiAddPackages (\r
+                         &mBdsStringPackGuid,\r
+                         mBdsImageHandle,\r
+                         BdsDxeStrings,\r
+                         NULL\r
+                         );\r
+  ASSERT (gStringPackHandle != NULL);\r
 }\r
 \r
 /**\r
@@ -70,10 +55,5 @@ GetStringById (
   IN  EFI_STRING_ID   Id\r
   )\r
 {\r
-  CHAR16 *String;\r
-\r
-  String = NULL;\r
-  HiiLibGetStringFromHandle (gStringPackHandle, Id, &String);\r
-\r
-  return String;\r
+  return HiiGetString (gStringPackHandle, Id, NULL);\r
 }\r