diff options
| author | Simon Glass <sjg@chromium.org> | 2012-02-14 19:59:19 +0000 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2012-03-06 21:09:18 +0100 |
| commit | f47360a74ec05c078960bf6f8c10a7f426c7d11d (patch) | |
| tree | da8f3b450fa39aa0ad3966da7c2e04f243a30da7 /common/main.c | |
| parent | 79714c1e26229985c2ed9dd5853b55732cb21f2c (diff) | |
| download | u-boot-f47360a74ec05c078960bf6f8c10a7f426c7d11d.tar.gz u-boot-f47360a74ec05c078960bf6f8c10a7f426c7d11d.tar.bz2 u-boot-f47360a74ec05c078960bf6f8c10a7f426c7d11d.zip | |
Rename run_command() to builtin_run_command()
The current run_command() is only one of the parsing options - the other
is hush. We should not call run_command() when the hush parser is being
used. So we rename this function to better explain its purpose.
Signed-off-by: Simon Glass <sjg@chromium.org>
Acked-by: Mike Frysinger <vapier@gentoo.org>
Diffstat (limited to 'common/main.c')
| -rw-r--r-- | common/main.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/common/main.c b/common/main.c index defe2d499d..e74ebdfbf6 100644 --- a/common/main.c +++ b/common/main.c @@ -274,9 +274,10 @@ int run_command2(const char *cmd, int flag) { #ifndef CONFIG_SYS_HUSH_PARSER /* - * run_command can return 0 or 1 for success, so clean up its result. + * builtin_run_command can return 0 or 1 for success, so clean up + * its result. */ - if (run_command(cmd, flag) == -1) + if (builtin_run_command(cmd, flag) == -1) return 1; return 0; @@ -457,7 +458,7 @@ void main_loop (void) if (len == -1) puts ("<INTERRUPT>\n"); else - rc = run_command (lastcommand, flag); + rc = builtin_run_command(lastcommand, flag); if (rc <= 0) { /* invalid command or not repeatable, forget it */ @@ -1278,7 +1279,7 @@ static void process_macros (const char *input, char *output) * creates or modifies environment variables (like "bootp" does). */ -int run_command (const char *cmd, int flag) +int builtin_run_command(const char *cmd, int flag) { cmd_tbl_t *cmdtp; char cmdbuf[CONFIG_SYS_CBSIZE]; /* working copy of cmd */ |