From: wessels <>
Date: Fri, 13 Nov 1998 13:00:29 +0000 (+0000)
Subject: fixed pinger xassert() link bug
X-Git-Tag: SQUID_3_0_PRE1~2529
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bb71ea1f12fe3ce197ce4f490da1f6ee6fa759cd;p=thirdparty%2Fsquid.git

fixed pinger xassert() link bug
---

diff --git a/src/Makefile.in b/src/Makefile.in
index c093c27df5..10653f02f4 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.163 1998/11/12 06:27:51 wessels Exp $
+#  $Id: Makefile.in,v 1.164 1998/11/13 06:00:29 wessels Exp $
 #
 #  Uncomment and customize the following to suit your needs:
 #
@@ -213,7 +213,7 @@ $(DNSSERVER_EXE): dnsserver.o
 $(CACHEMGR_EXE): cachemgr.o
 	$(CC) -o $@ $(LDFLAGS) cachemgr.o $(CLIENT_LIBS)
 
-$(PINGER_EXE): pinger.o
+$(PINGER_EXE): pinger.o debug.o globals.o
 	$(CC) -o $@ $(LDFLAGS) pinger.o debug.o globals.o $(PINGER_LIBS)
 
 $(UNLINKD_EXE): unlinkd-daemon.o
diff --git a/src/debug.cc b/src/debug.cc
index 7d04fe94d2..7ce6799fb5 100644
--- a/src/debug.cc
+++ b/src/debug.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: debug.cc,v 1.71 1998/08/20 22:29:55 wessels Exp $
+ * $Id: debug.cc,v 1.72 1998/11/13 06:00:30 wessels Exp $
  *
  * DEBUG: section 0     Debug Routines
  * AUTHOR: Harvest Derived
@@ -230,6 +230,14 @@ debugLogTime(time_t t)
     return buf;
 }
 
+void
+xassert(const char *msg, const char *file, int line)
+{   
+    debug(0, 0) ("assertion failed: %s:%d: \"%s\"\n", file, line, msg);
+    if (!shutting_down)
+        abort();
+}
+
 /*
  * Context-based Debugging
  *
diff --git a/src/protos.h b/src/protos.h
index 2aba51afe4..51b8244388 100644
--- a/src/protos.h
+++ b/src/protos.h
@@ -1,6 +1,6 @@
 
 /*
- * $Id: protos.h,v 1.286 1998/11/12 23:07:37 wessels Exp $
+ * $Id: protos.h,v 1.287 1998/11/13 06:00:31 wessels Exp $
  *
  *
  * SQUID Internet Object Cache  http://squid.nlanr.net/Squid/
@@ -190,6 +190,7 @@ extern void _db_print(const char *,...);
 #else
 extern void _db_print();
 #endif
+extern void xassert(const char *, const char *, int);
 
 /* packs, then prints an object using debug() */
 extern void debugObj(int section, int level, const char *label, void *obj, ObjPackMethod pm);
@@ -1016,7 +1017,6 @@ extern double gb_to_double(const gb_t *);
 extern const char *gb_to_str(const gb_t *);
 extern void gb_flush(gb_t *);	/* internal, do not use this */
 extern int stringHasWhitespace(const char *);
-extern void xassert(const char *, const char *, int);
 
 #if USE_HTCP
 extern void htcpInit(void);
diff --git a/src/tools.cc b/src/tools.cc
index a6eacea0e8..0e8e592b97 100644
--- a/src/tools.cc
+++ b/src/tools.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: tools.cc,v 1.171 1998/11/12 23:07:39 wessels Exp $
+ * $Id: tools.cc,v 1.172 1998/11/13 06:00:32 wessels Exp $
  *
  * DEBUG: section 21    Misc Functions
  * AUTHOR: Harvest Derived
@@ -836,11 +836,3 @@ stringHasWhitespace(const char *s)
 {
     return (strcspn(s, w_space) != strlen(s));
 }
-
-void
-xassert(const char *msg, const char *file, int line)
-{
-    debug(0, 0) ("assertion failed: %s:%d: \"%s\"\n", file, line, msg);
-    if (!shutting_down)
-        abort();
-}