Merge branch 'master' of git://git.denx.de/u-boot-ti

[karo-tx-uboot.git] / common / main.c

diff --git a/common/main.c b/common/main.c
index 20090ee6aa777747844ac31135324bee41454a4b..8d548dbc85d5f7ba592e64a1bb63668a0466e5fa 100644 (file)
--- a/common/main.c
+++ b/common/main.c
@@ -643,12 +643,10 @@ static void cread_print_hist_list(void)
 
 #define ERASE_TO_EOL() {                               \
        if (num < eol_num) {                            \
-               int tmp;                                \
-               for (tmp = num; tmp < eol_num; tmp++)   \
-                       getcmd_putch(' ');              \
-               while (tmp-- > num)                     \
+               printf("%*s", (int)(eol_num - num), ""); \
+               do {                                    \
                        getcmd_putch(CTL_BACKSPACE);    \
-               eol_num = num;                          \
+               } while (--eol_num > num);              \
        }                                               \
 }
 
@@ -1418,10 +1416,8 @@ int do_run (cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[])
 {
        int i;
 
-       if (argc < 2) {
-               cmd_usage(cmdtp);
-               return 1;
-       }
+       if (argc < 2)
+               return cmd_usage(cmdtp);
 
        for (i=1; i<argc; ++i) {
                char *arg;