MdePkg/UefiDevicePathLib: Rename StrToGuid to avoid link failure

Since the next patch will add StrToGuid in BaseLib, renaming the
internal function StrToGuid to DevicePathLibStrToGuid to avoid
link failure.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Ruiyu Ni <ruiyu.ni@intel.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>

diff --git a/MdePkg/Library/UefiDevicePathLib/DevicePathFromText.c b/MdePkg/Library/UefiDevicePathLib/DevicePathFromText.c
index 8a3a470f3fbfd16185354f4ce8fbc5756ed5edcf..e2b06a2d32d797515b89d053039bc85cb9583a3f 100644 (file)
--- a/MdePkg/Library/UefiDevicePathLib/DevicePathFromText.c
+++ b/MdePkg/Library/UefiDevicePathLib/DevicePathFromText.c
@@ -1,7 +1,7 @@
 /** @file\r
   DevicePathFromText protocol as defined in the UEFI 2.0 specification.\r
 \r
-Copyright (c) 2013 - 2016, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2013 - 2017, 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
@@ -397,7 +397,7 @@ StrToBuf (
 \r
 **/\r
 EFI_STATUS\r
-StrToGuid (\r
+DevicePathLibStrToGuid (\r
   IN  CHAR16   *Str,\r
   OUT EFI_GUID *Guid\r
   )\r
@@ -740,7 +740,7 @@ ConvertFromTextVendor (
                                      (UINT16) (sizeof (VENDOR_DEVICE_PATH) + Length)\r
                                      );\r
 \r
-  StrToGuid (GuidStr, &Vendor->Guid);\r
+  DevicePathLibStrToGuid (GuidStr, &Vendor->Guid);\r
   StrToBuf (((UINT8 *) Vendor) + sizeof (VENDOR_DEVICE_PATH), Length, DataStr);\r
 \r
   return (EFI_DEVICE_PATH_PROTOCOL *) Vendor;\r
@@ -1453,7 +1453,7 @@ DevPathFromTextInfiniband (
                                             );\r
 \r
   InfiniBand->ResourceFlags = (UINT32) Strtoi (FlagsStr);\r
-  StrToGuid (GuidStr, &PortGid);\r
+  DevicePathLibStrToGuid (GuidStr, &PortGid);\r
   CopyMem (InfiniBand->PortGid, &PortGid, sizeof (EFI_GUID));\r
   Strtoi64 (SidStr, &InfiniBand->ServiceId);\r
   Strtoi64 (TidStr, &InfiniBand->TargetPortId);\r
@@ -2976,7 +2976,7 @@ DevPathFromTextHD (
     Hd->SignatureType = SIGNATURE_TYPE_GUID;\r
     Hd->MBRType       = 0x02;\r
 \r
-    StrToGuid (SignatureStr, &SignatureGuid);\r
+    DevicePathLibStrToGuid (SignatureStr, &SignatureGuid);\r
     CopyMem (Hd->Signature, &SignatureGuid, sizeof (EFI_GUID));\r
   } else {\r
     Hd->SignatureType = (UINT8) Strtoi (TypeStr);\r
@@ -3091,7 +3091,7 @@ DevPathFromTextMedia (
                                              (UINT16) sizeof (MEDIA_PROTOCOL_DEVICE_PATH)\r
                                              );\r
 \r
-  StrToGuid (GuidStr, &Media->Protocol);\r
+  DevicePathLibStrToGuid (GuidStr, &Media->Protocol);\r
 \r
   return (EFI_DEVICE_PATH_PROTOCOL *) Media;\r
 }\r
@@ -3119,7 +3119,7 @@ DevPathFromTextFv (
                                            (UINT16) sizeof (MEDIA_FW_VOL_DEVICE_PATH)\r
                                            );\r
 \r
-  StrToGuid (GuidStr, &Fv->FvName);\r
+  DevicePathLibStrToGuid (GuidStr, &Fv->FvName);\r
 \r
   return (EFI_DEVICE_PATH_PROTOCOL *) Fv;\r
 }\r
@@ -3147,7 +3147,7 @@ DevPathFromTextFvFile (
                                                     (UINT16) sizeof (MEDIA_FW_VOL_FILEPATH_DEVICE_PATH)\r
                                                     );\r
 \r
-  StrToGuid (GuidStr, &FvFile->FvFileName);\r
+  DevicePathLibStrToGuid (GuidStr, &FvFile->FvFileName);\r
 \r
   return (EFI_DEVICE_PATH_PROTOCOL *) FvFile;\r
 }\r
@@ -3219,7 +3219,7 @@ DevPathFromTextRamDisk (
   Strtoi64 (EndingAddrStr, &EndingAddr);\r
   WriteUnaligned64 ((UINT64 *) &(RamDisk->EndingAddr[0]), EndingAddr);\r
   RamDisk->Instance = (UINT16) Strtoi (InstanceStr);\r
-  StrToGuid (TypeGuidStr, &RamDisk->TypeGuid);\r
+  DevicePathLibStrToGuid (TypeGuidStr, &RamDisk->TypeGuid);\r
 \r
   return (EFI_DEVICE_PATH_PROTOCOL *) RamDisk;\r
 }\r