Cleanups: Remove code handling K&R-style varargs.
It should be a safe enough bet that any C++ compiler can handle STDC-style varargs.
This patch removes all the (mostly spaghetti) code which used to handle K&R-style varargs calls.
char buf[BUFSIZ];
va_list args;
va_start(args, fmt);
- #else
- snmplib_debug(va_alist)
- va_dcl {
- va_list args;
- int lvl;
- char char *fmt;
- char buf[BUFSIZ];
- va_start(args);
- lvl = va_arg(args, int);
- fmt = va_arg(args, char *);
- #endif
++
if (snmplib_debug_hook != NULL) {
- vsnprintf(buf, BUFSIZ, fmt, args);
- snmplib_debug_hook(lvl, buf);
+ vsnprintf(buf, BUFSIZ, fmt, args);
+ snmplib_debug_hook(lvl, buf);
} else {
- vfprintf(stderr, fmt, args);
+ vfprintf(stderr, fmt, args);
}
va_end(args);
}
#ifdef _SQUID_MSWIN_
SQUIDCEXTERN LPCRITICAL_SECTION dbg_mutex;
typedef BOOL (WINAPI * PFInitializeCriticalSectionAndSpinCount) (LPCRITICAL_SECTION, DWORD);
--
#endif
void
- #if STDC_HEADERS
_db_print(const char *format,...)
{
- #else
- _db_print(va_alist)
- va_dcl {
- const char *format = NULL;
- #endif
--
LOCAL_ARRAY(char, f, BUFSIZ);
va_list args1;
- #if STDC_HEADERS
--
va_list args2;
va_list args3;
- #else
- #define args2 args1
- #define args3 args1
- #endif
++
#ifdef _SQUID_MSWIN_
/* Multiple WIN32 threads may call this simultaneously */
EnterCriticalSection(dbg_mutex);
#endif
-- /* give a chance to context-based debugging to print current context */
++ /* give a chance to context-based debugging to print current context */
if (!Ctx_Lock)
ctx_print();
- #if STDC_HEADERS
--
va_start(args1, format);
--
va_start(args2, format);
--
va_start(args3, format);
- #else
-
- format = va_arg(args1, const char *);
-
- #endif
--
snprintf(f, BUFSIZ, "%s| %s",
debugLogTime(),
format);
_db_print_file(f, args1);
--
_db_print_stderr(f, args2);
#if HAVE_SYSLOG
--
_db_print_syslog(format, args3);
--
#endif
--#ifdef _SQUID_MSWIN_
++#ifdef _SQUID_MSWIN_
LeaveCriticalSection(dbg_mutex);
--
#endif
va_end(args1);
--
- #if STDC_HEADERS
--
va_end(args2);
--
va_end(args3);
--
- #endif
}
static void
{
va_list args;
va_start(args, fmt);
- #else
- void
- fatalf(va_alist)
- va_dcl {
- va_list args;
- const char *fmt = NULL;
- va_start(args);
- fmt = va_arg(args, char *);
- #endif
--
fatalvf(fmt, args);
va_end(args);
}
_db_print_stderr(const char *format, va_list args);
void
- #if STDC_HEADERS
_db_print(const char *format,...)
{
- #else
- _db_print(va_alist)
- va_dcl {
- const char *format = NULL;
- #endif
--
LOCAL_ARRAY(char, f, BUFSIZ);
va_list args1;
- #if STDC_HEADERS
--
va_list args2;
va_list args3;
- #else
- #define args2 args1
- #define args3 args1
- #endif
-
- #if STDC_HEADERS
va_start(args1, format);
--
va_start(args2, format);
--
va_start(args3, format);
- #else
-
- format = va_arg(args1, const char *);
-
- #endif
-
snprintf(f, BUFSIZ, "%s| %s",
"stub time", //debugLogTime(squid_curtime),
format);
_db_print_stderr(f, args2);
va_end(args1);
-
- #if STDC_HEADERS
--
va_end(args2);
--
va_end(args3);
-
- #endif
}
static void
fatalf(const char *fmt,...) {
va_list args;
va_start(args, fmt);
- #else
- void
- fatalf(va_alist)
- va_dcl {
- va_list args;
- const char *fmt = NULL;
- va_start(args);
- fmt = va_arg(args, char *);
- #endif
--
fatalvf(fmt, args);
va_end(args);
}