[PATCH] cmd: return code when tlv_eeprom incorrectly called

Stefan Roese sr at denx.de
Mon Feb 13 14:58:57 CET 2023


On 1/27/23 22:49, Heinrich Schuchardt wrote:
> A command called with incorrect parameters should set $? to 1 (false).
> Instead of calling cmd_usage(cmdtp) and then returning 0 just return
> CMD_RET_FAILURE.
> 
> Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt at canonical.com>

Applied to u-boot-marvell/master

Thanks,
Stefan

> ---
>   cmd/tlv_eeprom.c | 11 ++++-------
>   1 file changed, 4 insertions(+), 7 deletions(-)
> 
> diff --git a/cmd/tlv_eeprom.c b/cmd/tlv_eeprom.c
> index bf8d453dc5..4591ff336b 100644
> --- a/cmd/tlv_eeprom.c
> +++ b/cmd/tlv_eeprom.c
> @@ -479,17 +479,14 @@ int do_tlv_eeprom(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
>   			show_tlv_devices();
>   			break;
>   		default:
> -			cmd_usage(cmdtp);
> -			break;
> +			return CMD_RET_USAGE;
>   		}
>   		return 0;
>   	}
>   
>   	// The set command takes one or two args.
> -	if (argc > 4) {
> -		cmd_usage(cmdtp);
> -		return 0;
> -	}
> +	if (argc > 4)
> +		return CMD_RET_USAGE;
>   
>   	// Set command. If the TLV exists in the EEPROM, delete it. Then if
>   	// data was supplied for this TLV add the TLV with the new contents at
> @@ -512,7 +509,7 @@ int do_tlv_eeprom(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
>   		current_dev = devnum;
>   		has_been_read = 0;
>   	} else {
> -		cmd_usage(cmdtp);
> +		return CMD_RET_USAGE;
>   	}
>   
>   	return 0;

Viele Grüße,
Stefan Roese

-- 
DENX Software Engineering GmbH,      Managing Director: Erika Unter
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: sr at denx.de


More information about the U-Boot mailing list