From 9cc62beeb985745475ac7b3ecc5bf61c2fa06a9d Mon Sep 17 00:00:00 2001 From: Simon Wilkinson Date: Wed, 21 Jan 2009 14:32:27 +0000 Subject: [PATCH] darwin-no-vprintf-20090121 LICENSE IPL10 restore old behavior for mac client --- src/rx/rx_kcommon.c | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/src/rx/rx_kcommon.c b/src/rx/rx_kcommon.c index c2f1d98c2..1530cbee6 100644 --- a/src/rx/rx_kcommon.c +++ b/src/rx/rx_kcommon.c @@ -136,6 +136,18 @@ osi_Panic(char *msg, ...) if (!msg) msg = "Unknown AFS panic"; printf(msg, a1, a2, a3); + panic(msg); +#elif defined(AFS_DARWIN80_ENV) && !defined(AFS_DARWIN90_ENV) + char buf[256]; + va_list ap; + if (!msg) + msg = "Unknown AFS panic"; + + va_start(ap, msg); + vsnprintf(buf, sizeof(buf), msg, ap); + va_end(ap); + printf(buf); + panic(buf); #else va_list ap; if (!msg) @@ -143,11 +155,12 @@ osi_Panic(char *msg, ...) va_start(ap, msg); vprintf(msg, ap); -#endif -#ifdef AFS_LINUX20_ENV + va_end(ap); +# ifdef AFS_LINUX20_ENV * ((char *) 0) = 0; -#else +# else panic(msg); +# endif #endif } -- 2.39.5