From 78aaad3003d53a14a009176ad5816937e18fa33f Mon Sep 17 00:00:00 2001
From: Gary Ching-Pang Lin <glin@suse.com>
Date: Mon, 26 May 2014 16:49:10 +0800
Subject: [PATCH 31/74] Remove grubpath in generate_path()

The variable is not used anymore.

Signed-off-by: Gary Ching-Pang Lin <glin@suse.com>
---
 shim.c | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/shim.c b/shim.c
index cd26ce6..eb8542a 100644
--- a/shim.c
+++ b/shim.c
@@ -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);
-- 
1.9.3