From 2b42e781681a3024f3e50685a51293bd87d08f59 Mon Sep 17 00:00:00 2001 From: Derrick Brashear Date: Mon, 5 Apr 2010 00:42:04 -0400 Subject: [PATCH] panic generation update something weird, e.g. panic(cpu 0 caller 0x5c91c3d0): buf@/Users/shadow/Source/openafs/src/rx/rx_kcommon.c:1348 which came from an osi_Assert. not sure yet what the deal is, but attempt to make this less ambiguous and less likely to conflict with other macros. Change-Id: Iac27e89fc655d2b1ba6d04936e137060d8abd9c4 Reviewed-on: http://gerrit.openafs.org/1693 Tested-by: Derrick Brashear Reviewed-by: Derrick Brashear --- src/rx/rx_kcommon.c | 2 +- src/rx/rx_kernel.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/rx/rx_kcommon.c b/src/rx/rx_kcommon.c index d2bf5e0088..688c31ca11 100644 --- a/src/rx/rx_kcommon.c +++ b/src/rx/rx_kcommon.c @@ -1344,7 +1344,7 @@ osi_Panic(char *msg, ...) va_start(ap, msg); vsnprintf(buf, sizeof(buf), msg, ap); va_end(ap); - printf(buf); + printf("%s", buf); panic(buf); #else va_list ap; diff --git a/src/rx/rx_kernel.h b/src/rx/rx_kernel.h index b6ac7f4cf0..a7a0e94037 100644 --- a/src/rx/rx_kernel.h +++ b/src/rx/rx_kernel.h @@ -36,7 +36,7 @@ typedef struct socket *osi_socket; CM_TRACE_RXWAKE, ICL_TYPE_STRING, __FILE__, ICL_TYPE_INT32, __LINE__) extern int osi_utoa(char *buf, size_t len, unsigned long val); -#define osi_Assert(e) (void)((e) || (osi_AssertFailK(#e, __FILE__, __LINE__), 0)) +#define osi_Assert(exp) (void)((exp) || (osi_AssertFailK( #exp , __FILE__, __LINE__), 0)) #define osi_Msg printf)( #define osi_VMsg vprintf)(