Removed code handling K&R-style varargs.

It shouldn't be needed in c++-land..

diff --git a/include/fatal.h b/include/fatal.h
index 951053a00b7ed1d682431fe16bdbcedbe31f1e40..e0b2fee3fe115f64d537c04dd5cc3e1fc390880d 100644 (file)
--- a/include/fatal.h
+++ b/include/fatal.h
@@ -4,12 +4,7 @@
 #include "config.h"
 
 SQUIDCEXTERN void fatal(const char *message);
-#if STDC_HEADERS
-SQUIDCEXTERN void
-fatalf(const char *fmt,...) PRINTF_FORMAT_ARG1;
-#else
-SQUIDCEXTERN void fatalf();
-#endif
+SQUIDCEXTERN void fatalf(const char *fmt,...) PRINTF_FORMAT_ARG1;
 SQUIDCEXTERN void fatal_dump(const char *message);
 
 #endif

diff --git a/include/snmp_debug.h b/include/snmp_debug.h
index 4dafa0f3969894afd72dcdcfedd4f244105973f7..f7006ed10919fa63cfd655ad33c690b7cbbb585e 100644 (file)
--- a/include/snmp_debug.h
+++ b/include/snmp_debug.h
@@ -6,10 +6,6 @@
 
 #include "config.h"
 
-#if STDC_HEADERS
 SQUIDCEXTERN void snmplib_debug(int, const char *,...) PRINTF_FORMAT_ARG2;
-#else
-SQUIDCEXTERN void snmplib_debug(va_alist);
-#endif
 
 #endif /* SQUID_SNMP_DEBUG_H */

diff --git a/snmplib/snmplib_debug.c b/snmplib/snmplib_debug.c
index 9b3ada60b37e7298ef7a420d61439956b8e23de0..ccf84dbc729a271e2b146fc335af6512ea8dcb60 100644 (file)
--- a/snmplib/snmplib_debug.c
+++ b/snmplib/snmplib_debug.c
@@ -5,39 +5,18 @@
 #if HAVE_SYS_TYPES_H
 #include <sys/types.h>
 #endif
-#if STDC_HEADERS
 #include <stdarg.h>
-#else
-#include <varargs.h>
-#endif
 
 #include "snmp_debug.h"
 
-#if STDC_HEADERS
 void (*snmplib_debug_hook) (int, char *,...) = NULL;
-#else
-void (*snmplib_debug_hook) (va_alist) = NULL;
-#endif
 
 extern void
-#if STDC_HEADERS
 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);

