123456789101112131415161718192021222324252627282930313233343536 |
- From dab02796780f00d689cc1c7a0ba81abe7c5f28d0 Mon Sep 17 00:00:00 2001
- From: Khem Raj <raj.khem@gmail.com>
- Date: Fri, 21 Jan 2022 15:15:11 -0800
- Subject: [PATCH] pass correct parameters to getdents64
- Fixes
- ../git/src/basic/recurse-dir.c:57:40: error: incompatible pointer types passing 'uint8_t *' (aka 'unsigned char *') to parameter of type 'struct dirent *' [-Werror,-Wincompatible-pointer-types]
- n = getdents64(dir_fd, (uint8_t*) de->buffer + de->buffer_size, bs - de->buffer_size);
- ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- ../git/src/basic/stat-util.c:102:28: error: incompatible pointer types passing 'union (unnamed union at ../git/src/basic/stat-util.c:78:9) *' to parameter of type 'struct dirent *' [-Werror,-Wincompatible-pointer-types]
- n = getdents64(fd, &buffer, sizeof(buffer));
- ^~~~~~~
- Upstream-Status: Inappropriate [musl specific]
- Signed-off-by: Khem Raj <raj.khem@gmail.com>
- Signed-off-by: Jiaqing Zhao <jiaqing.zhao@linux.intel.com>
- ---
- src/basic/recurse-dir.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
- diff --git a/src/basic/recurse-dir.c b/src/basic/recurse-dir.c
- index efa1797b7b..03ff10ebe9 100644
- --- a/src/basic/recurse-dir.c
- +++ b/src/basic/recurse-dir.c
- @@ -54,7 +54,7 @@ int readdir_all(int dir_fd,
- bs = MIN(MALLOC_SIZEOF_SAFE(de) - offsetof(DirectoryEntries, buffer), (size_t) SSIZE_MAX);
- assert(bs > de->buffer_size);
-
- - n = getdents64(dir_fd, (uint8_t*) de->buffer + de->buffer_size, bs - de->buffer_size);
- + n = getdents64(dir_fd, (struct dirent*)((uint8_t*) de->buffer + de->buffer_size), bs - de->buffer_size);
- if (n < 0)
- return -errno;
- if (n == 0)
|