From 882b9dedef974f1cbc71093a64675819811b4b1f Mon Sep 17 00:00:00 2001 From: Ben Kaduk Date: Wed, 8 May 2013 12:51:31 -0400 Subject: [PATCH] Suppress nonliteral format string warning/error Clang doesn't like a nonliteral format string, and some kernel builds (e.g., freebsd) are done with -Werror. Use the standard workaround for FreeBSD and UKERNEL builds by calling vsnprintf() into a fixed buffer. Remove the !defined(AFS_LINUX26_ENV) check, as it duplicates a conditional around the entirety of osi_Panic(). Change-Id: If6287dd19604b78150c81febba8a59b73f56783c Reviewed-on: http://gerrit.openafs.org/9880 Tested-by: BuildBot Reviewed-by: D Brashear --- src/rx/rx_kcommon.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/rx/rx_kcommon.c b/src/rx/rx_kcommon.c index 3ca157c77..3d2314f5a 100644 --- a/src/rx/rx_kcommon.c +++ b/src/rx/rx_kcommon.c @@ -1295,7 +1295,7 @@ osi_Panic(char *msg, ...) icmn_err(CE_PANIC, msg, ap); va_end(ap); } -#elif defined(AFS_DARWIN80_ENV) || (defined(AFS_LINUX22_ENV) && !defined(AFS_LINUX_26_ENV)) +#elif defined(AFS_DARWIN80_ENV) || defined(AFS_LINUX22_ENV) || defined(AFS_FBSD_ENV) || defined(UKERNEL) char buf[256]; va_list ap; if (!msg) @@ -1305,7 +1305,7 @@ osi_Panic(char *msg, ...) vsnprintf(buf, sizeof(buf), msg, ap); va_end(ap); printf("%s", buf); - panic(buf); + panic("%s", buf); #else va_list ap; if (!msg) -- 2.39.5