From 68a4e15e149771f36ba58b3adcef9b2981a4eda6 Mon Sep 17 00:00:00 2001 From: Chen A Chen Date: Wed, 20 Feb 2019 16:42:50 +0800 Subject: [PATCH] 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 Cc: Liming Gao Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Chen A Chen Reviewed-by: Ray Ni --- MdeModulePkg/Application/CapsuleApp/CapsuleOnDisk.c | 2 +- MdeModulePkg/Include/Library/UefiBootManagerLib.h | 3 ++- MdeModulePkg/Library/UefiBootManagerLib/BmBoot.c | 3 ++- 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 ) -- 2.39.2