s/()/(void)/

Fix ((void)) for varargs funcs

diff --git a/include/util.h b/include/util.h
index ddcc549eaa3714865607facd23d0e4e74743853c..1ac68580f9e5b0db0f2eeef1d7be271ed4931757 100644 (file)
--- a/include/util.h
+++ b/include/util.h
@@ -1,5 +1,5 @@
 /*
- * $Id: util.h,v 1.17 1996/09/16 17:22:02 wessels Exp $
+ * $Id: util.h,v 1.18 1996/09/17 02:29:36 wessels Exp $
  *
  * AUTHOR: Harvest Derived
  *
@@ -185,8 +185,8 @@ extern void log_errno2 __P((char *, int, char *));
 extern void Log __P((char *,...));
 extern void errorlog __P((char *,...));
 #else
-extern void Log __P((void));
-extern void errorlog __P((void));
+extern void Log __P(());
+extern void errorlog __P(());
 #endif /* __STRICT_ANSI__ */
 
 extern void Tolower __P((char *));

diff --git a/lib/Makefile.in b/lib/Makefile.in
index 27824f667b28eb60d42ddacf2538d43265d20985..3b01a30d0b5e0af5a7c18b2e8ca98c019097e627 100644 (file)
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -3,7 +3,7 @@
 #
 #  Darren Hardy, hardy@cs.colorado.edu, April 1994
 #
-#  $Id: Makefile.in,v 1.13 1996/09/12 03:23:59 wessels Exp $
+#  $Id: Makefile.in,v 1.14 1996/09/17 02:29:44 wessels Exp $
 #
 prefix         = @prefix@
 srcdir         = @srcdir@
@@ -47,7 +47,7 @@ libregex.a: $(REGEXOBJS)
        $(RANLIB) $@
 
 clean:
-       -rm -f $(UTILOBJS) $(REGEXOBJS) $(LIBS) core
+       -rm -f *.o $(LIBS) core
 
 realclean: clean
        -rm -f libregex.a

diff --git a/lib/base64.c b/lib/base64.c
index 8a8f14661e979c452e35d153e8860b8c544ab7ea..c63a60bd0a6d898fe725a8965dc2748f2fd903a1 100644 (file)
--- a/lib/base64.c
+++ b/lib/base64.c
@@ -7,12 +7,14 @@
 #include <stdlib.h>
 #endif
 
+static void base64_init __P((void));
+
 static int base64_initialized = 0;
 int base64_value[256];
 char base64_code[] = "ABCDEFGHIJKLMNOPQRSTUVWZYZabcdefghijklmnopqrstuvwxyz0123456789+/";
 
 static void
