All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Milan P. Stanić" <mps@arvanta.net>
To: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>
Cc: Simon Glass <sjg@chromium.org>, u-boot@lists.denx.de
Subject: Re: [PATCH 1/1] sandbox: compatibility of os_get_filesize()
Date: Tue, 11 Jan 2022 19:18:49 +0100	[thread overview]
Message-ID: <Yd3KCVYQxmrqREF4@m1> (raw)
In-Reply-To: <20220111005024.179632-1-heinrich.schuchardt@canonical.com>

On Tue, 2022-01-11 at 01:50, Heinrich Schuchardt wrote:
> U-Boot define loff_t as long long. But the header
> /usr/include/linux/types.h may not define it.
> This has lead to a build error on Alpine Linux.
> 
> So let's use long long instead of loff_t for
> the size parameter of function os_get_filesize().
> 
> Reported-by: Milan P. Stanić <mps@arvanta.net>
> Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>
Tested-by: Milan P. Stanić <mps@arvanta.net>

> ---
>  arch/sandbox/cpu/os.c | 10 ++++++++--
>  include/os.h          |  2 +-
>  2 files changed, 9 insertions(+), 3 deletions(-)
> 
> diff --git a/arch/sandbox/cpu/os.c b/arch/sandbox/cpu/os.c
> index 6837bfceaf..40ebe322ae 100644
> --- a/arch/sandbox/cpu/os.c
> +++ b/arch/sandbox/cpu/os.c
> @@ -624,7 +624,13 @@ const char *os_dirent_get_typename(enum os_dirent_t type)
>  	return os_dirent_typename[OS_FILET_UNKNOWN];
>  }
>  
> -int os_get_filesize(const char *fname, loff_t *size)
> +/*
> + * For compatibility reasons avoid loff_t here.
> + * U-Boot defines loff_t as long long.
> + * But /usr/include/linux/types.h may not define it at all.
> + * Alpine Linux being one example.
> + */
> +int os_get_filesize(const char *fname, long long *size)
>  {
>  	struct stat buf;
>  	int ret;
> @@ -667,7 +673,7 @@ int os_read_ram_buf(const char *fname)
>  {
>  	struct sandbox_state *state = state_get_current();
>  	int fd, ret;
> -	loff_t size;
> +	long long size;
>  
>  	ret = os_get_filesize(fname, &size);
>  	if (ret < 0)
> diff --git a/include/os.h b/include/os.h
> index 4cbcbd93a7..10e198cf50 100644
> --- a/include/os.h
> +++ b/include/os.h
> @@ -266,7 +266,7 @@ const char *os_dirent_get_typename(enum os_dirent_t type);
>   * @size:	size of file is returned if no error
>   * Return:	0 on success or -1 if an error ocurred
>   */
> -int os_get_filesize(const char *fname, loff_t *size);
> +int os_get_filesize(const char *fname, long long *size);
>  
>  /**
>   * os_putc() - write a character to the controlling OS terminal
> -- 
> 2.33.1
> 

  reply	other threads:[~2022-01-11 19:57 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-01-11  0:50 [PATCH 1/1] sandbox: compatibility of os_get_filesize() Heinrich Schuchardt
2022-01-11 18:18 ` Milan P. Stanić [this message]
2022-01-11 18:19 ` Simon Glass
2022-01-13 18:00   ` Simon Glass

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=Yd3KCVYQxmrqREF4@m1 \
    --to=mps@arvanta.net \
    --cc=heinrich.schuchardt@canonical.com \
    --cc=sjg@chromium.org \
    --cc=u-boot@lists.denx.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.