From: Amos Jeffries <squid3@treenet.co.nz>
Date: Sun, 8 Feb 2009 00:02:47 +0000 (+1300)
Subject: Author: Francesco Chemolli <kinkie@squid-cache.org>
X-Git-Tag: SQUID_3_2_0_1~1209
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8d707f3daea7725e47dc16cdea86820b54a15f98;p=thirdparty%2Fsquid.git

Author: Francesco Chemolli <kinkie@squid-cache.org>
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.
---

8d707f3daea7725e47dc16cdea86820b54a15f98
diff --cc snmplib/snmplib_debug.c
index 63ca248f97,ccf84dbc72..8e398ccbdf
--- a/snmplib/snmplib_debug.c
+++ b/snmplib/snmplib_debug.c
@@@ -26,22 -17,11 +17,12 @@@ snmplib_debug(int lvl, const char *fmt,
      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);
  }
diff --cc src/debug.cc
index a37b929ca0,dc294cc81e..466e4820d5
--- a/src/debug.cc
+++ b/src/debug.cc
@@@ -57,29 -57,18 +57,16 @@@ static void _db_print_file(const char *
  #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 */
  
@@@ -112,53 -102,45 +99,33 @@@
  
      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
diff --cc src/tools.cc
index 05a458de15,39548c645e..320604d18f
--- a/src/tools.cc
+++ b/src/tools.cc
@@@ -499,16 -498,7 +498,6 @@@ 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);
  }
diff --cc test-suite/test_tools.cc
index 3762038478,37281fbfd8..02e33fb215
--- a/test-suite/test_tools.cc
+++ b/test-suite/test_tools.cc
@@@ -31,40 -24,21 +31,17 @@@ static voi
  _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);
@@@ -72,14 -46,10 +49,8 @@@
      _db_print_stderr(f, args2);
  
      va_end(args1);
- 
- #if STDC_HEADERS
--
      va_end(args2);
--
      va_end(args3);
- 
- #endif
  }
  
  static void
@@@ -119,16 -88,7 +89,6 @@@ voi
  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);
  }