/* Don't call this debugging routine directly; use dpf */
void
-rxi_DebugPrint(char *format, int a1, int a2, int a3, int a4, int a5, int a6,
- int a7, int a8, int a9, int a10, int a11, int a12, int a13,
- int a14, int a15)
+rxi_DebugPrint(char *format, ...)
{
#ifdef AFS_NT40_ENV
char msg[512];
len = _snprintf(tformat, sizeof(tformat), "tid[%d] %s", GetCurrentThreadId(), format);
if (len > 0) {
- len = _snprintf(msg, sizeof(msg)-2,
- tformat, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10,
- a11, a12, a13, a14, a15);
+ len = _vsnprintf(msg, sizeof(msg)-2, tformat, ap);
if (len > 0) {
if (msg[len-1] != '\n') {
msg[len] = '\n';
OutputDebugString(msg);
}
}
+ va_end(ap);
#else
struct clock now;
+ va_list ap;
+
+ va_start(ap, format);
+
clock_GetTime(&now);
fprintf(rx_Log, " %u.%.3u:", (unsigned int)now.sec,
(unsigned int)now.usec / 1000);
- fprintf(rx_Log, format, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12,
- a13, a14, a15);
+ vfprintf(rx_Log, format, ap);
putc('\n', rx_Log);
+ va_end(ap);
#endif
}
#if !defined(AFS_LINUX26_ENV)
void
-osi_Panic(msg, a1, a2, a3)
- char *msg;
+osi_Panic(char *msg, ...)
{
+ va_list ap;
if (!msg)
msg = "Unknown AFS panic";
- printf(msg, a1, a2, a3);
+ va_start(ap, msg);
+ vprintf(msg, ap);
#ifdef AFS_LINUX20_ENV
* ((char *) 0) = 0;
#else
#include "rx/rx_globals.h"
#include "afs/afs_stats.h"
#include "h/errno.h"
+#include "stdarg.h"
#ifdef KERNEL
#include "afs/sysincludes.h"
#include "afsincludes.h"
#define osi_Assert(e) (void)((e) || (osi_AssertFailK(#e, __FILE__, __LINE__), 0))
#define osi_Msg printf)(
+#define osi_VMsg vprintf)(
#define osi_YieldIfPossible()
#define osi_WakeupAndYieldIfPossible(x) rx_Wakeup(x)
rx_securityConfigVariables type,
void *value);
-
-/* old style till varargs */
-#if 0
-void
-rxi_DebugPrint(char *format, int a1, int a2, int a3, int a4, int a5, int a6,
- int a7, int a8, int a9, int a10, int a11, int a12, int a13,
- int a14, int a15);
-void
-rxi_DebugInit(void);
-#else
-void rxi_DebugInit();
-void rxi_DebugPrint();
-#endif
+void rxi_DebugInit(void);
+void rxi_DebugPrint(char *format, ...);
/* rx_clock.c */
#if !defined(clock_Init)
#define osi_Assert(expr) \
do { if (!(expr)) { osi_AssertFailK(#expr, __FILE__, __LINE__); BUG(); } } while (0)
#else
-extern void osi_Panic(); /* leave without args till stdarg rewrite */
+extern void osi_Panic(char *fmt, ...);
#endif
extern int osi_utoa(char *buf, size_t len, unsigned long val);
extern void rxi_InitPeerParams(register struct rx_peer *pp);
}
void
-osi_Panic(msg, a1, a2, a3)
- char *msg;
+osi_Panic(char *msg, ...)
{
+ va_list ap;
+ va_start(ap, msg);
(osi_Msg "Fatal Rx error: ");
- (osi_Msg msg, a1, a2, a3);
+ (osi_VMsg msg, ap);
+ va_end(ap);
fflush(stderr);
fflush(stdout);
afs_abort();
#define osi_Assert(e) (void)((e) || (osi_AssertFailU(#e, __FILE__, __LINE__), 0))
#define osi_Msg fprintf)(stderr,
+#define osi_VMsg vfprintf)(stderr,
#endif /* RX_USER_INCLUDE */