cmd_usage: Use ignored return value
PATCH 1/1 cmd_usage: Use ignored return value
cmd_usage returns 1, so its return value can be used as return value.
Some functions ignore the return value of cmd_usage and return a "1" in the next line. This patch changes these calls so that the return value of cmd_usage is used as return value.
--- arch/powerpc/cpu/ppc4xx/cmd_ecctest.c | 6 ++---- board/gdsys/common/osd.c | 6 ++---- common/cmd_nvedit.c | 18 ++++++------------ 3 files changed, 10 insertions(+), 20 deletions(-)
arch/powerpc/cpu/ppc4xx/cmd_ecctest.c +2 -4
@@ -190,15 +190,13 @@ static int do_ecctest(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])int error;if (argc <3 ) { -cmd_usage (cmdtp); -return 1 ; +return cmd_usage (cmdtp); } ptr = (u32 *)simple_strtoul (argv[1 ],NULL ,16 ); error =simple_strtoul (argv[2 ],NULL ,16 );if ((error <1 ) || (error >2 )) { -cmd_usage (cmdtp); -return 1 ; +return cmd_usage (cmdtp); } printf("Using address %p for %d bit ECC error injection\n",
board/gdsys/common/osd.c +2 -4
@@ -142,8 +142,7 @@ static int osd_print(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])char *text;if (argc <5 ) { -cmd_usage (cmdtp); -return 1 ; +return cmd_usage (cmdtp); } x =simple_strtoul (argv[1 ],NULL ,16 );
@@ -204,8 +203,7 @@ int osd_write(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])unsigned count = (argc >4 ) ?simple_strtoul (argv[4 ],NULL ,16 ) :1 ;if ((argc <4 ) || (strlen (argv[3 ]) %4 )) { -cmd_usage (cmdtp); -return 1 ; +return cmd_usage (cmdtp); } x =simple_strtoul (argv[1 ],NULL ,16 );
common/cmd_nvedit.c +6 -12
@@ -545,8 +545,7 @@ int envmatch (uchar *s1, int i2)static int do_env_default (cmd_tbl_t * cmdtp,int flag,int argc,char *const argv[]) {if ((argc !=2 ) || (strcmp (argv[1 ],"-f" ) !=0 )) { -cmd_usage (cmdtp); -return 1 ; +return cmd_usage (cmdtp); }set_default_env ("## Resetting to default environment\n" );return 0 ;
@@ -633,15 +632,13 @@ static int do_env_export(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv sep ='\n' ;break ;default : -cmd_usage (cmdtp); -return 1 ; +return cmd_usage (cmdtp); } } }if (argc <1 ) { -cmd_usage (cmdtp); -return 1 ; +return cmd_usage (cmdtp); } addr = (char *)simple_strtoul (argv[0 ],NULL ,16 );
@@ -744,15 +741,13 @@ static int do_env_import(cmd_tbl_t * cmdtp, int flag, int argc, char * const arg del =1 ;break ;default : -cmd_usage (cmdtp); -return 1 ; +return cmd_usage (cmdtp); } } }if (argc <1 ) { -cmd_usage (cmdtp); -return 1 ; +return cmd_usage (cmdtp); }if (!fmt)
@@ -857,8 +852,7 @@ static int do_env (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])if (cp)return cp->cmd (cmdtp, flag, argc, argv); -cmd_usage (cmdtp); -return 1 ; +return cmd_usage (cmdtp); } U_BOOT_CMD(
Signature · 1 line
1.7.3.2
PATCH 1/1 cmd_usage: Use ignored return value
Quoted 1 line · On Wednesday, November 24, 2010 07:38:14 Thomas Weber wrote:
cmd_usagereturns 1, so its return value can be used as return value.
your summary implies that "cmd_usage" is being changed when in reality, random commands are being changed to use cmd_usage.
Quoted 4 lines
arch/powerpc/cpu/ppc4xx/cmd_ecctest.c | 6 ++---- board/gdsys/common/osd.c | 6 ++---- common/cmd_nvedit.c | 18 ++++++------------ 3 files changed, 10 insertions(+), 20 deletions(-)
seems like these should be split up ...
-mike
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: This is a digitally signed message part.
Url : http://lists.denx.de/pipermail/u-boot/attachments/20101124/41fe7119/attachment.pgp