[PATCH 1/1] common: rename getc() to getchar()

Simon Glass sjg at chromium.org
Wed Oct 7 23:26:45 CEST 2020


Hi Heinrich,

On Wed, 7 Oct 2020 at 10:12, Heinrich Schuchardt <xypron.glpk at gmx.de> wrote:
>
> 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.

Just a nit here. I don't think the issue is that getc() has different
parameters. I believe it is the fact that we are overriding the getc()
in the C library. It wouldn't help if we changed the parameters, for
example, as it is still wrong for it to call the U-Boot version.

>
> Rename our library symbol getc() to getchar().
>
> Signed-off-by: Heinrich Schuchardt <xypron.glpk at gmx.de>
> ---
>  api/api.c                                   |  2 +-
>  cmd/bootmenu.c                              |  4 +-
>  cmd/load.c                                  | 44 ++++++++++-----------
>  common/autoboot.c                           | 10 ++---
>  common/cli_readline.c                       |  4 +-
>  common/console.c                            | 12 +++---
>  common/spl/spl_ymodem.c                     |  2 +-
>  common/xyzModem.c                           |  2 +-
>  drivers/ddr/fsl/main.c                      |  2 +-
>  drivers/ram/stm32mp1/stm32mp1_interactive.c |  2 +-
>  drivers/serial/serial-uclass.c              |  2 +-
>  drivers/serial/serial.c                     |  2 +-
>  include/_exports.h                          |  2 +-
>  include/stdio.h                             |  2 +-
>  lib/charset.c                               |  2 +-
>  lib/efi_loader/efi_console.c                | 20 +++++-----
>  test/dm/usb.c                               |  2 +-
>  17 files changed, 58 insertions(+), 58 deletions(-)

Reviewed-by: Simon Glass <sjg at chromium.org>

Regards,
Simon


More information about the U-Boot mailing list