From: Glenn Washburn <development@efficientek.com>
Date: Sun, 2 Mar 2025 05:15:32 +0000 (-0600)
Subject: commands/ls: Return proper GRUB_ERR_* for functions returning type grub_err_t
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=112d2069cf348d424ab49e7cb01abdb2320ecee8;p=thirdparty%2Fgrub.git

commands/ls: Return proper GRUB_ERR_* for functions returning type grub_err_t

Also, remove unused code.

Signed-off-by: Glenn Washburn <development@efficientek.com>
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
---

diff --git a/grub-core/commands/ls.c b/grub-core/commands/ls.c
index f660946a2..65b17768b 100644
--- a/grub-core/commands/ls.c
+++ b/grub-core/commands/ls.c
@@ -250,7 +250,6 @@ grub_ls_list_files (char *dirname, int longlist, int all, int human)
 	  if (ctx.dirname == NULL)
 	    goto fail;
 
-	  all = 1;
 	  grub_memset (&info, 0, sizeof (info));
 	  if (longlist)
 	    print_files_long (p, &info, &ctx);
@@ -272,7 +271,7 @@ grub_ls_list_files (char *dirname, int longlist, int all, int human)
 
   grub_free (device_name);
 
-  return 0;
+  return GRUB_ERR_NONE;
 }
 
 static grub_err_t
@@ -288,7 +287,7 @@ grub_cmd_ls (grub_extcmd_context_t ctxt, int argc, char **args)
       grub_ls_list_files (args[i], state[0].set, state[2].set,
 			  state[1].set);
 
-  return 0;
+  return GRUB_ERR_NONE;
 }
 
 static grub_extcmd_t cmd;