Rename run_command2() to run_command()

This is a more sensible name, so rename it.

Signed-off-by: Simon Glass <sjg@chromium.org>
Acked-by: Mike Frysinger <vapier@gentoo.org>

diff --git a/common/cmd_pxe.c b/common/cmd_pxe.c
index 7c0cb666681aa0c2ca8327da7524d28b9ca85066..3f696435821f06d87cf26eefde6d6c8c165aad7d 100644 (file)
--- a/common/cmd_pxe.c
+++ b/common/cmd_pxe.c
@@ -537,7 +537,7 @@ static int label_localboot(struct pxe_label *label)
 
        printf("running: %s\n", dupcmd);
 
-       ret = run_command2(dupcmd, 0);
+       ret = run_command(dupcmd, 0);
 
        free(dupcmd);
 

diff --git a/common/main.c b/common/main.c
index e74ebdfbf66347341512ad193a42254091ff7d03..797b245c39b68e446ca3e9e2bb342b27b3ccc2af 100644 (file)
--- a/common/main.c
+++ b/common/main.c
@@ -270,7 +270,7 @@ int abortboot(int bootdelay)
 /*
  * Return 0 on success, or != 0 on error.
  */
-int run_command2(const char *cmd, int flag)
+int run_command(const char *cmd, int flag)
 {
 #ifndef CONFIG_SYS_HUSH_PARSER
        /*
@@ -353,7 +353,7 @@ void main_loop (void)
                int prev = disable_ctrlc(1);    /* disable Control C checking */
 # endif
 
-               run_command2(p, 0);
+               run_command(p, 0);
 
 # ifdef CONFIG_AUTOBOOT_KEYED
                disable_ctrlc(prev);    /* restore Control C checking */
@@ -401,7 +401,7 @@ void main_loop (void)
                int prev = disable_ctrlc(1);    /* disable Control C checking */
 # endif
 
-               run_command2(s, 0);
+               run_command(s, 0);
 
 # ifdef CONFIG_AUTOBOOT_KEYED
                disable_ctrlc(prev);    /* restore Control C checking */
@@ -412,7 +412,7 @@ void main_loop (void)
        if (menukey == CONFIG_MENUKEY) {
                s = getenv("menucmd");
                if (s)
-                       run_command2(s, 0);
+                       run_command(s, 0);
        }
 #endif /* CONFIG_MENUKEY */
 #endif /* CONFIG_BOOTDELAY */
@@ -1422,7 +1422,7 @@ int do_run (cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[])
                        return 1;
                }
 
-               if (run_command2(arg, flag) != 0)
+               if (run_command(arg, flag) != 0)
                        return 1;
        }
        return 0;

diff --git a/include/common.h b/include/common.h
index dd1b9edbbace512b3e110b48a31485d6e3d632a6..e8b62a96c5fd5697b6a52bf238d14b7a11aebfd2 100644 (file)
--- a/include/common.h
+++ b/include/common.h
@@ -261,7 +261,7 @@ int print_buffer (ulong addr, void* data, uint width, uint count, uint linelen);
 /* common/main.c */
 void   main_loop       (void);
 int builtin_run_command(const char *cmd, int flag);
-int run_command2(const char *cmd, int flag);
+int run_command(const char *cmd, int flag);
 int    readline        (const char *const prompt);
 int    readline_into_buffer(const char *const prompt, char *buffer,
                        int timeout);