Also need a generic xassert to go with out assert, to be used by helpers

etc.

diff --git a/include/assert.h b/include/assert.h
index 82aafe6afaacd19d481edc37847123f19fcd2552..7857c015d87f7d0313c00ba200c9ea5a8f1a6bdf 100644 (file)
--- a/include/assert.h
+++ b/include/assert.h
@@ -1,6 +1,6 @@
 
 /*
- * $Id: assert.h,v 1.1 2006/05/10 21:04:24 hno Exp $
+ * $Id: assert.h,v 1.2 2006/05/10 22:03:07 hno Exp $
  *
  * AUTHOR: Duane Wessels
  *
@@ -37,8 +37,6 @@
 
 #include "config.h"
 
-#include "assert.h"
-
 #if PURIFY
 #define assert(EX) ((void)0)
 #elif defined(NODEBUG)
@@ -48,6 +46,6 @@
 #else
 #define assert(EX)  ((EX)?((void)0):xassert("EX", __FILE__, __LINE__))
 #endif
-extern void xassert(const char *, const char *, int);
+SQUIDCEXTERN void xassert(const char *, const char *, int);
 
 #endif

diff --git a/lib/Makefile.am b/lib/Makefile.am
index c676c6b9fa0411407c58be942cb52cb0a0310137..3726f2a9a3499ad958eabf6b9ae977903a6dd3a1 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 #
-#  $Id: Makefile.am,v 1.18 2005/10/30 21:48:22 serassio Exp $
+#  $Id: Makefile.am,v 1.19 2006/05/10 22:03:07 hno Exp $
 #
 
 DIST_SUBDIRS = libTrie cppunit-1.10.0
@@ -69,6 +69,7 @@ libmiscutil_a_SOURCES = \
        stub_memaccount.c \
        util.c \
        uudecode.c \
+       assert.c \
        $(XPROF_STATS_SOURCE)
 libmiscutil_a_LIBADD = \
        libTrie/src/Trie.o \

diff --git a/lib/assert.c b/lib/assert.c
new file mode 100644 (file)
index 0000000..6efe101
--- /dev/null
+++ b/lib/assert.c
@@ -0,0 +1,43 @@
+
+/*
+ * $Id: assert.c,v 1.1 2006/05/10 22:03:07 hno Exp $
+ *
+ * AUTHOR: Henrik Nordstrom
+ *
+ * SQUID Web Proxy Cache          http://www.squid-cache.org/
+ * ----------------------------------------------------------
+ *
+ *  Squid is the result of efforts by numerous individuals from
+ *  the Internet community; see the CONTRIBUTORS file for full
+ *  details.   Many organizations have provided support for Squid's
+ *  development; see the SPONSORS file for full details.  Squid is
+ *  Copyrighted (C) 2001 by the Regents of the University of
+ *  California; see the COPYRIGHT file for full details.  Squid
+ *  incorporates software developed and/or copyrighted by other
+ *  sources; see the CREDITS file for full details.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *  
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *  
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA.
+ *
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+
+#include "assert.h"
+
+void xassert(const char *expr, const char *file, int line) {
+    fprintf(stderr, "assertion failed: %s:%d: \"%s\"\n", file, line, expr);
+    abort();
+}

diff --git a/src/cachemgr.cc b/src/cachemgr.cc
index e26e8d12e4bf6174d09834823ca107fc474fa5bc..836d7aa0f5ba43cc29128e4f1a07f2b2141bc0c8 100644 (file)
--- a/src/cachemgr.cc
+++ b/src/cachemgr.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: cachemgr.cc,v 1.113 2006/02/28 18:05:34 serassio Exp $
+ * $Id: cachemgr.cc,v 1.114 2006/05/10 22:03:07 hno Exp $
  *
  * DEBUG: section 0     CGI Cache Manager
  * AUTHOR: Duane Wessels
@@ -133,7 +133,7 @@ extern "C"
 
 #endif
 
-#include <assert.h>
+#include "assert.h"
 
 #include "util.h"
 #include "snprintf.h"