mirrors/u-boot
0
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2024-11-23 20:24:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

sandbox: compatibility of os_get_filesize()

Browse Source 
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>
Reviewed-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Heinrich Schuchardt 2022-01-11 01:50:24 +01:00 committed by Simon Glass
parent dca7926c2c
commit 880dbc5f80
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
arch/sandbox/cpu/os.c
View File

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

2
include/os.h
View File

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