diff options
| author | Heinrich Schuchardt <xypron.glpk@gmx.de> | 2020-10-07 18:11:48 +0200 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-10-22 09:54:53 -0400 |
| commit | c670aeee3df9186902dba07b76bd2de0776df390 (patch) | |
| tree | 8e61521f5bd9d6e01af762785307ad7c84d91c43 /common/console.c | |
| parent | 8d5d97cb28bf2ac1e0d7e4b24620c56f3fe45e6f (diff) | |
| download | u-boot-c670aeee3df9186902dba07b76bd2de0776df390.zip u-boot-c670aeee3df9186902dba07b76bd2de0776df390.tar.gz u-boot-c670aeee3df9186902dba07b76bd2de0776df390.tar.bz2 | |
common: rename getc() to getchar()
The sandbox is built with the SDL2 library with invokes the X11 library
which in turn calls getc(). But getc() in glibc is defined as
int getc(FILE *)
This does not match our definition.
int getc(void)
The sandbox crashes when called with parameter -l.
Rename our library symbol getc() to getchar().
Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
Reviewed-by: Tom Rini <trini@konsulko.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'common/console.c')
| -rw-r--r-- | common/console.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/common/console.c b/common/console.c index 8e50af1..3348436 100644 --- a/common/console.c +++ b/common/console.c @@ -131,7 +131,7 @@ static int console_setfile(int file, struct stdio_dev * dev) */ switch (file) { case stdin: - gd->jt->getc = getc; + gd->jt->getc = getchar; gd->jt->tstc = tstc; break; case stdout: @@ -179,7 +179,7 @@ struct stdio_dev **console_devices[MAX_FILES]; int cd_count[MAX_FILES]; /* - * This depends on tstc() always being called before getc(). + * This depends on tstc() always being called before getchar(). * This is guaranteed to be true because this routine is called * only from fgetc() which assures it. * No attempt is made to demultiplex multiple input sources. @@ -404,7 +404,7 @@ int fprintf(int file, const char *fmt, ...) /** U-Boot INITIAL CONSOLE-COMPATIBLE FUNCTION *****************************/ -int getc(void) +int getchar(void) { #ifdef CONFIG_DISABLE_CONSOLE if (gd->flags & GD_FLG_DISABLE_CONSOLE) @@ -663,7 +663,7 @@ int ctrlc(void) { if (!ctrlc_disabled && gd->have_console) { if (tstc()) { - switch (getc()) { + switch (getchar()) { case 0x03: /* ^C - Control C */ ctrlc_was_pressed = 1; return 1; @@ -685,10 +685,10 @@ int confirm_yesno(void) /* Flush input */ while (tstc()) - getc(); + getchar(); i = 0; while (i < sizeof(str_input)) { - str_input[i] = getc(); + str_input[i] = getchar(); putc(str_input[i]); if (str_input[i] == '\r') break; |