diff options
| author | Gary Ching-Pang Lin <glin@suse.com> | 2014-05-26 16:49:10 +0800 |
|---|---|---|
| committer | Peter Jones <pjones@redhat.com> | 2014-06-25 09:56:27 -0400 |
| commit | 78aaad3003d53a14a009176ad5816937e18fa33f (patch) | |
| tree | c88f4f66cac87a60781fd0f7d36b33c91d9e2ad5 | |
| parent | 5f18e2e3643524c6b6b38c44c6ce4eabdcfd59d1 (diff) | |
| download | efi-boot-shim-78aaad3003d53a14a009176ad5816937e18fa33f.tar.gz efi-boot-shim-78aaad3003d53a14a009176ad5816937e18fa33f.zip | |
Remove grubpath in generate_path()
The variable is not used anymore.
Signed-off-by: Gary Ching-Pang Lin <glin@suse.com>
| -rw-r--r-- | shim.c | 9 |
1 files changed, 2 insertions, 7 deletions
@@ -1134,17 +1134,15 @@ should_use_fallback(EFI_HANDLE image_handle) * of the executable */ static EFI_STATUS generate_path(EFI_LOADED_IMAGE *li, CHAR16 *ImagePath, - EFI_DEVICE_PATH **grubpath, CHAR16 **PathName) + CHAR16 **PathName) { EFI_DEVICE_PATH *devpath; - EFI_HANDLE device; unsigned int i; int j, last = -1; unsigned int pathlen = 0; EFI_STATUS efi_status = EFI_SUCCESS; CHAR16 *bootpath; - device = li->DeviceHandle; devpath = li->FilePath; bootpath = DevicePathToStr(devpath); @@ -1197,8 +1195,6 @@ static EFI_STATUS generate_path(EFI_LOADED_IMAGE *li, CHAR16 *ImagePath, StrCat(*PathName, bootpath); StrCat(*PathName, ImagePath); - *grubpath = FileDevicePath(device, *PathName); - error: FreePool(bootpath); @@ -1361,7 +1357,6 @@ EFI_STATUS start_image(EFI_HANDLE image_handle, CHAR16 *ImagePath) EFI_GUID loaded_image_protocol = LOADED_IMAGE_PROTOCOL; EFI_STATUS efi_status; EFI_LOADED_IMAGE *li, li_bak; - EFI_DEVICE_PATH *path; CHAR16 *PathName = NULL; void *sourcebuffer = NULL; UINT64 sourcesize = 0; @@ -1383,7 +1378,7 @@ EFI_STATUS start_image(EFI_HANDLE image_handle, CHAR16 *ImagePath) /* * Build a new path from the existing one plus the executable name */ - efi_status = generate_path(li, ImagePath, &path, &PathName); + efi_status = generate_path(li, ImagePath, &PathName); if (efi_status != EFI_SUCCESS) { Print(L"Unable to generate path %s: %r\n", ImagePath, efi_status); |