From 6b9accff8bf5a075d541d22273441c1132003a63 Mon Sep 17 00:00:00 2001
From: Piotr Dymacz <pepe2k@gmail.com>
Date: Sun, 14 Aug 2016 16:02:42 +0200
Subject: [PATCH] Add function for printing command usage

DRY... move duplicated code into common function. This saves
around 900 bytes in uncompressed version and around 200 bytes
in compressed one.

Also, cleanup little bit coding style in command.{c,h}
---
 u-boot/common/cmd_boot.c   | 10 +-----
 u-boot/common/cmd_bootm.c  | 10 +-----
 u-boot/common/cmd_custom.c | 10 +-----
 u-boot/common/cmd_flash.c  | 30 ++--------------
 u-boot/common/cmd_itest.c  | 10 +-----
 u-boot/common/cmd_mem.c    | 40 +++------------------
 u-boot/common/cmd_net.c    | 40 +++------------------
 u-boot/common/cmd_nvedit.c | 30 ++--------------
 u-boot/common/command.c    | 73 +++++++++++++++++++++++---------------
 u-boot/common/hush.c       | 10 +-----
 u-boot/common/main.c       | 20 ++---------
 u-boot/include/command.h   | 40 ++++++++++-----------
 12 files changed, 85 insertions(+), 238 deletions(-)

