From aa783f9a7b774d67487daa9376095738aef5cf88 Mon Sep 17 00:00:00 2001 From: Fangrui Song Date: Wed, 20 Oct 2021 14:22:43 -0700 Subject: 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: 4b962c9e859de23b461d61f860dbd3f21311e83a ("linux: Simplify opendir buffer allocation") --- sysdeps/unix/sysv/linux/opendir.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'sysdeps/unix/sysv') diff --git a/sysdeps/unix/sysv/linux/opendir.c b/sysdeps/unix/sysv/linux/opendir.c index 48f254d169..6874f796d3 100644 --- a/sysdeps/unix/sysv/linux/opendir.c +++ b/sysdeps/unix/sysv/linux/opendir.c @@ -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) -- cgit 1.4.1