leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename run_command2() to run_command()

Browse Source 
This is a more sensible name, so rename it.

Signed-off-by: Simon Glass <sjg@chromium.org>
Acked-by: Mike Frysinger <vapier@gentoo.org>
This commit is contained in:
Simon Glass 2012-02-14 19:59:20 +00:00 committed by Wolfgang Denk
parent f47360a74e
commit 009dde1955
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/cmd_pxe.c
View File

@ -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);

10
common/main.c
View File

@ -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;

2
include/common.h
View File

@ -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);