linux: Fix a possibly non-constant expression in _Static_assert
According to C11 6.6p6, `const int` as an operand may not make up a
constant expression. GCC -O0 errors:
../sysdeps/unix/sysv/linux/opendir.c:107:19: error: static_assert expression is not an integral constant expression
_Static_assert (allocation_size >= sizeof (struct dirent64),
-O2 -Wpedantic has a similar warning.
See https://gcc.gnu.org/PR102502 for GCC's inconsistency.
Use enum which is guaranteed to be a constant expression.
This also makes the file compilable with Clang.
Fixes: 4b962c9e85
("linux: Simplify opendir buffer allocation")
This commit is contained in:
parent
d962cce139
commit
aa783f9a7b
|
@ -103,14 +103,14 @@ __alloc_dir (int fd, bool close_fd, int flags,
|
|||
file system provides a bogus value. */
|
||||
enum { max_buffer_size = 1048576 };
|
||||
|
||||
const size_t allocation_size = 32768;
|
||||
enum { allocation_size = 32768 };
|
||||
_Static_assert (allocation_size >= sizeof (struct dirent64),
|
||||
"allocation_size < sizeof (struct dirent64)");
|
||||
|
||||
/* Increase allocation if requested, but not if the value appears to
|
||||
be bogus. It will be between 32Kb and 1Mb. */
|
||||
size_t allocation = MIN (MAX ((size_t) statp->st_blksize, allocation_size),
|
||||
max_buffer_size);
|
||||
size_t allocation = MIN (MAX ((size_t) statp->st_blksize, (size_t)
|
||||
allocation_size), (size_t) max_buffer_size);
|
||||
|
||||
DIR *dirp = (DIR *) malloc (sizeof (DIR) + allocation);
|
||||
if (dirp == NULL)
|
||||
|
|
Loading…
Reference in a new issue