diff --git a/u-boot/common/cmd_boot.c b/u-boot/common/cmd_boot.c
index e2937e1..6ba7286 100644
--- a/u-boot/common/cmd_boot.c
+++ b/u-boot/common/cmd_boot.c
@@ -37,15 +37,7 @@ int do_go(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]){
 	int rcode = 0;
 
 	if(argc < 2){
-#ifdef CFG_LONGHELP
-		if(cmdtp->help != NULL){
-			printf("Usage:\n%s %s\n", cmdtp->name, cmdtp->help);
-		} else {
-			printf("Usage:\n%s %s\n", cmdtp->name, cmdtp->usage);
-		}
-#else
-		printf("Usage:\n%s %s\n", cmdtp->name, cmdtp->usage);
-#endif
+		print_cmd_help(cmdtp);
 		return(1);
 	}
 
diff --git a/u-boot/common/cmd_bootm.c b/u-boot/common/cmd_bootm.c
index 627a09d..7e66f7e 100644
--- a/u-boot/common/cmd_bootm.c
+++ b/u-boot/common/cmd_bootm.c
@@ -580,15 +580,7 @@ int do_iminfo(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 	if (argc == 2) {
 		addr = simple_strtoul(argv[1], NULL, 16);
 	} else {
-#ifdef CFG_LONGHELP
-		if (cmdtp->help != NULL) {
-			printf("Usage:\n%s %s\n", cmdtp->name, cmdtp->help);
-		} else {
-			printf("Usage:\n%s %s\n", cmdtp->name, cmdtp->usage);
-		}
-#else
-		printf("Usage:\n%s %s\n", cmdtp->name, cmdtp->usage);
-#endif
+		print_cmd_help(cmdtp);
 		return 1;
 	}
 
diff --git a/u-boot/common/cmd_custom.c b/u-boot/common/cmd_custom.c
index 46dc761..94b7cbd 100644
--- a/u-boot/common/cmd_custom.c
+++ b/u-boot/common/cmd_custom.c
@@ -77,15 +77,7 @@ int do_set_mac(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[]){
 
 	// allow only 2 arg (command name + mac), second argument length should be 17 (xx:xx:xx:xx:xx:xx)
 	if(argc != 2 || strlen(argv[1]) != 17){
-#if defined(CFG_LONGHELP)
-		if(cmdtp->help != NULL){
-			printf("Usage:\n%s %s\n", cmdtp->name, cmdtp->help);
-		} else {
-			printf("Usage:\n%s %s\n", cmdtp->name, cmdtp->usage);
-		}
-#else
-		printf("Usage:\n%s %s\n", cmdtp->name, cmdtp->usage);
-#endif
+		print_cmd_help(cmdtp);
 		return(1);
 	}
 
diff --git a/u-boot/common/cmd_flash.c b/u-boot/common/cmd_flash.c
index d5eff2e..39c710b 100644
--- a/u-boot/common/cmd_flash.c
+++ b/u-boot/common/cmd_flash.c
@@ -276,15 +276,7 @@ int do_flerase(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]){
 	int rcode = 0;
 
 	if(argc < 2){
-#ifdef CFG_LONGHELP
-		if(cmdtp->help != NULL){
-			printf("Usage:\n%s %s\n", cmdtp->name, cmdtp->help);
-		} else {
-			printf("Usage:\n%s %s\n", cmdtp->name, cmdtp->usage);
-		}
-#else
-		printf("Usage:\n%s %s\n", cmdtp->name, cmdtp->usage);
-#endif
+		print_cmd_help(cmdtp);
 		return(1);
 	}
 
@@ -309,15 +301,7 @@ int do_flerase(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]){
 	}
 
 	if(argc != 3){
-#ifdef CFG_LONGHELP
-		if(cmdtp->help != NULL){
-			printf("Usage:\n%s %s\n", cmdtp->name, cmdtp->help);
-		} else {
-			printf("Usage:\n%s %s\n", cmdtp->name, cmdtp->usage);
-		}
-#else
-		printf("Usage:\n%s %s\n", cmdtp->name, cmdtp->usage);
-#endif
+		print_cmd_help(cmdtp);
 		return(1);
 	}
 
@@ -341,15 +325,7 @@ int do_flerase(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]){
 	}
 
 	if(addr_first >= addr_last){
-#ifdef CFG_LONGHELP
-		if(cmdtp->help != NULL){
-			printf("Usage:\n%s %s\n", cmdtp->name, cmdtp->help);
-		} else {
-			printf("Usage:\n%s %s\n", cmdtp->name, cmdtp->usage);
-		}
-#else
-		printf("Usage:\n%s %s\n", cmdtp->name, cmdtp->usage);
-#endif
+		print_cmd_help(cmdtp);
 		return(1);
 	}
 
diff --git a/u-boot/common/cmd_itest.c b/u-boot/common/cmd_itest.c
index ae7c17d..90d8070 100644
--- a/u-boot/common/cmd_itest.c
+++ b/u-boot/common/cmd_itest.c
@@ -165,15 +165,7 @@ int do_itest ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[] )
 
 	/* Validate arguments */
 	if ((argc != 4)){
-#ifdef CFG_LONGHELP
-		if(cmdtp->help != NULL){
-			printf("Usage:\n%s %s\n", cmdtp->name, cmdtp->help);
-		} else {
-			printf("Usage:\n%s %s\n", cmdtp->name, cmdtp->usage);
-		}
-#else
-		printf("Usage:\n%s %s\n", cmdtp->name, cmdtp->usage);
-#endif
+		print_cmd_help(cmdtp);
 		return 1;
 	}
 
