[PATCH] cmd: ubifs: Do not show usage when command fails

Return value -1 cause U-Boot to print usage message. Return value 1 (CMD_RET_FAILURE) indicates failure. So fix return value when ubifs command starts it execution and fails.
Signed-off-by: Pali Rohár pali@kernel.org --- cmd/ubifs.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/cmd/ubifs.c b/cmd/ubifs.c index 7a620c5e21da..6a01d0988a2d 100644 --- a/cmd/ubifs.c +++ b/cmd/ubifs.c @@ -33,7 +33,7 @@ int cmd_ubifs_mount(char *vol_name)
ret = uboot_ubifs_mount(vol_name); if (ret) - return -1; + return CMD_RET_FAILURE;
ubifs_mounted = 1;
@@ -62,7 +62,7 @@ int cmd_ubifs_umount(void) { if (ubifs_initialized == 0) { printf("No UBIFS volume mounted!\n"); - return -1; + return CMD_RET_FAILURE; }
uboot_ubifs_umount(); @@ -89,7 +89,7 @@ static int do_ubifs_ls(struct cmd_tbl *cmdtp, int flag, int argc,
if (!ubifs_mounted) { printf("UBIFS not mounted, use ubifsmount to mount volume first!\n"); - return -1; + return CMD_RET_FAILURE; }
if (argc == 2) @@ -116,7 +116,7 @@ static int do_ubifs_load(struct cmd_tbl *cmdtp, int flag, int argc,
if (!ubifs_mounted) { printf("UBIFS not mounted, use ubifs mount to mount volume first!\n"); - return -1; + return CMD_RET_FAILURE; }
if (argc < 3)

PING?
On Sunday 07 August 2022 21:58:56 Pali Rohár wrote:
Return value -1 cause U-Boot to print usage message. Return value 1 (CMD_RET_FAILURE) indicates failure. So fix return value when ubifs command starts it execution and fails.
Signed-off-by: Pali Rohár pali@kernel.org
cmd/ubifs.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/cmd/ubifs.c b/cmd/ubifs.c index 7a620c5e21da..6a01d0988a2d 100644 --- a/cmd/ubifs.c +++ b/cmd/ubifs.c @@ -33,7 +33,7 @@ int cmd_ubifs_mount(char *vol_name)
ret = uboot_ubifs_mount(vol_name); if (ret)
return -1;
return CMD_RET_FAILURE;
ubifs_mounted = 1;
@@ -62,7 +62,7 @@ int cmd_ubifs_umount(void) { if (ubifs_initialized == 0) { printf("No UBIFS volume mounted!\n");
return -1;
return CMD_RET_FAILURE;
}
uboot_ubifs_umount();
@@ -89,7 +89,7 @@ static int do_ubifs_ls(struct cmd_tbl *cmdtp, int flag, int argc,
if (!ubifs_mounted) { printf("UBIFS not mounted, use ubifsmount to mount volume first!\n");
return -1;
return CMD_RET_FAILURE;
}
if (argc == 2)
@@ -116,7 +116,7 @@ static int do_ubifs_load(struct cmd_tbl *cmdtp, int flag, int argc,
if (!ubifs_mounted) { printf("UBIFS not mounted, use ubifs mount to mount volume first!\n");
return -1;
return CMD_RET_FAILURE;
}
if (argc < 3)
-- 2.20.1

ping?
On Sunday 09 October 2022 13:18:47 Pali Rohár wrote:
PING?
On Sunday 07 August 2022 21:58:56 Pali Rohár wrote:
Return value -1 cause U-Boot to print usage message. Return value 1 (CMD_RET_FAILURE) indicates failure. So fix return value when ubifs command starts it execution and fails.
Signed-off-by: Pali Rohár pali@kernel.org
cmd/ubifs.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/cmd/ubifs.c b/cmd/ubifs.c index 7a620c5e21da..6a01d0988a2d 100644 --- a/cmd/ubifs.c +++ b/cmd/ubifs.c @@ -33,7 +33,7 @@ int cmd_ubifs_mount(char *vol_name)
ret = uboot_ubifs_mount(vol_name); if (ret)
return -1;
return CMD_RET_FAILURE;
ubifs_mounted = 1;
@@ -62,7 +62,7 @@ int cmd_ubifs_umount(void) { if (ubifs_initialized == 0) { printf("No UBIFS volume mounted!\n");
return -1;
return CMD_RET_FAILURE;
}
uboot_ubifs_umount();
@@ -89,7 +89,7 @@ static int do_ubifs_ls(struct cmd_tbl *cmdtp, int flag, int argc,
if (!ubifs_mounted) { printf("UBIFS not mounted, use ubifsmount to mount volume first!\n");
return -1;
return CMD_RET_FAILURE;
}
if (argc == 2)
@@ -116,7 +116,7 @@ static int do_ubifs_load(struct cmd_tbl *cmdtp, int flag, int argc,
if (!ubifs_mounted) { printf("UBIFS not mounted, use ubifs mount to mount volume first!\n");
return -1;
return CMD_RET_FAILURE;
}
if (argc < 3)
-- 2.20.1

+ Tom
On Tuesday 01 November 2022 23:20:15 Pali Rohár wrote:
ping?
On Sunday 09 October 2022 13:18:47 Pali Rohár wrote:
PING?
On Sunday 07 August 2022 21:58:56 Pali Rohár wrote:
Return value -1 cause U-Boot to print usage message. Return value 1 (CMD_RET_FAILURE) indicates failure. So fix return value when ubifs command starts it execution and fails.
Signed-off-by: Pali Rohár pali@kernel.org
cmd/ubifs.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/cmd/ubifs.c b/cmd/ubifs.c index 7a620c5e21da..6a01d0988a2d 100644 --- a/cmd/ubifs.c +++ b/cmd/ubifs.c @@ -33,7 +33,7 @@ int cmd_ubifs_mount(char *vol_name)
ret = uboot_ubifs_mount(vol_name); if (ret)
return -1;
return CMD_RET_FAILURE;
ubifs_mounted = 1;
@@ -62,7 +62,7 @@ int cmd_ubifs_umount(void) { if (ubifs_initialized == 0) { printf("No UBIFS volume mounted!\n");
return -1;
return CMD_RET_FAILURE;
}
uboot_ubifs_umount();
@@ -89,7 +89,7 @@ static int do_ubifs_ls(struct cmd_tbl *cmdtp, int flag, int argc,
if (!ubifs_mounted) { printf("UBIFS not mounted, use ubifsmount to mount volume first!\n");
return -1;
return CMD_RET_FAILURE;
}
if (argc == 2)
@@ -116,7 +116,7 @@ static int do_ubifs_load(struct cmd_tbl *cmdtp, int flag, int argc,
if (!ubifs_mounted) { printf("UBIFS not mounted, use ubifs mount to mount volume first!\n");
return -1;
return CMD_RET_FAILURE;
}
if (argc < 3)
-- 2.20.1

On Sun, 7 Aug 2022 at 13:59, Pali Rohár pali@kernel.org wrote:
Return value -1 cause U-Boot to print usage message. Return value 1 (CMD_RET_FAILURE) indicates failure. So fix return value when ubifs command starts it execution and fails.
Signed-off-by: Pali Rohár pali@kernel.org
cmd/ubifs.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
Reviewed-by: Simon Glass sjg@chromium.org

On 08/08/22 01:28, Pali Rohár wrote:
Return value -1 cause U-Boot to print usage message. Return value 1 (CMD_RET_FAILURE) indicates failure. So fix return value when ubifs command starts it execution and fails.
Signed-off-by: Pali Rohár pali@kernel.org
[...]
Reviewed-by: Dhruva Gole d-gole@ti.com

On Sun, Aug 07, 2022 at 09:58:56PM +0200, Pali Rohár wrote:
Return value -1 cause U-Boot to print usage message. Return value 1 (CMD_RET_FAILURE) indicates failure. So fix return value when ubifs command starts it execution and fails.
Signed-off-by: Pali Rohár pali@kernel.org Reviewed-by: Simon Glass sjg@chromium.org Reviewed-by: Dhruva Gole d-gole@ti.com
Applied to u-boot/master, thanks!
participants (4)
-
Dhruva Gole
-
Pali Rohár
-
Simon Glass
-
Tom Rini