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>
This commit is contained in:
committed by
Tom Rini
parent
8d5d97cb28
commit
c670aeee3d
@@ -705,7 +705,7 @@ phys_size_t __fsl_ddr_sdram(fsl_ddr_info_t *pinfo)
|
||||
|
||||
/* Compute it once normally. */
|
||||
#ifdef CONFIG_FSL_DDR_INTERACTIVE
|
||||
if (tstc() && (getc() == 'd')) { /* we got a key press of 'd' */
|
||||
if (tstc() && (getchar() == 'd')) { /* we got a key press of 'd' */
|
||||
total_memory = fsl_ddr_interactive(pinfo, 0);
|
||||
} else if (fsl_ddr_interactive_env_var_exists()) {
|
||||
total_memory = fsl_ddr_interactive(pinfo, 1);
|
||||
|
||||
@@ -394,7 +394,7 @@ bool stm32mp1_ddr_interactive(void *priv,
|
||||
unsigned long start = get_timer(0);
|
||||
|
||||
while (1) {
|
||||
if (tstc() && (getc() == 'd')) {
|
||||
if (tstc() && (getchar() == 'd')) {
|
||||
next_step = STEP_DDR_RESET;
|
||||
break;
|
||||
}
|
||||
|
||||
@@ -413,7 +413,7 @@ static int on_baudrate(const char *name, const char *value, enum env_op op,
|
||||
|
||||
if ((flags & H_INTERACTIVE) != 0)
|
||||
while (1) {
|
||||
if (getc() == '\r')
|
||||
if (getchar() == '\r')
|
||||
break;
|
||||
}
|
||||
|
||||
|
||||
@@ -90,7 +90,7 @@ static int on_baudrate(const char *name, const char *value, enum env_op op,
|
||||
|
||||
if ((flags & H_INTERACTIVE) != 0)
|
||||
while (1) {
|
||||
if (getc() == '\r')
|
||||
if (getchar() == '\r')
|
||||
break;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user