From: wessels <>
Date: Mon, 14 Jul 1997 09:33:33 +0000 (+0000)
Subject: remove doubly-defined globals
X-Git-Tag: SQUID_3_0_PRE1~4903
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0b2db32c2378d98ead46b277708989024173e454;p=thirdparty%2Fsquid.git

remove doubly-defined globals
---

diff --git a/src/Makefile.in b/src/Makefile.in
index 18f1e54b78..c5e6f9098c 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -1,7 +1,7 @@
 #
 #  Makefile for the Squid Object Cache server
 #
-#  $Id: Makefile.in,v 1.81 1997/07/07 05:29:37 wessels Exp $
+#  $Id: Makefile.in,v 1.82 1997/07/14 03:33:33 wessels Exp $
 #
 #  Uncomment and customize the following to suit your needs:
 #
@@ -155,7 +155,7 @@ cachemgr.cgi:	cachemgr.o
 	$(CC) -o $@ $(LDFLAGS) cachemgr.o $(CLIENT_LIBS)
 
 pinger: pinger.o
-	$(CC) -o $@ $(LDFLAGS) pinger.o debug.o $(PINGER_LIBS)
+	$(CC) -o $@ $(LDFLAGS) pinger.o debug.o globals.o $(PINGER_LIBS)
 
 unlinkd: unlinkd.c
 	$(CC) $(CFLAGS) -DUNLINK_DAEMON $(srcdir)/unlinkd.c -o $@ $(LDFLAGS)
diff --git a/src/acl.cc b/src/acl.cc
index 0bae57b42e..d7566d224b 100644
--- a/src/acl.cc
+++ b/src/acl.cc
@@ -1,5 +1,5 @@
 /*
- * $Id: acl.cc,v 1.102 1997/07/07 05:29:38 wessels Exp $
+ * $Id: acl.cc,v 1.103 1997/07/14 03:33:34 wessels Exp $
  *
  * DEBUG: section 28    Access Control
  * AUTHOR: Duane Wessels
@@ -38,9 +38,6 @@
 #include "splay.h"
 #endif
 
-/* Global */
-const char *AclMatchedName = NULL;
-
 static int aclFromFile = 0;
 static FILE *aclFile;
 
diff --git a/src/comm.cc b/src/comm.cc
index 090f68e0e8..77a9f98ab6 100644
--- a/src/comm.cc
+++ b/src/comm.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: comm.cc,v 1.172 1997/07/07 05:29:42 wessels Exp $
+ * $Id: comm.cc,v 1.173 1997/07/14 03:33:35 wessels Exp $
  *
  * DEBUG: section 5     Socket Functions
  * AUTHOR: Harvest Derived
@@ -115,9 +115,6 @@
  * running shy of free file descriptors.  For example, under SunOS, we'll keep
  * 64 file descriptors free for disk-i/o and connections to remote servers */
 
-int RESERVED_FD = 64;
-int polledinc = 0;
-
 #define min(x,y) ((x)<(y)? (x) : (y))
 #define max(a,b) ((a)>(b)? (a) : (b))
 
@@ -142,10 +139,8 @@ typedef struct {
     int fd;
 } ConnectStateData;
 
-/* GLOBAL */
-fde *fd_table = NULL;	/* also used in disk.c */
-
 /* STATIC */
+static int polledinc = 0;
 static int commBind _PARAMS((int s, struct in_addr, u_short port));
 #if !HAVE_POLL
 static int examine_select _PARAMS((fd_set *, fd_set *));
diff --git a/src/debug.cc b/src/debug.cc
index c7a8ee794f..bddc14c807 100644
--- a/src/debug.cc
+++ b/src/debug.cc
@@ -1,5 +1,5 @@
 /*
- * $Id: debug.cc,v 1.45 1997/06/04 06:15:49 wessels Exp $
+ * $Id: debug.cc,v 1.46 1997/07/14 03:33:36 wessels Exp $
  *
  * DEBUG: section 0     Debug Routines
  * AUTHOR: Harvest Derived
@@ -105,16 +105,10 @@
 
 #include "squid.h"
 
-FILE *debug_log = NULL;
 static char *debug_log_file = NULL;
-int debugLevels[MAX_DEBUG_SECTIONS];
 static char *accessLogTime _PARAMS((time_t));
 extern int opt_debug_stderr;
 
-#ifdef HAVE_SYSLOG
-int _db_level = 0;
-#endif
-
 #ifdef __STDC__
 void
 _db_print(const char *format,...)
diff --git a/src/errorpage.cc b/src/errorpage.cc
index 484de8a79a..32ca17e8dc 100644
--- a/src/errorpage.cc
+++ b/src/errorpage.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: errorpage.cc,v 1.57 1997/06/19 22:51:48 wessels Exp $
+ * $Id: errorpage.cc,v 1.58 1997/07/14 03:33:37 wessels Exp $
  *
  * DEBUG: section 4     Error Generation
  * AUTHOR: Duane Wessels
@@ -133,9 +133,6 @@ static error_data ErrorData[] =
 	"You must authenticate yourself before accessing this cache."}
 };
 
-/* GLOBAL */
-char *tmp_error_buf;
-
 /* LOCAL */
 static char *tbuf = NULL;
 static char *auth_msg = NULL;
diff --git a/src/icmp.cc b/src/icmp.cc
index ba150fb6d0..1ee2b7d2b7 100644
--- a/src/icmp.cc
+++ b/src/icmp.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: icmp.cc,v 1.38 1997/07/07 05:29:46 wessels Exp $
+ * $Id: icmp.cc,v 1.39 1997/07/14 03:33:38 wessels Exp $
  *
  * DEBUG: section 37    ICMP Routines
  * AUTHOR: Duane Wessels
@@ -32,8 +32,6 @@
 
 #include "squid.h"
 
-int icmp_sock = -1;
-
 #if USE_ICMP
 
 #define S_ICMP_ECHO	1
diff --git a/src/stmem.cc b/src/stmem.cc
index 532230489e..6c7edfe066 100644
--- a/src/stmem.cc
+++ b/src/stmem.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: stmem.cc,v 1.45 1997/07/07 05:29:55 wessels Exp $
+ * $Id: stmem.cc,v 1.46 1997/07/14 03:33:40 wessels Exp $
  *
  * DEBUG: section 19    Memory Primitives
  * AUTHOR: Harvest Derived
@@ -106,11 +106,6 @@
 
 #include "squid.h"
 
-stmem_stats sm_stats;
-stmem_stats disk_stats;
-stmem_stats request_pool;
-stmem_stats mem_obj_pool;
-
 #define min(x,y) ((x)<(y)? (x) : (y))
 
 #ifndef USE_MEMALIGN
diff --git a/src/tools.cc b/src/tools.cc
index f3ce413026..84aa833c56 100644
--- a/src/tools.cc
+++ b/src/tools.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: tools.cc,v 1.111 1997/07/07 05:29:57 wessels Exp $
+ * $Id: tools.cc,v 1.112 1997/07/14 03:33:41 wessels Exp $
  *
  * DEBUG: section 21    Misc Functions
  * AUTHOR: Harvest Derived
@@ -106,10 +106,6 @@
 
 #include "squid.h"
 
-int do_mallinfo = 0;		/* don't do mallinfo() unless this gets set */
-time_t squid_curtime;
-struct timeval current_time;
-
 #define DEAD_MSG "\
 The Squid Cache (version %s) died.\n\
 \n\