-base64_init()
+base64_init(void)
 {
     int i;
 

diff --git a/lib/getfullhostname.c b/lib/getfullhostname.c
index 9cf0ba6969e0a132ff9bd950016ec9a6aba3e795..70a972ca1181184e013f86c30d9d757e5bd1352e 100644 (file)
--- a/lib/getfullhostname.c
+++ b/lib/getfullhostname.c
@@ -1,6 +1,6 @@
 
 /*
- * $Id: getfullhostname.c,v 1.6 1996/09/14 08:50:47 wessels Exp $
+ * $Id: getfullhostname.c,v 1.7 1996/09/17 02:29:46 wessels Exp $
  *
  * DEBUG: 
  * AUTHOR: Harvest Derived
@@ -144,7 +144,7 @@
  *  to the gethost*() functions.
  */
 char *
-getfullhostname()
+getfullhostname(void)
 {
     struct hostent *hp = NULL;
     static char buf[SQUIDHOSTNAMELEN + 1];

diff --git a/lib/util.c b/lib/util.c
index 6baef1f79ae0794bb6fcc0e67649c4841516c55e..db35358b9a5231d506fe21f061174b8349720bf9 100644 (file)
--- a/lib/util.c
+++ b/lib/util.c
@@ -1,5 +1,5 @@
 /*
- * $Id: util.c,v 1.14 1996/09/15 07:04:02 wessels Exp $
+ * $Id: util.c,v 1.15 1996/09/17 02:29:47 wessels Exp $
  *
  * DEBUG: 
  * AUTHOR: Harvest Derived
@@ -146,7 +146,7 @@ static int malloc_sizes[DBG_MAXINDEX + 1];
 static int dbg_stat_init = 0;
 
 static void
-stat_init()
+stat_init(void)
 {
     int i;
     for (i = 0; i <= DBG_MAXINDEX; i++)
@@ -185,7 +185,7 @@ static void *P;
 static void *Q;
 
 static void
-check_init()
+check_init(void)
 {
     for (B = 0; B < DBG_ARRY_BKTS; B++) {
        for (I = 0; I < DBG_ARRY_SZ; I++) {
@@ -435,7 +435,7 @@ xstrdup(char *s)
  * xstrerror() - return sys_errlist[errno];
  */
 char *
-xstrerror()
+xstrerror(void)
 {
     static char xstrerror_buf[BUFSIZ];
 

diff --git a/src/acl.cc b/src/acl.cc
index f106b8f8c46d7e0c44d50975e66d1cff0fe88b4b..a12a31bfc62481469bafccdc9296a9f22ce35c8f 100644 (file)
--- a/src/acl.cc
+++ b/src/acl.cc
@@ -1,5 +1,5 @@
 /*
- * $Id: acl.cc,v 1.39 1996/09/16 21:11:03 wessels Exp $
+ * $Id: acl.cc,v 1.40 1996/09/17 02:29:48 wessels Exp $
  *
  * DEBUG: section 28    Access Control
  * AUTHOR: Duane Wessels
@@ -106,7 +106,7 @@ aclFindByName(char *name)
 
 
 static intlist *
-aclParseIntlist()
+aclParseIntlist(void)
 {
     intlist *head = NULL;
     intlist **Tail = &head;
@@ -122,7 +122,7 @@ aclParseIntlist()
 }
 
 static intlist *
-aclParseProtoList()
+aclParseProtoList(void)
 {
     intlist *head = NULL;
     intlist **Tail = &head;
@@ -138,7 +138,7 @@ aclParseProtoList()
 }
 
 static intlist *
-aclParseMethodList()
+aclParseMethodList(void)
 {
     intlist *head = NULL;
     intlist **Tail = &head;
@@ -210,7 +210,7 @@ decode_addr(char *asc, struct in_addr *addr, struct in_addr *mask)
 
 
 static struct _acl_ip_data *
-aclParseIpList()
+aclParseIpList(void)
 {
     char *t = NULL, *p = NULL;
     struct _acl_ip_data *head = NULL;
@@ -276,7 +276,7 @@ aclParseIpList()
 }
 
 static struct _acl_time_data *
-aclParseTimeSpec()
+aclParseTimeSpec(void)
 {
     struct _acl_time_data *data = NULL;
     int h1, m1, h2, m2;
@@ -350,7 +350,7 @@ aclParseTimeSpec()
 }
 
 static struct _relist *
-aclParseRegexList()
+aclParseRegexList(void)
 {
     relist *head = NULL;
     relist **Tail = &head;
@@ -374,7 +374,7 @@ aclParseRegexList()
 }
 
 static wordlist *
-aclParseWordList()
+aclParseWordList(void)
 {
     wordlist *head = NULL;
     wordlist **Tail = &head;
@@ -390,7 +390,7 @@ aclParseWordList()
 }
 
 static wordlist *
-aclParseDomainList()
+aclParseDomainList(void)
 {
     wordlist *head = NULL;
     wordlist **Tail = &head;
@@ -408,7 +408,7 @@ aclParseDomainList()
 
 
 void
-aclParseAclLine()
+aclParseAclLine(void)
 {
     /* we're already using strtok() to grok the line */
     char *t = NULL;
@@ -860,7 +860,7 @@ aclDestroyRegexList(struct _relist *data)
 }
 
 void
-aclDestroyAcls()
+aclDestroyAcls(void)
 {
     struct _acl *a = NULL;
     struct _acl *next = NULL;

diff --git a/src/cache_cf.cc b/src/cache_cf.cc
index c5c18aea8f438f461e41e0f470682bf7c60e1355..aa79160ed3b66c8f3c162de6d748e02b8db27d78 100644 (file)
--- a/src/cache_cf.cc
+++ b/src/cache_cf.cc
@@ -1,5 +1,5 @@
 /*
- * $Id: cache_cf.cc,v 1.89 1996/09/16 21:11:03 wessels Exp $
+ * $Id: cache_cf.cc,v 1.90 1996/09/17 02:29:50 wessels Exp $
  *
  * DEBUG: section 3     Configuration File Parsing
  * AUTHOR: Harvest Derived
@@ -257,7 +257,7 @@ static void parseWAISRelayLine __P((void));
 static void parseMinutesLine __P((int *));
 
 void
-self_destruct()
+self_destruct(void)
 {
     sprintf(fatal_str, "Bungled %s line %d: %s",
        cfg_filename, config_lineno, config_input_line);
@@ -450,7 +450,7 @@ intlistDestroy(intlist ** list)
 
 
 static void
-parseCacheHostLine()
+parseCacheHostLine(void)
 {
     char *type = NULL;
     char *hostname = NULL;
@@ -488,7 +488,7 @@ parseCacheHostLine()
 }
 
 static void
-parseHostDomainLine()
+parseHostDomainLine(void)
 {
     char *host = NULL;
     char *domain = NULL;
@@ -499,7 +499,7 @@ parseHostDomainLine()
 }
 
 static void
-parseHostAclLine()
+parseHostAclLine(void)
 {
     char *host = NULL;
     char *aclname = NULL;
@@ -511,7 +511,7 @@ parseHostAclLine()
 
 
 static void
-parseMemLine()
+parseMemLine(void)
 {
     char *token;
     int i;
@@ -520,7 +520,7 @@ parseMemLine()
 }
 
 static void
-parseHotVmFactorLine()
+parseHotVmFactorLine(void)
 {
     char *token = NULL;
     double d;
@@ -536,7 +536,7 @@ parseHotVmFactorLine()
 }
 
 static void
-parseSwapLine()
+parseSwapLine(void)
 {
     char *token;
     int i;
@@ -545,7 +545,7 @@ parseSwapLine()
 }
 
 static void
-parseHttpLine()
+parseHttpLine(void)
 {
     char *token;
     int i;
@@ -556,7 +556,7 @@ parseHttpLine()
 }
 
 static void
-parseGopherLine()
+parseGopherLine(void)
 {
     char *token;
     int i;
@@ -567,7 +567,7 @@ parseGopherLine()
 }
 
 static void
-parseFtpLine()
+parseFtpLine(void)
 {
     char *token;
     int i;
@@ -612,7 +612,7 @@ parseTTLPattern(int icase, int force)
 }
 
 static void
-parseQuickAbort()
+parseQuickAbort(void)
 {
     char *token;
     int i;
@@ -646,7 +646,7 @@ parseMinutesLine(int *iptr)
 }
 
 static void
-parseRequestSizeLine()
+parseRequestSizeLine(void)
 {
     char *token;
     int i;
@@ -655,7 +655,7 @@ parseRequestSizeLine()
 }
 
 static void
-parseMgrLine()
+parseMgrLine(void)
 {
     char *token;
     token = strtok(NULL, w_space);
@@ -666,7 +666,7 @@ parseMgrLine()
 }
 
 static void
-parseDirLine()
+parseDirLine(void)
 {
     char *token;
 
@@ -678,7 +678,7 @@ parseDirLine()
 
 #if USE_PROXY_AUTH
 static void
-parseProxyAuthLine()
+parseProxyAuthLine(void)
 {
     char *token;
 
@@ -694,7 +694,7 @@ parseProxyAuthLine()
 #endif /* USE_PROXY_AUTH */
 
 static void
-parseHttpdAccelLine()
+parseHttpdAccelLine(void)
 {
     char *token;
     LOCAL_ARRAY(char, buf, BUFSIZ);
@@ -714,7 +714,7 @@ parseHttpdAccelLine()
 }
 
 static void
-parseEffectiveUserLine()
+parseEffectiveUserLine(void)
 {
     char *token;
 
@@ -732,7 +732,7 @@ parseEffectiveUserLine()
 }
 
 static void
-parseLogLine()
+parseLogLine(void)
 {
     char *token;
     token = strtok(NULL, w_space);
@@ -743,7 +743,7 @@ parseLogLine()
 }
 
 static void
-parseAccessLogLine()
+parseAccessLogLine(void)
 {
     char *token;
     token = strtok(NULL, w_space);
@@ -754,7 +754,7 @@ parseAccessLogLine()
 }
 
 static void
-parseStoreLogLine()
+parseStoreLogLine(void)
 {
     char *token;
     token = strtok(NULL, w_space);
@@ -765,7 +765,7 @@ parseStoreLogLine()
 }
 
 static void
-parseFtpProgramLine()
+parseFtpProgramLine(void)
 {
     char *token;
     token = strtok(NULL, w_space);
@@ -776,7 +776,7 @@ parseFtpProgramLine()
 }
 
 static void
-parseFtpOptionsLine()
+parseFtpOptionsLine(void)
 {
     char *token;
     token = strtok(NULL, "");  /* Note "", don't separate these */
@@ -787,7 +787,7 @@ parseFtpOptionsLine()
 }
 
 static void
-parseDnsProgramLine()
+parseDnsProgramLine(void)
 {
     char *token;
     token = strtok(NULL, w_space);
@@ -798,7 +798,7 @@ parseDnsProgramLine()
 }
 
 static void
-parseRedirectProgramLine()
+parseRedirectProgramLine(void)
 {
     char *token;
     token = strtok(NULL, w_space);
@@ -822,7 +822,7 @@ parseOnOff(int *var)
 }
 
 static void
-parseWAISRelayLine()
+parseWAISRelayLine(void)
 {
     char *token;
     int i;
@@ -847,7 +847,7 @@ parseIPLine(ip_acl ** list)
 }
 
 static void
-parseHierarchyStoplistLine()
+parseHierarchyStoplistLine(void)
 {
     char *token;
     while ((token = strtok(NULL, w_space)))
@@ -855,7 +855,7 @@ parseHierarchyStoplistLine()
 }
 
 static void
-parseAppendDomainLine()
+parseAppendDomainLine(void)
 {
     char *token;
     token = strtok(NULL, w_space);
@@ -911,7 +911,7 @@ parseLocalDomainFile(char *fname)
 }
 
 static void
-parseLocalDomainLine()
+parseLocalDomainLine(void)
 {
     char *token = NULL;
     struct stat sb;
@@ -925,7 +925,7 @@ parseLocalDomainLine()
 }
 
 static void
-parseInsideFirewallLine()
+parseInsideFirewallLine(void)
 {
     char *token;
     while ((token = strtok(NULL, w_space))) {
@@ -934,7 +934,7 @@ parseInsideFirewallLine()
 }
 
 static void
-parseDnsTestnameLine()
+parseDnsTestnameLine(void)
 {
     char *token;
     while ((token = strtok(NULL, w_space))) {
@@ -943,7 +943,7 @@ parseDnsTestnameLine()
 }
 
 static void
-parseHttpPortLine()
+parseHttpPortLine(void)
 {
     char *token;
     int i;
@@ -954,7 +954,7 @@ parseHttpPortLine()
 }
 
 static void
-parseIcpPortLine()
+parseIcpPortLine(void)
 {
     char *token;
     int i;
@@ -965,7 +965,7 @@ parseIcpPortLine()
 }
 
 static void
-parseDebugOptionsLine()
+parseDebugOptionsLine(void)
 {
     char *token;
     token = strtok(NULL, "");  /* Note "", don't separate these */
@@ -978,7 +978,7 @@ parseDebugOptionsLine()
 }
 
 static void
-parsePidFilenameLine()
+parsePidFilenameLine(void)
 {
     char *token;
     token = strtok(NULL, w_space);
@@ -989,7 +989,7 @@ parsePidFilenameLine()
 }
 
 static void
-parseVisibleHostnameLine()
+parseVisibleHostnameLine(void)
 {
     char *token;
     token = strtok(NULL, w_space);
@@ -1000,7 +1000,7 @@ parseVisibleHostnameLine()
 }
 
 static void
-parseFtpUserLine()
+parseFtpUserLine(void)
 {
     char *token;
     token = strtok(NULL, w_space);
@@ -1011,7 +1011,7 @@ parseFtpUserLine()
 }
 
 static void
-parseCacheAnnounceLine()
+parseCacheAnnounceLine(void)
 {
     char *token;
     int i;
@@ -1020,7 +1020,7 @@ parseCacheAnnounceLine()
 }
 
 static void
-parseAnnounceToLine()
+parseAnnounceToLine(void)
 {
     char *token;
     int i;
@@ -1042,7 +1042,7 @@ parseAnnounceToLine()
 }
 
 static void
-parseSslProxyLine()
+parseSslProxyLine(void)
 {
     char *token;
     char *t;
@@ -1068,7 +1068,7 @@ parseIntegerValue(int *iptr)
 }
 
 static void
-parseErrHtmlLine()
+parseErrHtmlLine(void)
 {
     char *token;
     if ((token = strtok(NULL, "")))
@@ -1429,7 +1429,7 @@ safe_xstrdup(char *p)
 }
 
 static void
-configFreeMemory()
+configFreeMemory(void)
 {
     safe_free(Config.Wais.relayHost);
     safe_free(Config.Log.log);
@@ -1467,7 +1467,7 @@ configFreeMemory()
 
 
 static void
-configSetFactoryDefaults()
+configSetFactoryDefaults(void)
 {
     Config.Mem.maxSize = DefaultMemMaxSize;
     Config.Mem.highWaterMark = DefaultMemHighWaterMark;
@@ -1558,7 +1558,7 @@ configSetFactoryDefaults()
 }
 
 static void
-configDoConfigure()
+configDoConfigure(void)
 {
     httpd_accel_mode = Config.Accel.prefix ? 1 : 0;
     sprintf(ForwardedBy, "Forwarded: by http://%s:%d/",

diff --git a/src/client_side.cc b/src/client_side.cc
index 589eae56e46fb3af004e5fc28adcca6ed6cf2580..3f4d74b32bc082928c969f4565338dec1b58a0d1 100644 (file)
--- a/src/client_side.cc
+++ b/src/client_side.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: client_side.cc,v 1.28 1996/09/16 21:11:04 wessels Exp $
+ * $Id: client_side.cc,v 1.29 1996/09/17 02:29:51 wessels Exp $
  *
  * DEBUG: section 33    Client-side Routines
  * AUTHOR: Duane Wessels
@@ -225,7 +225,7 @@ clientRedirectDone(void *data, char *result)
 #define CHECK_PROXY_FILE_TIME 300
 
 char *
-proxyAuthenticate()
+proxyAuthenticate(void)
 {
     /* Keep the time measurements and the hash
      * table of users and passwords handy */

diff --git a/src/comm.cc b/src/comm.cc
index 863bdf69ad7fd2400a6503347e5d92ad46dc6969..180df7da3d329aa64012d95fcadabf0ac5547e59 100644 (file)
--- a/src/comm.cc
+++ b/src/comm.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: comm.cc,v 1.72 1996/09/16 21:20:45 wessels Exp $
+ * $Id: comm.cc,v 1.73 1996/09/17 02:29:52 wessels Exp $
  *
  * DEBUG: section 5     Socket Functions
  * AUTHOR: Harvest Derived
@@ -580,7 +580,7 @@ comm_set_stall(int fd, int delta)
 }
 
 static void
-comm_select_incoming()
+comm_select_incoming(void)
 {
     fd_set read_mask;
     fd_set write_mask;
@@ -1000,7 +1000,7 @@ getAddress(char *name)
  *  squid initiated clients a maximum lifetime.
  */
 int
-comm_init()
+comm_init(void)
 {
     int i;
 
@@ -1113,7 +1113,7 @@ fd_note(int fd, char *s)
 }
 
 static void
-checkTimeouts()
+checkTimeouts(void)
 {
     int fd;
     int (*hdl) () = NULL;
@@ -1135,7 +1135,7 @@ checkTimeouts()
 }
 
 static void
-checkLifetimes()
+checkLifetimes(void)
 {
     int fd;
     time_t lft;
@@ -1184,7 +1184,7 @@ checkLifetimes()
  * Reserve_More_FDs() called when acceopt(), open(), or socket is failing
  */
 static void
-Reserve_More_FDs()
+Reserve_More_FDs(void)
 {
     if (RESERVED_FD < FD_SETSIZE - 64) {
        RESERVED_FD = RESERVED_FD + 1;

diff --git a/src/debug.cc b/src/debug.cc
index 79030de4f7fa39c7d39e8b3c59b26b63fd662888..ead56201b00d3f6ad08eab13af6797c2aa9fda79 100644 (file)
--- a/src/debug.cc
+++ b/src/debug.cc
@@ -1,5 +1,5 @@
 /*
- * $Id: debug.cc,v 1.23 1996/09/14 08:45:45 wessels Exp $
+ * $Id: debug.cc,v 1.24 1996/09/17 02:29:52 wessels Exp $
  *
  * DEBUG: section 0     Debug Routines
  * AUTHOR: Harvest Derived
@@ -248,7 +248,7 @@ _db_init(char *logfile, char *options)
 }
 
 void
-_db_rotate_log()
+_db_rotate_log(void)
 {
     int i;
     LOCAL_ARRAY(char, from, MAXPATHLEN);

diff --git a/src/disk.cc b/src/disk.cc
index b01ff8d9a213671f5a1111d370e1e31c7859049c..1179fca59d7c72d38b3b1b25227a3f7d1add5088 100644 (file)
--- a/src/disk.cc
+++ b/src/disk.cc
@@ -1,5 +1,5 @@
 /*
- * $Id: disk.cc,v 1.25 1996/09/14 16:54:52 wessels Exp $
+ * $Id: disk.cc,v 1.26 1996/09/17 02:29:53 wessels Exp $
  *
  * DEBUG: section 6     Disk I/O Routines
  * AUTHOR: Harvest Derived
@@ -123,7 +123,7 @@ FileEntry *file_table;
 
 /* initialize table */
 int
-disk_init()
+disk_init(void)
 {
     int fd;
 

diff --git a/src/dns.cc b/src/dns.cc
index e64615430fbd6676bbc4405660a4874f9e76561d..93ae445e359c131dfbb4f1c0042245f184d34e2c 100644 (file)
--- a/src/dns.cc
+++ b/src/dns.cc
@@ -1,5 +1,5 @@
 /*
- * $Id: dns.cc,v 1.10 1996/09/16 21:20:45 wessels Exp $
+ * $Id: dns.cc,v 1.11 1996/09/17 02:29:54 wessels Exp $
  *
  * DEBUG: section 34    Dnsserver interface
  * AUTHOR: Harvest Derived
@@ -195,7 +195,7 @@ dnsOpenServer(char *command)
 }
 
 dnsserver_t *
-dnsGetFirstAvailable()
+dnsGetFirstAvailable(void)
 {
     int k;
     dnsserver_t *dns = NULL;
@@ -209,7 +209,7 @@ dnsGetFirstAvailable()
 
 
 void
-dnsOpenServers()
+dnsOpenServers(void)
 {
     int N = Config.dnsChildren;
     char *prg = Config.Program.dnsserver;
@@ -281,7 +281,7 @@ dnsStats(StoreEntry * sentry)
 }
 
 void
-dnsShutdownServers()
+dnsShutdownServers(void)
 {
     dnsserver_t *dnsData = NULL;
     int k;

diff --git a/src/errorpage.cc b/src/errorpage.cc
index f2500112a2574e6874c0b0d7c18b7c9f35a44449..8ff3de1f779c19564f87022c810c3503c34fe8d1 100644 (file)
--- a/src/errorpage.cc
+++ b/src/errorpage.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: errorpage.cc,v 1.38 1996/09/14 08:45:52 wessels Exp $
+ * $Id: errorpage.cc,v 1.39 1996/09/17 02:29:54 wessels Exp $
  *
  * DEBUG: section 4     Error Generation
  * AUTHOR: Duane Wessels
@@ -135,7 +135,7 @@ static char *tbuf = NULL;
 static char *auth_msg = NULL;
 
 void
-errorInitialize()
+errorInitialize(void)
 {
 #ifndef USE_PROXY_AUTH
     tmp_error_buf = xmalloc(MAX_URL * 4);

diff --git a/src/fqdncache.cc b/src/fqdncache.cc
index 97470ed728fed53332f5d11ba3edfe962e891129..bbced8dbfe85ccc62bc3bfba8ce4c363b72615dd 100644 (file)
--- a/src/fqdncache.cc
+++ b/src/fqdncache.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: fqdncache.cc,v 1.19 1996/09/16 16:28:38 wessels Exp $
+ * $Id: fqdncache.cc,v 1.20 1996/09/17 02:29:55 wessels Exp $
  *
  * DEBUG: section 35    FQDN Cache
  * AUTHOR: Harvest Derived
@@ -182,7 +182,7 @@ fqdncacheEnqueue(fqdncache_entry * f)
 }
 
 static void *
-fqdncacheDequeue()
+fqdncacheDequeue(void)
 {
     struct fqdncacheQueueData *old = NULL;
     fqdncache_entry *f = NULL;
@@ -255,13 +255,13 @@ fqdncache_get(char *name)
 }
 
 static fqdncache_entry *
-fqdncache_GetFirst()
+fqdncache_GetFirst(void)
 {
     return (fqdncache_entry *) hash_first(fqdn_table);
 }
 
 static fqdncache_entry *
-fqdncache_GetNext()
+fqdncache_GetNext(void)
 {
     return (fqdncache_entry *) hash_next(fqdn_table);
 }
@@ -292,7 +292,7 @@ fqdncacheExpiredEntry(fqdncache_entry * f)
 
 /* finds the LRU and deletes */
 static int
-fqdncache_purgelru()
+fqdncache_purgelru(void)
 {
     fqdncache_entry *f = NULL;
     int local_fqdn_count = 0;
@@ -356,7 +356,7 @@ fqdncache_purgelru()
 
 /* create blank fqdncache_entry */
 static fqdncache_entry *
-fqdncache_create()
+fqdncache_create(void)
 {
     static fqdncache_entry *new;
 
@@ -684,7 +684,7 @@ fqdncache_dnsDispatch(dnsserver_t * dns, fqdncache_entry * f)
 
 /* initialize the fqdncache */
 void
-fqdncache_init()
+fqdncache_init(void)
 {
     debug(35, 3, "Initializing FQDN Cache...\n");
     memset(&FqdncacheStats, '\0', sizeof(FqdncacheStats));
@@ -862,7 +862,7 @@ fqdnFromAddr(struct in_addr addr)
 }
 
 int
-fqdncacheQueueDrain()
+fqdncacheQueueDrain(void)
 {
     fqdncache_entry *i;
     dnsserver_t *dnsData;

diff --git a/src/ftp.cc b/src/ftp.cc
index 014ffd14a2be520e91ffad555f4310c6e192766b..756d8493b176a12dd1df9c0467c05341125388ea 100644 (file)
--- a/src/ftp.cc
+++ b/src/ftp.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: ftp.cc,v 1.57 1996/09/16 21:11:07 wessels Exp $
+ * $Id: ftp.cc,v 1.58 1996/09/17 02:29:56 wessels Exp $
  *
  * DEBUG: section 9     File Transfer Protocol (FTP)
  * AUTHOR: Harvest Derived
@@ -685,7 +685,7 @@ ftpServerClosed(int fd, void *nodata)
 }
 
 void
-ftpServerClose()
+ftpServerClose(void)
 {
     /* NOTE: this function will be called repeatedly while shutdown is
      * pending */
@@ -705,7 +705,7 @@ ftpServerClose()
 
 
 int
-ftpInitialize()
+ftpInitialize(void)
 {
     int pid;
     int cfd;

diff --git a/src/gopher.cc b/src/gopher.cc
index 437e9738c335111a35d7ec2a7da949994967a1c1..301afca5c78f7823248ee2e3fe7573c40fe38401 100644 (file)
--- a/src/gopher.cc
+++ b/src/gopher.cc
@@ -1,5 +1,5 @@
 /*
- * $Id: gopher.cc,v 1.47 1996/09/16 21:11:07 wessels Exp $
+ * $Id: gopher.cc,v 1.48 1996/09/17 02:29:58 wessels Exp $
  *
  * DEBUG: section 10    Gopher
  * AUTHOR: Harvest Derived
@@ -1049,7 +1049,7 @@ gopherStart(int unusedfd, char *url, StoreEntry * entry)
 
 
 static GopherStateData *
-CreateGopherStateData()
+CreateGopherStateData(void)
 {
     GopherStateData *gd = xcalloc(1, sizeof(GopherStateData));
     gd->buf = get_free_4k_page();

diff --git a/src/ipcache.cc b/src/ipcache.cc
index 96ac4aeed6ce11d90e3b8ad79db54dff28575725..13ddb2509dd24c597db87a0def5ed192ca2c2b13 100644 (file)
--- a/src/ipcache.cc
+++ b/src/ipcache.cc
@@ -1,5 +1,5 @@
 /*
- * $Id: ipcache.cc,v 1.61 1996/09/16 21:20:47 wessels Exp $
+ * $Id: ipcache.cc,v 1.62 1996/09/17 02:29:59 wessels Exp $
  *
  * DEBUG: section 14    IP Cache
  * AUTHOR: Harvest Derived
@@ -185,7 +185,7 @@ ipcacheEnqueue(ipcache_entry * i)
 }
 
 static void *
-ipcacheDequeue()
+ipcacheDequeue(void)
 {
     struct ipcacheQueueData *old = NULL;
     ipcache_entry *i = NULL;
@@ -201,7 +201,7 @@ ipcacheDequeue()
 }
 
 static int
-ipcache_testname()
+ipcache_testname(void)
 {
     wordlist *w = NULL;
     debug(14, 1, "Performing DNS Tests...\n");
@@ -277,14 +277,14 @@ ipcache_get(char *name)
 
 /* get the first ip entry in the storage */
 static ipcache_entry *
-ipcache_GetFirst()
+ipcache_GetFirst(void)
 {
     return (ipcache_entry *) hash_first(ip_table);
 }
 
 /* get the next ip entry in the storage for a given search pointer */
 static ipcache_entry *
-ipcache_GetNext()
+ipcache_GetNext(void)
 {
     return (ipcache_entry *) hash_next(ip_table);
 }
@@ -327,7 +327,7 @@ ipcacheExpiredEntry(ipcache_entry * i)
 
 /* finds the LRU and deletes */
 int
-ipcache_purgelru()
+ipcache_purgelru(void)
 {
     ipcache_entry *i = NULL;
     int local_ip_notpending_count = 0;
@@ -382,7 +382,7 @@ ipcache_purgelru()
 
 /* create blank ipcache_entry */
 static ipcache_entry *
-ipcache_create()
+ipcache_create(void)
 {
     static ipcache_entry *new;
 
@@ -759,7 +759,7 @@ ipcache_dnsDispatch(dnsserver_t * dns, ipcache_entry * i)
 
 /* initialize the ipcache */
 void
-ipcache_init()
+ipcache_init(void)
 {
     debug(14, 3, "Initializing IP Cache...\n");
 
@@ -995,7 +995,7 @@ ipcacheCheckNumeric(char *name)
 }
 
 int
-ipcacheQueueDrain()
+ipcacheQueueDrain(void)
 {
     ipcache_entry *i;
     dnsserver_t *dnsData;

diff --git a/src/main.cc b/src/main.cc
index ef81e9d4d5a53e2ec498792b3d8b77c962a547a8..17ecb660aa79ebaed7ab66d4c8ff41f39358d968 100644 (file)
--- a/src/main.cc
+++ b/src/main.cc
@@ -1,5 +1,5 @@
 /*
- * $Id: main.cc,v 1.78 1996/09/16 21:50:25 wessels Exp $
+ * $Id: main.cc,v 1.79 1996/09/17 02:30:00 wessels Exp $
  *
  * DEBUG: section 1     Startup and Main Loop
  * AUTHOR: Harvest Derived
@@ -155,7 +155,7 @@ static void mainParseOptions __P((int, char **));
 static void sendSignal __P((void));
 
 static void
-usage()
+usage(void)
 {
     fprintf(stderr, "\
 Usage: %s [-hsvzCDFRUVY] [-f config-file] [-[au] port] [-k signal]\n\
@@ -312,7 +312,7 @@ shut_down(int sig)
 }
 
 void
-serverConnectionsOpen()
+serverConnectionsOpen(void)
 {
     struct in_addr addr;
     u_short port;
@@ -385,7 +385,7 @@ serverConnectionsOpen()
 }
 
 void
-serverConnectionsClose()
+serverConnectionsClose(void)
 {
     /* NOTE, this function will be called repeatedly while shutdown
      * is pending */
@@ -423,7 +423,7 @@ serverConnectionsClose()
 }
 
 static void
-mainReinitialize()
+mainReinitialize(void)
 {
     debug(1, 0, "Restarting Squid Cache (version %s)...\n", version_string);
     /* Already called serverConnectionsClose and ipcacheShutdownServers() */
@@ -441,7 +441,7 @@ mainReinitialize()
 }
 
 static void
-mainInitialize()
+mainInitialize(void)
 {
     static int first_time = 1;
     if (opt_catch_signals) {
@@ -537,7 +537,7 @@ mainInitialize()
 }
 
 static time_t
-mainMaintenance()
+mainMaintenance(void)
 {
     time_t next;
     int n;
@@ -690,7 +690,7 @@ main(int argc, char **argv)
 }
 
 static void
-sendSignal()
+sendSignal(void)
 {
     int pid;
     debug_log = stderr;

diff --git a/src/neighbors.cc b/src/neighbors.cc
index 71b108a67c43f062febf4a20a192c894d4b3fda3..12fb473539b3dce7d535032eadf09093b1bebc77 100644 (file)
--- a/src/neighbors.cc
+++ b/src/neighbors.cc
@@ -1,5 +1,5 @@
 /*
- * $Id: neighbors.cc,v 1.54 1996/09/16 21:50:26 wessels Exp $
+ * $Id: neighbors.cc,v 1.55 1996/09/17 02:30:01 wessels Exp $
  *
  * DEBUG: section 15    Neighbor Routines
  * AUTHOR: Harvest Derived
@@ -282,7 +282,7 @@ neighborRemove(edge * target)
 }
 
 void
-neighborsDestroy()
+neighborsDestroy(void)
 {
     edge *e = NULL;
     edge *next = NULL;
@@ -789,7 +789,7 @@ neighbors_cf_acl(char *host, char *aclname)
 }
 
 void
-neighbors_init()
+neighbors_init(void)
 {
     struct neighbor_cf *t = NULL;
     struct neighbor_cf *next = NULL;

diff --git a/src/recv-announce.cc b/src/recv-announce.cc
index c58ddb1c7fbd53a0cca0af23c2e2db8ac6541b9e..ff78350a69aa8008a63d20d51267a2504a43184f 100644 (file)
--- a/src/recv-announce.cc
+++ b/src/recv-announce.cc
@@ -1,5 +1,5 @@
 /*
- * $Id: recv-announce.cc,v 1.8 1996/09/15 05:04:40 wessels Exp $
+ * $Id: recv-announce.cc,v 1.9 1996/09/17 02:30:01 wessels Exp $
  *
  * DEBUG: section 0     Announement Server
  * AUTHOR: Harvest Derived
@@ -141,7 +141,7 @@ extern void xmemcpy __P((void *from, void *to, int len));
  */
 
 void
-sig_handle()
+sig_handle(void)
 {
     fflush(stdout);
     close(2);

diff --git a/src/redirect.cc b/src/redirect.cc
index 99f573e8103cea8dcee6359fb602e741676a8c6f..772afae69f05b76d13b21ed07b8e6615f27a2b02 100644 (file)
--- a/src/redirect.cc
+++ b/src/redirect.cc
@@ -1,5 +1,5 @@
 /*
- * $Id: redirect.cc,v 1.17 1996/09/16 21:20:49 wessels Exp $
+ * $Id: redirect.cc,v 1.18 1996/09/17 02:30:02 wessels Exp $
  *
  * DEBUG: section 29    Redirector
  * AUTHOR: Duane Wessels
@@ -233,7 +233,7 @@ Enqueue(redirectStateData * r)
 }
 
 static redirectStateData *
-Dequeue()
+Dequeue(void)
 {
     struct redirectQueueData *old = NULL;
     redirectStateData *r = NULL;
@@ -250,7 +250,7 @@ Dequeue()
 }
 
 static redirector_t *
-GetFirstAvailable()
+GetFirstAvailable(void)
 {
     int k;
     redirector_t *redirect = NULL;
@@ -337,7 +337,7 @@ redirectStart(int cfd, icpStateData * icpState, RH handler, void *data)
 }
 
 void
-redirectOpenServers()
+redirectOpenServers(void)
 {
     char *prg = Config.Program.redirect;
     int k;
@@ -390,7 +390,7 @@ redirectOpenServers()
 }
 
 void
-redirectShutdownServers()
+redirectShutdownServers(void)
 {
     redirector_t *redirect = NULL;
     redirectStateData *r = NULL;

diff --git a/src/send-announce.cc b/src/send-announce.cc
index 421e495a74394306b51f7e14d5b471aad61f5c7c..5fe8804210670521b9c20bdd4b2f10630fef4f17 100644 (file)
--- a/src/send-announce.cc
+++ b/src/send-announce.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: send-announce.cc,v 1.18 1996/09/16 21:11:14 wessels Exp $
+ * $Id: send-announce.cc,v 1.19 1996/09/17 02:30:02 wessels Exp $
  *
  * DEBUG: section 27    Cache Announcer
  * AUTHOR: Duane Wessels
@@ -32,7 +32,7 @@
 #include "squid.h"
 
 void
-send_announce()
+send_announce(void)
 {
     LOCAL_ARRAY(char, tbuf, 256);
     LOCAL_ARRAY(char, sndbuf, BUFSIZ);

diff --git a/src/stat.cc b/src/stat.cc
index 9aaf545b53897d5ddb2096fd729a73a0fdc31cde..e15cdd3d4becc90242ac0806f6d429990bc02fcb 100644 (file)
--- a/src/stat.cc
+++ b/src/stat.cc
@@ -1,5 +1,5 @@
 /*
- * $Id: stat.cc,v 1.70 1996/09/16 17:16:33 wessels Exp $
+ * $Id: stat.cc,v 1.71 1996/09/17 02:30:03 wessels Exp $
  *
  * DEBUG: section 18    Cache Manager Statistics
  * AUTHOR: Harvest Derived
@@ -628,7 +628,7 @@ statFiledescriptors(StoreEntry * sentry)
 }
 
 static int
-memoryAccounted()
+memoryAccounted(void)
 {
     return (int)
        meta_data.store_entries * sizeof(StoreEntry) +
@@ -645,7 +645,7 @@ memoryAccounted()
 
 #ifdef UNUSED_CODE
 static int
-mallinfoTotal()
+mallinfoTotal(void)
 {
     int total = 0;
 #if HAVE_MALLINFO
@@ -1373,7 +1373,7 @@ flags_describe(StoreEntry * entry)
 }
 
 void
-stat_rotate_log()
+stat_rotate_log(void)
 {
     int i;
     LOCAL_ARRAY(char, from, MAXPATHLEN);
@@ -1410,7 +1410,7 @@ stat_rotate_log()
 }
 
 void
-statCloseLog()
+statCloseLog(void)
 {
     file_close(HTTPCacheInfo->logfile_fd);
 }

diff --git a/src/stmem.cc b/src/stmem.cc
index 473d95a3fac03013a32ba4517b272607ddbc5b8e..f6c68df0253cf6d83018ddd6c93282c9bd1ea6dc 100644 (file)
--- a/src/stmem.cc
+++ b/src/stmem.cc
@@ -1,5 +1,5 @@
 /*
- * $Id: stmem.cc,v 1.22 1996/09/15 05:04:44 wessels Exp $
+ * $Id: stmem.cc,v 1.23 1996/09/17 02:30:04 wessels Exp $
  *
  * DEBUG: section 19    Memory Primitives
  * AUTHOR: Harvest Derived
@@ -306,7 +306,7 @@ memCopy(mem_ptr mem, int offset, char *buf, int size)
 
 /* Do whatever is necessary to begin storage of new object */
 mem_ptr
-memInit()
+memInit(void)
 {
     mem_ptr new = xcalloc(1, sizeof(Mem_Hdr));
     new->tail = new->head = NULL;
@@ -336,25 +336,25 @@ get_free_thing(stmem_stats * thing)
 }
 
 void *
-get_free_request_t()
+get_free_request_t(void)
 {
     return get_free_thing(&request_pool);
 }
 
 void *
-get_free_mem_obj()
+get_free_mem_obj(void)
 {
     return get_free_thing(&mem_obj_pool);
 }
 
 char *
-get_free_4k_page()
+get_free_4k_page(void)
 {
     return (char *) get_free_thing(&sm_stats);
 }
 
 char *
-get_free_8k_page()
+get_free_8k_page(void)
 {
     return (char *) get_free_thing(&disk_stats);
 }
@@ -401,7 +401,7 @@ put_free_8k_page(void *page)
 }
 
 void
-stmemInit()
+stmemInit(void)
 {
     sm_stats.page_size = SM_PAGE_SIZE;
     sm_stats.total_pages_allocated = 0;

diff --git a/src/store.cc b/src/store.cc
index eddf7dfdf78cf1325aefb1dc8041e48718ed7582..108e34d4e570e47b61d3eac51999814b422c9908 100644 (file)
--- a/src/store.cc
+++ b/src/store.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: store.cc,v 1.112 1996/09/16 21:20:49 wessels Exp $
+ * $Id: store.cc,v 1.113 1996/09/17 02:30:05 wessels Exp $
  *
  * DEBUG: section 20    Storeage Manager
  * AUTHOR: Harvest Derived
@@ -2139,7 +2139,7 @@ storeRelease(StoreEntry * e)
        if ((hptr = hash_lookup(store_table, e->key)) == NULL) {
            debug(20, 0, "storeRelease: Not Found: '%s'\n", e->key);
            debug(20, 0, "Dump of Entry 'e':\n %s\n", storeToString(e));
-           fatal_dump(NULL);
+           debug_trap("storeRelease: Invalid Entry");
        }
        result = (StoreEntry *) hptr;
        if (result != e) {
@@ -2147,7 +2147,7 @@ storeRelease(StoreEntry * e)
                result->url ? result->url : "NULL");
            debug(20, 0, "Dump of Entry 'e':\n%s", storeToString(e));
            debug(20, 0, "Dump of Entry 'result':\n%s", storeToString(result));
-           fatal_dump(NULL);
+           debug_trap("storeRelease: Duplicate Entry");
        }
     }
     if (e->method == METHOD_GET) {

diff --git a/src/tools.cc b/src/tools.cc
index 6cbf5026b3143597c223e2a976472e2db8eabc7b..47ab643fba7ce5e7c6875cc45d8ce6f5263d19b1 100644 (file)
--- a/src/tools.cc
+++ b/src/tools.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: tools.cc,v 1.59 1996/09/16 21:20:50 wessels Exp $
+ * $Id: tools.cc,v 1.60 1996/09/17 02:30:06 wessels Exp $
  *
  * DEBUG: section 21    Misc Functions
  * AUTHOR: Harvest Derived
@@ -121,7 +121,7 @@ and report the trace back to squid-bugs@nlanr.net.\n\
 Thanks!\n"
 
 static char *
-dead_msg()
+dead_msg(void)
 {
     LOCAL_ARRAY(char, msg, 1024);
     sprintf(msg, DEAD_MSG, version_string, version_string);
@@ -129,7 +129,7 @@ dead_msg()
 }
 
 void
-mail_warranty()
+mail_warranty(void)
 {
     FILE *fp = NULL;
     char *filename;
@@ -263,7 +263,7 @@ sigusr2_handle(int sig)
 }
 
 void
-setSocketShutdownLifetimes()
+setSocketShutdownLifetimes(void)
 {
     FD_ENTRY *f = NULL;
     int lft = Config.lifetimeShutdown;
@@ -283,7 +283,7 @@ setSocketShutdownLifetimes()
 }
 
 void
-normal_shutdown()
+normal_shutdown(void)
 {
     debug(21, 1, "Shutting down...\n");
     if (Config.pidFilename) {
@@ -369,7 +369,7 @@ sig_child(int sig)
 }
 
 char *
-getMyHostname()
+getMyHostname(void)
 {
     LOCAL_ARRAY(char, host, SQUIDHOSTNAMELEN + 1);
     static int present = 0;
@@ -414,7 +414,7 @@ safeunlink(char *s, int quiet)
  * To give upp all posibilites to gain privilegies use no_suid()
  */
 void
-leave_suid()
+leave_suid(void)
 {
     struct passwd *pwd = NULL;
     struct group *grp = NULL;
@@ -444,7 +444,7 @@ leave_suid()
 
 /* Enter a privilegied section */
 void
-enter_suid()
+enter_suid(void)
 {
     debug(21, 3, "enter_suid: PID %d taking root priveleges\n", getpid());
 #if HAVE_SETRESUID
@@ -458,7 +458,7 @@ enter_suid()
  * this should be used before starting a sub process
  */
 void
-no_suid()
+no_suid(void)
 {
     uid_t uid;
     leave_suid();
@@ -473,7 +473,7 @@ no_suid()
 }
 
 void
-writePidFile()
+writePidFile(void)
 {
     FILE *pid_fp = NULL;
     char *f = NULL;
@@ -494,7 +494,7 @@ writePidFile()
 
 
 int
-readPidFile()
+readPidFile(void)
 {
     FILE *pid_fp = NULL;
     char *f = NULL;
@@ -521,7 +521,7 @@ readPidFile()
 
 
 void
-setMaxFD()
+setMaxFD(void)
 {
 #if HAVE_SETRLIMIT
     /* try to use as many file descriptors as possible */
@@ -570,7 +570,7 @@ setMaxFD()
 }
 
 time_t
-getCurrentTime()
+getCurrentTime(void)
 {
 #if GETTIMEOFDAY_NO_TZP
     gettimeofday(&current_time);

diff --git a/src/url.cc b/src/url.cc
index 37a0b28a1d72487a9fa69a5b1a0e851427c40991..4e8f29732fb9092fbbc28717c1908955f86a2a0f 100644 (file)
--- a/src/url.cc
+++ b/src/url.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: url.cc,v 1.33 1996/09/14 08:46:36 wessels Exp $
+ * $Id: url.cc,v 1.34 1996/09/17 02:30:07 wessels Exp $
  *
  * DEBUG: section 23    URL Parsing
  * AUTHOR: Duane Wessels
@@ -90,7 +90,7 @@ url_convert_hex(char *org_url, int allocate)
 /* INIT Acceptable table. 
  * Borrow from libwww2 with Mosaic2.4 Distribution   */
 void
-urlInitialize()
+urlInitialize(void)
 {
     unsigned int i;
     char *good =