diff --git a/u-boot/common/cmd_mem.c b/u-boot/common/cmd_mem.c
index b9ce8d4..b20fedf 100644
--- a/u-boot/common/cmd_mem.c
+++ b/u-boot/common/cmd_mem.c
@@ -100,15 +100,7 @@ int do_mem_md(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]){
 	length = dp_last_length;
 
 	if(argc < 2){
-#ifdef CFG_LONGHELP
-		if(cmdtp->help != NULL){
-			printf("Usage:\n%s %s\n", cmdtp->name, cmdtp->help);
-		} else {
-			printf("Usage:\n%s %s\n", cmdtp->name, cmdtp->usage);
-		}
-#else
-		printf("Usage:\n%s %s\n", cmdtp->name, cmdtp->usage);
-#endif
+		print_cmd_help(cmdtp);
 		return(1);
 	}
 
@@ -205,15 +197,7 @@ int do_mem_mw(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]){
 	int size;
 
 	if((argc < 3) || (argc > 4)){
-#ifdef CFG_LONGHELP
-		if(cmdtp->help != NULL){
-			printf("Usage:\n%s %s\n", cmdtp->name, cmdtp->help);
-		} else {
-			printf("Usage:\n%s %s\n", cmdtp->name, cmdtp->usage);
-		}
-#else
-		printf("Usage:\n%s %s\n", cmdtp->name, cmdtp->usage);
-#endif
+		print_cmd_help(cmdtp);
 		return(1);
 	}
 
@@ -260,15 +244,7 @@ int do_mem_cp(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]){
 	int size;
 
 	if(argc != 4){
-#ifdef CFG_LONGHELP
-		if(cmdtp->help != NULL){
-			printf("Usage:\n%s %s\n", cmdtp->name, cmdtp->help);
-		} else {
-			printf("Usage:\n%s %s\n", cmdtp->name, cmdtp->usage);
-		}
-#else
-		printf("Usage:\n%s %s\n", cmdtp->name, cmdtp->usage);
-#endif
+		print_cmd_help(cmdtp);
 		return(1);
 	}
 
@@ -641,15 +617,7 @@ static int mod_mem(cmd_tbl_t *cmdtp, int incrflag, int flag, int argc, char *arg
 	extern char console_buffer[];
 
 	if(argc != 2){
-#ifdef CFG_LONGHELP
-		if(cmdtp->help != NULL){
-			printf("Usage:\n%s %s\n", cmdtp->name, cmdtp->help);
-		} else {
-			printf("Usage:\n%s %s\n", cmdtp->name, cmdtp->usage);
-		}
-#else
-		printf("Usage:\n%s %s\n", cmdtp->name, cmdtp->usage);
-#endif
+		print_cmd_help(cmdtp);
 		return(1);
 	}
 
diff --git a/u-boot/common/cmd_net.c b/u-boot/common/cmd_net.c
index 098abed..d737d84 100644
--- a/u-boot/common/cmd_net.c
+++ b/u-boot/common/cmd_net.c
@@ -154,15 +154,7 @@ static int netboot_common(proto_t proto, cmd_tbl_t *cmdtp, int argc, char *argv[
 
 		default:
 
-#ifdef CFG_LONGHELP
-			if(cmdtp->help != NULL){
-				printf("Usage:\n%s %s\n", cmdtp->name, cmdtp->help);
-			} else {
-				printf("Usage:\n%s %s\n", cmdtp->name, cmdtp->usage);
-			}
-#else
-			printf("Usage:\n%s %s\n", cmdtp->name, cmdtp->usage);
-#endif
+			print_cmd_help(cmdtp);
 			return 1;
 	}
 
@@ -204,30 +196,14 @@ static int netboot_common(proto_t proto, cmd_tbl_t *cmdtp, int argc, char *argv[
 int do_ping(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]){
 
 	if(argc < 2){
-#ifdef CFG_LONGHELP
-		if(cmdtp->help != NULL){
-			printf("Usage:\n%s %s\n", cmdtp->name, cmdtp->help);
-		} else {
-			printf("Usage:\n%s %s\n", cmdtp->name, cmdtp->usage);
-		}
-#else
-		printf("Usage:\n%s %s\n", cmdtp->name, cmdtp->usage);
-#endif
+		print_cmd_help(cmdtp);
 		return(-1);
 	}
 
 	NetPingIP = string_to_ip(argv[1]);
 
 	if (NetPingIP == 0){
-#ifdef CFG_LONGHELP
-		if(cmdtp->help != NULL){
-			printf("Usage:\n%s %s\n", cmdtp->name, cmdtp->help);
-		} else {
-			printf("Usage:\n%s %s\n", cmdtp->name, cmdtp->usage);
-		}
-#else
-		printf("Usage:\n%s %s\n", cmdtp->name, cmdtp->usage);
-#endif
+		print_cmd_help(cmdtp);
 		return(-1);
 	}
 
@@ -250,15 +226,7 @@ int do_sntp(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]){
 	char *toff;
 
 	if(argc < 2){
-#ifdef CFG_LONGHELP
-		if(cmdtp->help != NULL){
-			printf("Usage:\n%s %s\n", cmdtp->name, cmdtp->help);
-		} else {
-			printf("Usage:\n%s %s\n", cmdtp->name, cmdtp->usage);
-		}
-#else
-		printf("Usage:\n%s %s\n", cmdtp->name, cmdtp->usage);
-#endif
+		print_cmd_help(cmdtp);
 		return(-1);
 	} else {
 		NetNtpServerIP = string_to_ip(argv[1]);
diff --git a/u-boot/common/cmd_nvedit.c b/u-boot/common/cmd_nvedit.c
index 7850041..4e1ddc3 100644
--- a/u-boot/common/cmd_nvedit.c
+++ b/u-boot/common/cmd_nvedit.c
@@ -397,15 +397,7 @@ void setenv(char *varname, char *varvalue){
 
 int do_setenv(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]){
 	if(argc < 2){
-#ifdef CFG_LONGHELP
-		if(cmdtp->help != NULL){
-			printf("Usage:\n%s %s\n", cmdtp->name, cmdtp->help);
-		} else {
-			printf("Usage:\n%s %s\n", cmdtp->name, cmdtp->usage);
-		}
-#else
-		printf("Usage:\n%s %s\n", cmdtp->name, cmdtp->usage);
-#endif
+		print_cmd_help(cmdtp);
 		return(1);
 	}
 
@@ -430,29 +422,13 @@ int do_askenv( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]){
 	local_args[3] = NULL;
 
 	if(argc < 2){
-#ifdef CFG_LONGHELP
-		if(cmdtp->help != NULL){
-			printf("Usage:\n%s %s\n", cmdtp->name, cmdtp->help);
-		} else {
-			printf("Usage:\n%s %s\n", cmdtp->name, cmdtp->usage);
-		}
-#else
-		printf("Usage:\n%s %s\n", cmdtp->name, cmdtp->usage);
-#endif
+		print_cmd_help(cmdtp);
 		return(1);
 	}
 	/* Check the syntax */
 	switch(argc){
 		case 1:
-#ifdef CFG_LONGHELP
-		if(cmdtp->help != NULL){
-			printf("Usage:\n%s %s\n", cmdtp->name, cmdtp->help);
-		} else {
-			printf("Usage:\n%s %s\n", cmdtp->name, cmdtp->usage);
-		}
-#else
-		printf("Usage:\n%s %s\n", cmdtp->name, cmdtp->usage);
-#endif
+		print_cmd_help(cmdtp);
 		return(1);
 
 		case 2: /* askenv envname */
diff --git a/u-boot/common/command.c b/u-boot/common/command.c
index 52876bf..21dfcb3 100644
--- a/u-boot/common/command.c
+++ b/u-boot/common/command.c
@@ -9,6 +9,19 @@
 #include <common.h>
 #include <command.h>
 
+void print_cmd_help(cmd_tbl_t *cmdtp)
+{
+#ifdef CFG_LONGHELP
+	if (cmdtp->help != NULL) {
+		printf("Usage:\n%s %s\n", cmdtp->name, cmdtp->help);
+	} else {
+		printf("Usage:\n%s %s\n", cmdtp->name, cmdtp->usage);
+	}
+#else
+	printf("Usage:\n%s %s\n", cmdtp->name, cmdtp->usage);
+#endif
+}
+
 int do_version(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 {
 	extern char version_string[];
@@ -23,9 +36,7 @@ int do_version(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 	return 0;
 }
 
-U_BOOT_CMD(version, 1, 1, do_version,
-		   "print U-Boot version\n",
-		   NULL);
+U_BOOT_CMD(version, 1, 1, do_version, "print U-Boot version\n", NULL);
 
 #if (CONFIG_COMMANDS & CFG_CMD_ECHO)
 int do_echo(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
@@ -55,15 +66,15 @@ int do_echo(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 }
 
 U_BOOT_CMD(echo, CFG_MAXARGS, 1, do_echo,
-		   "echo args to console\n",
-		   "[args..]\n" "\t- echo args to console; \\c suppresses newline\n");
-#endif	/*  CFG_CMD_ECHO */
+	"echo args to console\n", "[args..]\n"
+	"\t- echo args to console; \\c suppresses newline\n");
+#endif /* CFG_CMD_ECHO */
 
 #ifdef CFG_HUSH_PARSER
 int do_test(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 {
-	int left, adv, expr, last_expr, neg, last_cmp;
 	char **ap;
+	int adv, expr, last_expr, last_cmp, left, neg;
 
 	/* args? */
 	if (argc < 3)
@@ -86,9 +97,11 @@ int do_test(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 	last_expr = -1;
 
 	while (left > 0) {
-		if (strcmp(ap[0], "-o") == 0 || strcmp(ap[0], "-a") == 0) {
+		if (strcmp(ap[0], "-o") == 0 ||
+		    strcmp(ap[0], "-a") == 0) {
 			adv = 1;
-		} else if (strcmp(ap[0], "-z") == 0 || strcmp(ap[0], "-n") == 0) {
+		} else if (strcmp(ap[0], "-z") == 0 ||
+			   strcmp(ap[0], "-n") == 0) {
 			adv = 2;
 		} else {
 			adv = 3;
@@ -141,17 +154,23 @@ int do_test(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 			} else if (strcmp(ap[1], "<") == 0) {
 				expr = strcmp(ap[0], ap[2]) < 0;
 			} else if (strcmp(ap[1], "-eq") == 0) {
-				expr = simple_strtol(ap[0], NULL, 10) == simple_strtol(ap[2], NULL, 10);
+				expr = simple_strtol(ap[0], NULL, 10)
+				       == simple_strtol(ap[2], NULL, 10);
 			} else if (strcmp(ap[1], "-ne") == 0) {
-				expr = simple_strtol(ap[0], NULL, 10) != simple_strtol(ap[2], NULL, 10);
+				expr = simple_strtol(ap[0], NULL, 10)
+				       != simple_strtol(ap[2], NULL, 10);
 			} else if (strcmp(ap[1], "-lt") == 0) {
-				expr = simple_strtol(ap[0], NULL, 10) < simple_strtol(ap[2], NULL, 10);
+				expr = simple_strtol(ap[0], NULL, 10)
+				       < simple_strtol(ap[2], NULL, 10);
 			} else if (strcmp(ap[1], "-le") == 0) {
-				expr = simple_strtol(ap[0], NULL, 10) <= simple_strtol(ap[2], NULL, 10);
+				expr = simple_strtol(ap[0], NULL, 10)
+				       <= simple_strtol(ap[2], NULL, 10);
 			} else if (strcmp(ap[1], "-gt") == 0) {
-				expr = simple_strtol(ap[0], NULL, 10) > simple_strtol(ap[2], NULL, 10);
+				expr = simple_strtol(ap[0], NULL, 10)
+				       > simple_strtol(ap[2], NULL, 10);
 			} else if (strcmp(ap[1], "-ge") == 0) {
-				expr = simple_strtol(ap[0], NULL, 10) >= simple_strtol(ap[2], NULL, 10);
+				expr = simple_strtol(ap[0], NULL, 10)
+				       >= simple_strtol(ap[2], NULL, 10);
 			} else {
 				expr = 1;
 				break;
@@ -178,8 +197,8 @@ int do_test(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 }
 
 U_BOOT_CMD(test, CFG_MAXARGS, 1, do_test,
-		   "minimal test like /bin/sh\n",
-		   "[args..]\n\t- test functionality\n");
+	"minimal test like /bin/sh\n", "[args..]\n"
+	"\t- test functionality\n");
 
 int do_exit(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 {
@@ -192,8 +211,7 @@ int do_exit(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 }
 
 U_BOOT_CMD(exit, 2, 1, do_exit,
-		   "exit script\n",
-		   "\n\t- exit functionality\n");
+	"exit script\n", "\n\t- exit functionality\n");
 #endif /* CFG_HUSH_PARSER */
 
 /*
@@ -229,7 +247,8 @@ int do_help(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 				if (strlen(name) >= max_len)
 					max_len = strlen(name);
 
-				if (strcmp(cmd_array[j]->name, cmd_array[j + 1]->name) > 0) {
+				if (strcmp(cmd_array[j]->name,
+					   cmd_array[j + 1]->name) > 0) {
 					cmd_tbl_t *tmp;
 					tmp = cmd_array[j];
 					cmd_array[j] = cmd_array[j + 1];
@@ -282,7 +301,7 @@ int do_help(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 #else
 			if (cmdtp->usage)
 				puts(cmdtp->usage);
-#endif	/* CFG_LONGHELP */
+#endif /* CFG_LONGHELP */
 		} else {
 			printf("Unknown command '%s' - try 'help' without arguments\n\n", argv[i]);
 			rcode = 1;
@@ -293,10 +312,8 @@ int do_help(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 }
 
 U_BOOT_CMD(help, CFG_MAXARGS, 1, do_help,
-		   "print embedded help\n",
-		   "[command ...]\n"
-		   "\t- show help information (for 'command')\n"
-			"\twithout arguments, it prints a short usage message for available commands.\n");
+	"print embedded help\n", "[command ...]\n"
+	"\t- show help information for 'command' or short usage of all commands\n");
 
 /* This do not ust the U_BOOT_CMD macro as ? can't be used in symbol names */
 #ifdef CFG_LONGHELP
@@ -310,11 +327,11 @@ cmd_tbl_t __u_boot_cmd_question_mark Struct_Section = {"?", CFG_MAXARGS, 1, do_h
  */
 cmd_tbl_t *find_cmd(const char *cmd)
 {
-	cmd_tbl_t *cmdtp;
-	cmd_tbl_t *cmdtp_temp = &__u_boot_cmd_start; /*Init value */
-	const char *p;
 	int len;
 	int n_found = 0;
+	const char *p;
+	cmd_tbl_t *cmdtp;
+	cmd_tbl_t *cmdtp_temp = &__u_boot_cmd_start; /*Init value */
 
 	/*
 	 * Some commands allow length modifiers (like "cp.b");
diff --git a/u-boot/common/hush.c b/u-boot/common/hush.c
index f60c236..87113b1 100644
--- a/u-boot/common/hush.c
+++ b/u-boot/common/hush.c
@@ -596,15 +596,7 @@ static int run_pipe_real(struct pipe *pi) {
 #endif	/* CFG_CMD_BOOTD */
 			/* found - check max args */
 			if ((child->argc - i) > cmdtp->maxargs) {
-#ifdef CFG_LONGHELP
-		if(cmdtp->help != NULL){
-			printf("Usage:\n%s %s\n", cmdtp->name, cmdtp->help);
-		} else {
-			printf("Usage:\n%s %s\n", cmdtp->name, cmdtp->usage);
-		}
-#else
-		printf("Usage:\n%s %s\n", cmdtp->name, cmdtp->usage);
-#endif
+				print_cmd_help(cmdtp);
 				return -1;
 			}
 			child->argv += i; /* XXX horrible hack */
diff --git a/u-boot/common/main.c b/u-boot/common/main.c
index 6c50e7a..712f748 100644
--- a/u-boot/common/main.c
+++ b/u-boot/common/main.c
@@ -625,15 +625,7 @@ int run_command(const char *cmd, int flag){
 
 		/* found - check max args */
 		if(argc > cmdtp->maxargs){
-#ifdef CFG_LONGHELP
-			if(cmdtp->help != NULL){
-				printf("Usage:\n%s %s\n", cmdtp->name, cmdtp->help);
-			} else {
-				printf("Usage:\n%s %s\n", cmdtp->name, cmdtp->usage);
-			}
-#else
-			printf("Usage:\n%s %s\n", cmdtp->name, cmdtp->usage);
-#endif
+			print_cmd_help(cmdtp);
 			rc = -1;
 			continue;
 		}
@@ -661,15 +653,7 @@ int do_run(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[]){
 	int i;
 
 	if(argc < 2){
-#ifdef CFG_LONGHELP
-		if(cmdtp->help != NULL){
-			printf("Usage:\n%s %s\n", cmdtp->name, cmdtp->help);
-		} else {
-			printf("Usage:\n%s %s\n", cmdtp->name, cmdtp->usage);
-		}
-#else
-		printf("Usage:\n%s %s\n", cmdtp->name, cmdtp->usage);
-#endif
+		print_cmd_help(cmdtp);
 		return(1);
 	}
 
diff --git a/u-boot/include/command.h b/u-boot/include/command.h
index 656cc55..d51787f 100644
--- a/u-boot/include/command.h
+++ b/u-boot/include/command.h
@@ -28,32 +28,31 @@
 #define __COMMAND_H
 
 #ifndef NULL
-#define NULL	0
+  #define NULL	0
 #endif
 
 #ifndef	__ASSEMBLY__
 /*
  * Monitor Command Table
  */
-
-struct cmd_tbl_s {
-	char	*name; 											/* Command Name					*/
-	int		maxargs;										/* maximum number of arguments	*/
-	int		repeatable;										/* autorepeat allowed?			*/
-	int		(*cmd)(struct cmd_tbl_s *, int, int, char *[]);	/* Implementation function		*/
-	char	*usage;											/* Usage message (short)		*/
+typedef struct cmd_tbl_s {
+	char	*name; 		/* Command Name                */
+	int	maxargs;	/* Maximum number of arguments */
+	int	repeatable;	/* Autorepeat allowed?         */
+				/* Implementation function     */
+	int	(*cmd)(struct cmd_tbl_s *, int, int, char *[]);
+	char	*usage;		/* Usage message (short)       */
 #ifdef	CFG_LONGHELP
-	char	*help;											/* Help  message (long)			*/
+	char	*help;		/* Help  message (long)        */
 #endif
-};
-
-typedef struct cmd_tbl_s cmd_tbl_t;
+} cmd_tbl_t;
 
 extern cmd_tbl_t __u_boot_cmd_start;
 extern cmd_tbl_t __u_boot_cmd_end;
 
 /* common/command.c */
 cmd_tbl_t *find_cmd(const char *cmd);
+void print_cmd_help(cmd_tbl_t *cmdtp);
 
 /*
  * Monitor Command
@@ -61,14 +60,13 @@ cmd_tbl_t *find_cmd(const char *cmd);
  * void function (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]);
  */
 typedef void command_t(cmd_tbl_t *, int, int, char *[]);
-
-#endif	/* __ASSEMBLY__ */
+#endif /* __ASSEMBLY__ */
 
 /*
  * Command Flags:
  */
-#define CMD_FLAG_REPEAT		0x0001	/* repeat last command		*/
-#define CMD_FLAG_BOOTD		0x0002	/* command is from bootd	*/
+#define CMD_FLAG_REPEAT	0x0001	/* repeat last command   */
+#define CMD_FLAG_BOOTD	0x0002	/* command is from bootd */
 
 /*
  * Configurable monitor commands definitions have been moved
@@ -77,9 +75,9 @@ typedef void command_t(cmd_tbl_t *, int, int, char *[]);
 #define Struct_Section  __attribute__ ((unused,section (".u_boot_cmd")))
 
 #ifdef CFG_LONGHELP
-#define U_BOOT_CMD(name,maxargs,rep,cmd,usage,help) cmd_tbl_t __u_boot_cmd_##name Struct_Section = {#name, maxargs, rep, cmd, usage, help}
-#else	/* no long help info */
-#define U_BOOT_CMD(name,maxargs,rep,cmd,usage,help) cmd_tbl_t __u_boot_cmd_##name Struct_Section = {#name, maxargs, rep, cmd, usage}
-#endif	/* CFG_LONGHELP */
+  #define U_BOOT_CMD(name,maxargs,rep,cmd,usage,help) cmd_tbl_t __u_boot_cmd_##name Struct_Section = {#name, maxargs, rep, cmd, usage, help}
+#else
+  #define U_BOOT_CMD(name,maxargs,rep,cmd,usage,help) cmd_tbl_t __u_boot_cmd_##name Struct_Section = {#name, maxargs, rep, cmd, usage}
+#endif
 
-#endif	/* __COMMAND_H */
+#endif /* __COMMAND_H */
-- 
2.25.1