[U-Boot] [PATCH v2 01/18] efi_loader: efi_bootmgr: do not make hidden assignments

[Heinrich Schuchardt]

Assignments should not be made in the middle of nowhere.

Signed-off-by: Heinrich Schuchardt <xypron.glpk at gmx.de>
---
v2
	Call efi_dp_str in debug mode only.
---
 lib/efi_loader/efi_bootmgr.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/lib/efi_loader/efi_bootmgr.c b/lib/efi_loader/efi_bootmgr.c
index 857d88a879..a55f210f0b 100644
--- a/lib/efi_loader/efi_bootmgr.c
+++ b/lib/efi_loader/efi_bootmgr.c
@@ -120,11 +120,13 @@ static void *try_load_entry(uint16_t n, struct efi_device_path **device_path,
 
 	if (lo.attributes & LOAD_OPTION_ACTIVE) {
 		efi_status_t ret;
-		u16 *str = NULL;
+#ifdef _DEBUG
+		u16 *str = efi_dp_str(lo.file_path);
 
 		debug("%s: trying to load \"%ls\" from: %ls\n", __func__,
-		      lo.label, (str = efi_dp_str(lo.file_path)));
+		      lo.label, str);
 		efi_free_pool(str);
+#endif /* _DEBUG */
 
 		ret = efi_load_image_from_path(lo.file_path, &image);
 
-- 
2.15.0