diff --git a/src/HttpHeaderTools.cc b/src/HttpHeaderTools.cc
index 17ac5322942e58fb0dd381428b5d971aa44209e6..80af84c246185cd128d7d3271e61a720d893a1de 100644 (file)
--- a/src/HttpHeaderTools.cc
+++ b/src/HttpHeaderTools.cc
@@ -103,27 +103,10 @@ httpHeaderCalcMask(HttpHeaderMask * mask, http_hdr_type http_hdr_type_enums[], s
 
 /* same as httpHeaderPutStr, but formats the string using snprintf first */
 void
-#if STDC_HEADERS
 httpHeaderPutStrf(HttpHeader * hdr, http_hdr_type id, const char *fmt,...)
-#else
-httpHeaderPutStrf(va_alist)
-va_dcl
-#endif
 {
-#if STDC_HEADERS
     va_list args;
     va_start(args, fmt);
-#else
-
-    va_list args;
-    HttpHeader *hdr = NULL;
-    http_hdr_type id = HDR_ENUM_END;
-    const char *fmt = NULL;
-    va_start(args);
-    hdr = va_arg(args, HttpHeader *);
-    id = va_arg(args, http_hdr_type);
-    fmt = va_arg(args, char *);
-#endif
 
     httpHeaderPutStrvf(hdr, id, fmt, args);
     va_end(args);

diff --git a/src/MemBuf.cc b/src/MemBuf.cc
index b08cb7d8a77782f9143d43a1b4daab4112a3de2b..9ac200cec5a58f9bfe713057dcce89639e24ea88 100644 (file)
--- a/src/MemBuf.cc
+++ b/src/MemBuf.cc
@@ -270,23 +270,11 @@ void MemBuf::terminate()
 }
 
 /* calls memBufVPrintf */
-#if STDC_HEADERS
 void
 MemBuf::Printf(const char *fmt,...)
 {
     va_list args;
     va_start(args, fmt);
-#else
-void
-MemBuf::Printf(va_alist)
-va_dcl
-{
-    va_list args;
-    mb_size_t sz = 0;
-    va_start(args);
-    const char *fmt = va_arg(args, char *);
-#endif
-
     vPrintf(fmt, args);
     va_end(args);
 }

diff --git a/src/MemBuf.h b/src/MemBuf.h
index 10ab7e0dba5a0aa32bc5cd9d5f17ba86a47a1863..121b6efb80f3399ae8ccf8a46724cbd57b0c946b 100644 (file)
--- a/src/MemBuf.h
+++ b/src/MemBuf.h
@@ -105,23 +105,12 @@ public:
     /** unfirtunate hack to test if the buffer has been Init()ialized */
     int isNull();
 
-#if STDC_HEADERS
-
     /**
      * calls snprintf, extends buffer if needed
      \note  we use Printf instead of printf so the compiler won't
      *      think we're calling the libc printf()
      */
     void Printf(const char *fmt,...) PRINTF_FORMAT_ARG2;
-#else
-
-    /**
-     * calls snprintf, extends buffer if needed
-     \note  we use Printf instead of printf so the compiler won't
-     *      think we're calling the libc printf()
-     */
-    void Printf();
-#endif
 
     /** vPrintf for other printf()'s to use */
     void vPrintf(const char *fmt, va_list ap);

diff --git a/src/Packer.cc b/src/Packer.cc
index 7280cd3a30ffccdd33b1ac3312e570eac8091831..62191f46bafb7140dfbcfd16b7b8f98720b3781c 100644 (file)
--- a/src/Packer.cc
+++ b/src/Packer.cc
@@ -167,25 +167,11 @@ packerAppend(Packer * p, const char *buf, int sz)
     p->append(p->real_handler, buf, sz);
 }
 
-#if STDC_HEADERS
 void
 packerPrintf(Packer * p, const char *fmt,...)
 {
     va_list args;
     va_start(args, fmt);
-#else
-void
-packerPrintf(va_alist)
-va_dcl
-{
-    va_list args;
-    Packer *p = NULL;
-    const char *fmt = NULL;
-    int sz = 0;
-    va_start(args);
-    p = va_arg(args, Packer *);
-    fmt = va_arg(args, char *);
-#endif
 
     assert(p);
     assert(p->real_handler && p->packer_vprintf);

diff --git a/src/Packer.h b/src/Packer.h
index 068f9c6dc52f24a249ba91e0caa472d860a7e14f..bb97da146a2211f7c1603edb9a773e3bed8e2d2b 100644 (file)
--- a/src/Packer.h
+++ b/src/Packer.h
@@ -46,11 +46,7 @@ typedef void (*ObjPackMethod) (void *obj, Packer * p);
 #endif
 /* append/vprintf's for Packer */
 typedef void (*append_f) (void *, const char *buf, int size);
-#if STDC_HEADERS
 typedef void (*vprintf_f) (void *, const char *fmt, va_list args);
-#else
-typedef void (*vprintf_f) ();
-#endif
 
 
 class Packer
@@ -65,11 +61,7 @@ public:
 
 SQUIDCEXTERN void packerClean(Packer * p);
 SQUIDCEXTERN void packerAppend(Packer * p, const char *buf, int size);
-#if STDC_HEADERS
 SQUIDCEXTERN void
 packerPrintf(Packer * p, const char *fmt,...) PRINTF_FORMAT_ARG2;
-#else
-SQUIDCEXTERN void packerPrintf();
-#endif
 
 #endif /* SQUID_PACKER_H */

diff --git a/src/Store.h b/src/Store.h
index da432a0dd9f7b2985fde473758f016be0f8366f5..ecde464cfc7691864df075f978108459a9a516e0 100644 (file)
--- a/src/Store.h
+++ b/src/Store.h
@@ -347,13 +347,8 @@ SQUIDCEXTERN void storeFreeMemory(void);
 /// \ingroup StoreAPI
 SQUIDCEXTERN int expiresMoreThan(time_t, time_t);
 
-#if STDC_HEADERS
 /// \ingroup StoreAPI
 SQUIDCEXTERN void storeAppendPrintf(StoreEntry *, const char *,...) PRINTF_FORMAT_ARG2;
-#else
-/// \ingroup StoreAPI
-SQUIDCEXTERN void storeAppendPrintf();
-#endif
 
 /// \ingroup StoreAPI
 SQUIDCEXTERN void storeAppendVPrintf(StoreEntry *, const char *, va_list ap);

diff --git a/src/debug.cc b/src/debug.cc
index 25d15ee06b098272ce98498a0a93893a5878f455..dc294cc81e7c73e9b39516c94165f03bc64f63ad 100644 (file)
--- a/src/debug.cc
+++ b/src/debug.cc
@@ -61,26 +61,14 @@ typedef BOOL (WINAPI * PFInitializeCriticalSectionAndSpinCount) (LPCRITICAL_SECT
 #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 */
 
@@ -119,7 +107,6 @@ va_dcl
     if (!Ctx_Lock)
         ctx_print();
 
-#if STDC_HEADERS
 
     va_start(args1, format);
 
@@ -127,11 +114,6 @@ va_dcl
 
     va_start(args3, format);
 
-#else
-
-    format = va_arg(args1, const char *);
-
-#endif
 
     snprintf(f, BUFSIZ, "%s| %s",
              debugLogTime(),
@@ -154,13 +136,11 @@ va_dcl
 
     va_end(args1);
 
-#if STDC_HEADERS
 
     va_end(args2);
 
     va_end(args3);
 
-#endif
 }
 
 static void

diff --git a/src/logfile.cc b/src/logfile.cc
index 7762c56ef0023c5de0cfa0b324bbabb6cca6010e..4f79bfc6f4606e94560b3e44663f24d5b08a90f4 100644 (file)
--- a/src/logfile.cc
+++ b/src/logfile.cc
@@ -258,27 +258,13 @@ logfileWrite(Logfile * lf, void *buf, size_t len)
 }
 
 void
-#if STDC_HEADERS
 logfilePrintf(Logfile * lf, const char *fmt,...)
-#else
-logfilePrintf(va_alist)
-va_dcl
-#endif
 {
     va_list args;
     char buf[8192];
     int s;
-#if STDC_HEADERS
 
     va_start(args, fmt);
-#else
-
-    Logfile *lf;
-    const char *fmt;
-    va_start(args);
-    lf = va_arg(args, Logfile *);
-    fmt = va_arg(args, char *);
-#endif
 
     s = vsnprintf(buf, 8192, fmt, args);
 

diff --git a/src/protos.h b/src/protos.h
index 313358bace63e7b9723f4c55aedd902c66f19e33..9d14e123cd77caada84c06a447986eebadea28a9 100644 (file)
--- a/src/protos.h
+++ b/src/protos.h
@@ -104,11 +104,7 @@ SQUIDCEXTERN void _db_set_syslog(const char *facility);
 SQUIDCEXTERN void _db_init(const char *logfile, const char *options);
 SQUIDCEXTERN void _db_rotate_log(void);
 
-#if STDC_HEADERS
 SQUIDCEXTERN void _db_print(const char *,...) PRINTF_FORMAT_ARG1;
-#else
-SQUIDCEXTERN void _db_print();
-#endif
 
 /* packs, then prints an object using debug() */
 SQUIDCEXTERN void debugObj(int section, int level, const char *label, void *obj, ObjPackMethod pm);
@@ -271,12 +267,8 @@ SQUIDCEXTERN int strListGetItem(const String * str, char del, const char **item,
 SQUIDCEXTERN const char *getStringPrefix(const char *str, const char *end);
 SQUIDCEXTERN int httpHeaderParseInt(const char *start, int *val);
 SQUIDCEXTERN int httpHeaderParseOffset(const char *start, int64_t * off);
-#if STDC_HEADERS
 SQUIDCEXTERN void
 httpHeaderPutStrf(HttpHeader * hdr, http_hdr_type id, const char *fmt,...) PRINTF_FORMAT_ARG3;
-#else
-SQUIDCEXTERN void httpHeaderPutStrf();
-#endif
 
 
 /* Http Header */
@@ -587,12 +579,7 @@ SQUIDCEXTERN const char *uniqueHostname(void);
 SQUIDCEXTERN void safeunlink(const char *path, int quiet);
 SQUIDCEXTERN void death(int sig);
 SQUIDCEXTERN void fatal(const char *message);
-#if STDC_HEADERS
-SQUIDCEXTERN void
-fatalf(const char *fmt,...) PRINTF_FORMAT_ARG1;
-#else
-SQUIDCEXTERN void fatalf();
-#endif
+SQUIDCEXTERN void fatalf(const char *fmt,...) PRINTF_FORMAT_ARG1;
 SQUIDCEXTERN void fatal_dump(const char *message);
 SQUIDCEXTERN void sigusr2_handle(int sig);
 SQUIDCEXTERN void sig_child(int sig);
@@ -739,12 +726,7 @@ SQUIDCEXTERN void logfileClose(Logfile * lf);
 SQUIDCEXTERN void logfileRotate(Logfile * lf);
 SQUIDCEXTERN void logfileWrite(Logfile * lf, void *buf, size_t len);
 SQUIDCEXTERN void logfileFlush(Logfile * lf);
-#if STDC_HEADERS
-SQUIDCEXTERN void
-logfilePrintf(Logfile * lf, const char *fmt,...) PRINTF_FORMAT_ARG2;
-#else
-SQUIDCEXTERN void logfilePrintf(va_alist);
-#endif
+SQUIDCEXTERN void logfilePrintf(Logfile * lf, const char *fmt,...) PRINTF_FORMAT_ARG2;
 
 /*
  * prototypes for system functions missing from system includes

diff --git a/src/snmp_core.cc b/src/snmp_core.cc
index 5a57973f5d9bb4af555f15f8bcb2e133debac30f..beea26fc161ba89235de4841218822704f0099a9 100644 (file)
--- a/src/snmp_core.cc
+++ b/src/snmp_core.cc
@@ -61,13 +61,8 @@ struct _mib_tree_entry
 mib_tree_entry *mib_tree_head;
 mib_tree_entry *mib_tree_last;
 
-#if STDC_HEADERS
 static mib_tree_entry *snmpAddNode(oid * name, int len, oid_ParseFn * parsefunction, instance_Fn * instancefunction, int children,...);
 static oid *snmpCreateOid(int length,...);
-#else
-static mib_tree_entry *snmpAddNode();
-static oid *snmpCreateOid();
-#endif
 SQUIDCEXTERN void (*snmplib_debug_hook) (int, char *);
 static oid *static_Inst(oid * name, snint * len, mib_tree_entry * current, oid_ParseFn ** Fn);
 static oid *time_Inst(oid * name, snint * len, mib_tree_entry * current, oid_ParseFn ** Fn);
@@ -990,33 +985,12 @@ snmpTreeEntry(oid entry, snint len, mib_tree_entry * current)
  * Adds a node to the MIB tree structure and adds the appropriate children
  */
 static mib_tree_entry *
-#if STDC_HEADERS
 snmpAddNode(oid * name, int len, oid_ParseFn * parsefunction, instance_Fn * instancefunction, int children,...)
-#else
-snmpAddNode(va_alist)
-va_dcl
-#endif
 {
-#if STDC_HEADERS
     va_list args;
     int loop;
     mib_tree_entry *entry = NULL;
     va_start(args, children);
-#else
-
-    va_list args;
-    oid *name = NULL;
-    int len = 0, children = 0, loop;
-    oid_ParseFn *parsefunction = NULL;
-    instance_Fn *instancefunction = NULL;
-    mib_tree_entry *entry = NULL;
-    va_start(args);
-    name = va_arg(args, oid *);
-    len = va_arg(args, int);
-    parsefunction = va_arg(args, oid_ParseFn *);
-    instancefunction = va_arg(args, instance_Fn *);
-    children = va_arg(args, int);
-#endif
 
     debugs(49, 6, "snmpAddNode: Children : " << children << ", Oid : ");
     snmpDebugOid(6, name, len);
@@ -1047,26 +1021,12 @@ va_dcl
  * Returns the list of parameters in an oid
  */
 static oid *
-#if STDC_HEADERS
 snmpCreateOid(int length,...)
-#else
-snmpCreateOid(va_alist)
-va_dcl
-#endif
 {
-#if STDC_HEADERS
     va_list args;
     oid *new_oid;
     int loop;
     va_start(args, length);
-#else
-
-    va_list args;
-    int length = 0, loop;
-    oid *new_oid;
-    va_start(args);
-    length va_arg(args, int);
-#endif
 
     new_oid = (oid *)xmalloc(sizeof(oid) * length);
 

diff --git a/src/store.cc b/src/store.cc
index 33a5aaea96fabb8f29f8b9e190007051d6e7e4e6..c2d0831a570d676b2dcd814d2425ca22f9e21d7e 100644 (file)
--- a/src/store.cc
+++ b/src/store.cc
@@ -857,25 +857,10 @@ StoreEntry::append(char const *buf, int len)
 
 
 void
-#if STDC_HEADERS
 storeAppendPrintf(StoreEntry * e, const char *fmt,...)
-#else
-storeAppendPrintf(va_alist)
-va_dcl
-#endif
 {
-#if STDC_HEADERS
     va_list args;
     va_start(args, fmt);
-#else
-
-    va_list args;
-    StoreEntry *e = NULL;
-    const char *fmt = NULL;
-    va_start(args);
-    e = va_arg(args, StoreEntry *);
-    fmt = va_arg(args, char *);
-#endif
 
     storeAppendVPrintf(e, fmt, args);
     va_end(args);

diff --git a/src/tests/stub_store.cc b/src/tests/stub_store.cc
index fd28bcb1bf88f0bdccd00b55d14054124f4397b1..f0dc3166cde9bc728c32639a6825250caa3ea27e 100644 (file)
--- a/src/tests/stub_store.cc
+++ b/src/tests/stub_store.cc
@@ -38,18 +38,13 @@
 StorePointer Store::CurrentRoot = NULL;
 
 extern "C" void
-#if STDC_HEADERS
-    storeAppendPrintf(StoreEntry * e, const char *fmt,...)
-#else
-    storeAppendPrintf(va_alist)
-    va_dcl
-#endif
+storeAppendPrintf(StoreEntry * e, const char *fmt,...)
 {
     fatal("Not implemented");
 }
 
 extern "C" void
-    storeAppendVPrintf(StoreEntry * e, const char *fmt, va_list vargs)
+storeAppendVPrintf(StoreEntry * e, const char *fmt, va_list vargs)
 {
     fatal("Not implemented");
 }

diff --git a/src/tools.cc b/src/tools.cc
index f2cc309fbc6d0a400bae0fcf871c009144782fb5..39548c645ed2940e95d45797af15ac889d59f7f7 100644 (file)
--- a/src/tools.cc
+++ b/src/tools.cc
@@ -493,22 +493,11 @@ fatal(const char *message)
 }
 
 /* printf-style interface for fatal */
-#if STDC_HEADERS
 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);

diff --git a/test-suite/test_tools.cc b/test-suite/test_tools.cc
index b77cca54e43a914f2ed0f9daa1f092f7bd1b672b..37281fbfd8357c6fd388f77fab16ef2047e2eb89 100644 (file)
--- a/test-suite/test_tools.cc
+++ b/test-suite/test_tools.cc
@@ -24,28 +24,14 @@ static void
 _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);
 
@@ -53,12 +39,6 @@ va_dcl
 
     va_start(args3, format);
 
-#else
-
-    format = va_arg(args1, const char *);
-
-#endif
-
     snprintf(f, BUFSIZ, "%s| %s",
              "stub time", //debugLogTime(squid_curtime),
              format);
@@ -67,13 +47,9 @@ va_dcl
 
     va_end(args1);
 
-#if STDC_HEADERS
-
     va_end(args2);
 
     va_end(args3);
-
-#endif
 }
 
 static void
@@ -108,21 +84,10 @@ fatalvf(const char *fmt, va_list args) {
 }
 
 /* printf-style interface for fatal */
-#if STDC_HEADERS
 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);