diff options
| author | Wolfgang Denk <wd@denx.de> | 2010-07-17 01:06:04 +0200 | 
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2010-07-24 20:43:57 +0200 | 
| commit | 47e26b1bf91ddef69f4a3892815c857db094cef9 (patch) | |
| tree | 7d688085d23779707c637703273f79bd3cca83e0 /common/cmd_dcr.c | |
| parent | debb6299ac1180a08f29f88c6d782b21a9c98707 (diff) | |
| download | olio-uboot-2014.01-47e26b1bf91ddef69f4a3892815c857db094cef9.tar.xz olio-uboot-2014.01-47e26b1bf91ddef69f4a3892815c857db094cef9.zip | |
cmd_usage(): simplify return code handling
Lots of code use this construct:
	cmd_usage(cmdtp);
	return 1;
Change cmd_usage() let it return 1 - then we can replace all these
ocurrances by
	return cmd_usage(cmdtp);
This fixes a few places with incorrect return code handling, too.
Signed-off-by: Wolfgang Denk <wd@denx.de>
Diffstat (limited to 'common/cmd_dcr.c')
| -rw-r--r-- | common/cmd_dcr.c | 24 | 
1 files changed, 8 insertions, 16 deletions
| diff --git a/common/cmd_dcr.c b/common/cmd_dcr.c index 45de8cd65..45fe66a7e 100644 --- a/common/cmd_dcr.c +++ b/common/cmd_dcr.c @@ -44,10 +44,8 @@ int do_getdcr ( cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[] )  	unsigned long get_dcr (unsigned short);  	/* Validate arguments */ -	if (argc < 2) { -		cmd_usage(cmdtp); -		return 1; -	} +	if (argc < 2) +		return cmd_usage(cmdtp);  	/* Get a DCR */  	dcrn = (unsigned short) simple_strtoul (argv[1], NULL, 16); @@ -73,10 +71,8 @@ int do_setdcr (cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[])  	extern char console_buffer[];  	/* Validate arguments */ -	if (argc < 2) { -		cmd_usage(cmdtp); -		return 1; -	} +	if (argc < 2) +		return cmd_usage(cmdtp);  	/* Set a DCR */  	dcrn = (unsigned short) simple_strtoul (argv[1], NULL, 16); @@ -120,10 +116,8 @@ int do_getidcr (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])  	char buf[80];  	/* Validate arguments */ -	if (argc < 3) { -		cmd_usage(cmdtp); -		return 1; -	} +	if (argc < 3) +		return cmd_usage(cmdtp);  	/* Find out whether ther is '.' (dot) symbol in the first parameter. */  	strncpy (buf, argv[1], sizeof(buf)-1); @@ -176,10 +170,8 @@ int do_setidcr (cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[])  	char buf[80];  	/* Validate arguments */ -	if (argc < 4) { -		cmd_usage(cmdtp); -		return 1; -	} +	if (argc < 4) +		return cmd_usage(cmdtp);  	/* Find out whether ther is '.' (dot) symbol in the first parameter. */  	strncpy (buf, argv[1], sizeof(buf)-1); |