From 590a621e164a09b9a435e12ef14800f55cf4805e Mon Sep 17 00:00:00 2001 From: Anastasia Klimchuk Date: Tue, 4 Apr 2023 19:21:01 +1000 Subject: tests: Fix mode_t argument conversion for va_arg Patch fixes the error: error: second argument to 'va_arg' is of promotable type 'mode_t' (aka 'unsigned short'); this va_arg has undefined behavior because arguments will be promoted to 'int' [-Werror,-Wvarargs] Discovered and tested on: FreeBSD clang version 13.0.0 gcc 8.3.0 "cc 8.3 [DragonFly] Release/2019-02-22" Also tested on: gcc 11.3.0 "cc (Ubuntu 11.3.0-1ubuntu1~22.04) 11.3.0" Change-Id: I95b7c8dafdf4e7664c48a952acd7f8eaedb59ba7 Signed-off-by: Anastasia Klimchuk Reviewed-on: https://review.coreboot.org/c/flashrom/+/74202 Reviewed-by: Peter Marheine Tested-by: build bot (Jenkins) Reviewed-by: Thomas Heijligen --- tests/tests.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'tests') diff --git a/tests/tests.c b/tests/tests.c index d296a9832..159b79f43 100644 --- a/tests/tests.c +++ b/tests/tests.c @@ -101,40 +101,40 @@ static int mock_open(const char *pathname, int flags, mode_t mode) int __wrap_open(const char *pathname, int flags, ...) { LOG_ME; - mode_t mode = 0; + int mode = 0; if (flags & O_CREAT) { va_list ap; va_start(ap, flags); - mode = va_arg(ap, mode_t); + mode = va_arg(ap, int); va_end(ap); } - return mock_open(pathname, flags, mode); + return mock_open(pathname, flags, (mode_t) mode); } int __wrap_open64(const char *pathname, int flags, ...) { LOG_ME; - mode_t mode = 0; + int mode = 0; if (flags & O_CREAT) { va_list ap; va_start(ap, flags); - mode = va_arg(ap, mode_t); + mode = va_arg(ap, int); va_end(ap); } - return mock_open(pathname, flags, mode); + return mock_open(pathname, flags, (mode_t) mode); } int __wrap___open64_2(const char *pathname, int flags, ...) { LOG_ME; - mode_t mode = 0; + int mode = 0; if (flags & O_CREAT) { va_list ap; va_start(ap, flags); - mode = va_arg(ap, mode_t); + mode = va_arg(ap, int); va_end(ap); } - return mock_open(pathname, flags, mode); + return mock_open(pathname, flags, (mode_t) mode); } int __wrap_ioctl(int fd, unsigned long int request, ...) -- cgit v1.2.3