summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChen A Chen <chen.a.chen@intel.com>2019-02-20 16:42:50 +0800
committerLiming Gao <liming.gao@intel.com>2019-02-25 09:14:21 +0800
commit68a4e15e149771f36ba58b3adcef9b2981a4eda6 (patch)
treef264651f0cb7bb91b36d61ec46ccd3b64f739741
parent5170327b7144e19c088df0c474adbbe7b5869b08 (diff)
downloadedk2-68a4e15e149771f36ba58b3adcef9b2981a4eda6.tar.gz
edk2-68a4e15e149771f36ba58b3adcef9b2981a4eda6.tar.bz2
edk2-68a4e15e149771f36ba58b3adcef9b2981a4eda6.zip
MdeModulePkg: Rename confusion function name
REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1536 To avoid the confusion caused by function name, rename EfiBootManagerGetNextFullDevicePath to EfiBootManagerGetNextLoadOptionDevicePath. As an API function should add EFIAPI prefix for this function. Cc: Ray Ni <ray.ni@intel.com> Cc: Liming Gao <liming.gao@intel.com> Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Chen A Chen <chen.a.chen@intel.com> Reviewed-by: Ray Ni <ray.ni@intel.com>
-rw-r--r--MdeModulePkg/Application/CapsuleApp/CapsuleOnDisk.c2
-rw-r--r--MdeModulePkg/Include/Library/UefiBootManagerLib.h3
-rw-r--r--MdeModulePkg/Library/UefiBootManagerLib/BmBoot.c3
3 files changed, 5 insertions, 3 deletions
diff --git a/MdeModulePkg/Application/CapsuleApp/CapsuleOnDisk.c b/MdeModulePkg/Application/CapsuleApp/CapsuleOnDisk.c
index f6e46cbdb1..4ff69af1b4 100644
--- a/MdeModulePkg/Application/CapsuleApp/CapsuleOnDisk.c
+++ b/MdeModulePkg/Application/CapsuleApp/CapsuleOnDisk.c
@@ -355,7 +355,7 @@ GetEfiSysPartitionFromBootOptionFilePath (
//
do {
PreFullPath = CurFullPath;
- CurFullPath = EfiBootManagerGetNextFullDevicePath (DevicePath, CurFullPath);
+ CurFullPath = EfiBootManagerGetNextLoadOptionDevicePath (DevicePath, CurFullPath);
if (PreFullPath != NULL) {
FreePool (PreFullPath);
diff --git a/MdeModulePkg/Include/Library/UefiBootManagerLib.h b/MdeModulePkg/Include/Library/UefiBootManagerLib.h
index 64347ff160..69678a62ca 100644
--- a/MdeModulePkg/Include/Library/UefiBootManagerLib.h
+++ b/MdeModulePkg/Include/Library/UefiBootManagerLib.h
@@ -460,7 +460,8 @@ EfiBootManagerGetBootManagerMenu (
Caller is responsible to free the memory.
**/
EFI_DEVICE_PATH_PROTOCOL *
-EfiBootManagerGetNextFullDevicePath (
+EFIAPI
+EfiBootManagerGetNextLoadOptionDevicePath (
IN EFI_DEVICE_PATH_PROTOCOL *FilePath,
IN EFI_DEVICE_PATH_PROTOCOL *FullPath
);
diff --git a/MdeModulePkg/Library/UefiBootManagerLib/BmBoot.c b/MdeModulePkg/Library/UefiBootManagerLib/BmBoot.c
index 9be1633b74..d5957db610 100644
--- a/MdeModulePkg/Library/UefiBootManagerLib/BmBoot.c
+++ b/MdeModulePkg/Library/UefiBootManagerLib/BmBoot.c
@@ -2482,7 +2482,8 @@ EfiBootManagerGetBootManagerMenu (
Caller is responsible to free the memory.
**/
EFI_DEVICE_PATH_PROTOCOL *
-EfiBootManagerGetNextFullDevicePath (
+EFIAPI
+EfiBootManagerGetNextLoadOptionDevicePath (
IN EFI_DEVICE_PATH_PROTOCOL *FilePath,
IN EFI_DEVICE_PATH_PROTOCOL *FullPath
)