From 3a8cc0e363d80c68159561ab2c4e0623b096c1e6 Mon Sep 17 00:00:00 2001
From: phk <phk@d4fa192b-c00b-0410-8231-f00ffab90ce4>
Date: Mon, 7 Aug 2006 16:42:11 +0000
Subject: [PATCH] Add our own assert in libvarnish.h

Include libvarnish.h from cache.h and mgt.h



git-svn-id: svn+ssh://projects.linpro.no/svn/varnish/trunk@740 d4fa192b-c00b-0410-8231-f00ffab90ce4
---
 varnish-cache/bin/varnishd/cache.h            |  3 ++-
 varnish-cache/bin/varnishd/cache_session.c    |  1 -
 varnish-cache/bin/varnishd/hash_classic.c     |  1 -
 varnish-cache/bin/varnishd/mgt.h              |  2 ++
 varnish-cache/bin/varnishd/mgt_child.c        |  2 --
 varnish-cache/bin/varnishd/mgt_cli.c          |  1 -
 varnish-cache/bin/varnishd/mgt_event.c        |  2 +-
 varnish-cache/bin/varnishd/mgt_vcc.c          |  2 --
 varnish-cache/bin/varnishd/shmlog.c           |  1 -
 varnish-cache/bin/varnishd/storage_file.c     |  1 -
 varnish-cache/bin/varnishd/tcp.c              |  2 --
 varnish-cache/bin/varnishd/varnishd.c         |  2 --
 varnish-cache/bin/varnishlog/varnishlog.c     |  1 -
 varnish-cache/bin/varnishncsa/varnishncsa.c   |  1 -
 .../bin/varnishtester/varnishtester.c         |  1 -
 varnish-cache/bin/varnishtop/varnishtop.c     |  1 -
 varnish-cache/include/libvarnish.h            | 14 +++++++++++++
 varnish-cache/lib/libvarnish/Makefile.am      |  1 +
 varnish-cache/lib/libvarnish/argv.c           |  1 -
 varnish-cache/lib/libvarnish/assert.c         | 21 +++++++++++++++++++
 20 files changed, 41 insertions(+), 20 deletions(-)
 create mode 100644 varnish-cache/lib/libvarnish/assert.c

diff --git a/varnish-cache/bin/varnishd/cache.h b/varnish-cache/bin/varnishd/cache.h
index ff875c53..1558f374 100644
--- a/varnish-cache/bin/varnishd/cache.h
+++ b/varnish-cache/bin/varnishd/cache.h
@@ -5,13 +5,14 @@
 #include <sys/time.h>
 #include <sys/uio.h>
 
-#include <assert.h>
 #include <pthread.h>
 #include <stdint.h>
 
 #include "queue.h"
 #include "vsb.h"
 
+#include "libvarnish.h"
+
 #include "vcl_returns.h"
 #include "common.h"
 #include "miniobj.h"
diff --git a/varnish-cache/bin/varnishd/cache_session.c b/varnish-cache/bin/varnishd/cache_session.c
index c38dcf2e..abe36f13 100644
--- a/varnish-cache/bin/varnishd/cache_session.c
+++ b/varnish-cache/bin/varnishd/cache_session.c
@@ -17,7 +17,6 @@
 #include <sys/uio.h>
 #include <sys/socket.h>
 
-#include "libvarnish.h"
 #include "heritage.h"
 #include "shmlog.h"
 #include "cache.h"
diff --git a/varnish-cache/bin/varnishd/hash_classic.c b/varnish-cache/bin/varnishd/hash_classic.c
index 33df6106..d300d265 100644
--- a/varnish-cache/bin/varnishd/hash_classic.c
+++ b/varnish-cache/bin/varnishd/hash_classic.c
@@ -10,7 +10,6 @@
 #include <sys/types.h>
 #include <md5.h>
 
-#include <libvarnish.h>
 #include <cache.h>
 
 /*--------------------------------------------------------------------*/
diff --git a/varnish-cache/bin/varnishd/mgt.h b/varnish-cache/bin/varnishd/mgt.h
index 807fe455..78ecb501 100644
--- a/varnish-cache/bin/varnishd/mgt.h
+++ b/varnish-cache/bin/varnishd/mgt.h
@@ -5,6 +5,8 @@
 #include "common.h"
 #include "miniobj.h"
 
+#include "libvarnish.h"
+
 extern struct evbase	*mgt_evb;
 
 /* mgt_child.c */
diff --git a/varnish-cache/bin/varnishd/mgt_child.c b/varnish-cache/bin/varnishd/mgt_child.c
index 2b2c3db3..c0650e82 100644
--- a/varnish-cache/bin/varnishd/mgt_child.c
+++ b/varnish-cache/bin/varnishd/mgt_child.c
@@ -10,7 +10,6 @@
 #include <fcntl.h>
 #include <stdlib.h>
 #include <signal.h>
-#include <assert.h>
 #include <errno.h>
 #include <poll.h>
 #include <sys/types.h>
@@ -18,7 +17,6 @@
 
 #include <err.h>		/* XXX */
 
-#include "libvarnish.h"
 #include "heritage.h"
 #include "mgt.h"
 #include "cli.h"
diff --git a/varnish-cache/bin/varnishd/mgt_cli.c b/varnish-cache/bin/varnishd/mgt_cli.c
index 358480bc..7eb423bd 100644
--- a/varnish-cache/bin/varnishd/mgt_cli.c
+++ b/varnish-cache/bin/varnishd/mgt_cli.c
@@ -6,7 +6,6 @@
 
 #include <sys/types.h>
 
-#include <assert.h>
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/varnish-cache/bin/varnishd/mgt_event.c b/varnish-cache/bin/varnishd/mgt_event.c
index 25dd6b75..04f22cf0 100644
--- a/varnish-cache/bin/varnishd/mgt_event.c
+++ b/varnish-cache/bin/varnishd/mgt_event.c
@@ -3,7 +3,6 @@
  */
 
 #include <stdio.h>
-#include <assert.h>
 #include <errno.h>
 #include <poll.h>
 #include <time.h>
@@ -11,6 +10,7 @@
 #include <string.h>
 #include <stdlib.h>
 
+#include "mgt.h"
 #include "mgt_event.h"
 #include "miniobj.h"
 #include "binary_heap.h"
diff --git a/varnish-cache/bin/varnishd/mgt_vcc.c b/varnish-cache/bin/varnishd/mgt_vcc.c
index 2f46316c..95c7c6a8 100644
--- a/varnish-cache/bin/varnishd/mgt_vcc.c
+++ b/varnish-cache/bin/varnishd/mgt_vcc.c
@@ -6,7 +6,6 @@
 
 #include <sys/types.h>
 
-#include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -16,7 +15,6 @@
 #include "vsb.h"
 #include "queue.h"
 
-#include "libvarnish.h"
 #include "libvcl.h"
 #include "cli.h"
 #include "cli_priv.h"
diff --git a/varnish-cache/bin/varnishd/shmlog.c b/varnish-cache/bin/varnishd/shmlog.c
index 74747f7b..dbb344f4 100644
--- a/varnish-cache/bin/varnishd/shmlog.c
+++ b/varnish-cache/bin/varnishd/shmlog.c
@@ -11,7 +11,6 @@
 #include <stdarg.h>
 #include <sys/mman.h>
 
-#include "libvarnish.h"
 #include "shmlog.h"
 #include "cache.h"
 
diff --git a/varnish-cache/bin/varnishd/storage_file.c b/varnish-cache/bin/varnishd/storage_file.c
index ef0e97f7..47bb31ca 100644
--- a/varnish-cache/bin/varnishd/storage_file.c
+++ b/varnish-cache/bin/varnishd/storage_file.c
@@ -20,7 +20,6 @@
 #include <unistd.h>
 
 #include "compat.h"
-#include "libvarnish.h"
 #include "shmlog.h"
 #include "cache.h"
 
diff --git a/varnish-cache/bin/varnishd/tcp.c b/varnish-cache/bin/varnishd/tcp.c
index 68bd8c0c..5df51724 100644
--- a/varnish-cache/bin/varnishd/tcp.c
+++ b/varnish-cache/bin/varnishd/tcp.c
@@ -5,7 +5,6 @@
 #include <sys/types.h>
 #include <sys/socket.h>
 
-#include <assert.h>
 #include <errno.h>
 #include <netdb.h>
 #include <stdio.h>
@@ -13,7 +12,6 @@
 
 #include "heritage.h"
 #include "mgt.h"
-#include "libvarnish.h"
 
 /*--------------------------------------------------------------------*/
 
diff --git a/varnish-cache/bin/varnishd/varnishd.c b/varnish-cache/bin/varnishd/varnishd.c
index 904b5978..c32e7133 100644
--- a/varnish-cache/bin/varnishd/varnishd.c
+++ b/varnish-cache/bin/varnishd/varnishd.c
@@ -4,7 +4,6 @@
  * The management process and CLI handling
  */
 
-#include <assert.h>
 #include <string.h>
 #include <errno.h>
 #include <fcntl.h>
@@ -19,7 +18,6 @@
 
 #include "vsb.h"
 
-#include "libvarnish.h"
 #include "cli.h"
 #include "cli_priv.h"
 #include "cli_common.h"
diff --git a/varnish-cache/bin/varnishlog/varnishlog.c b/varnish-cache/bin/varnishlog/varnishlog.c
index 3df3f2fe..3a07ae00 100644
--- a/varnish-cache/bin/varnishlog/varnishlog.c
+++ b/varnish-cache/bin/varnishlog/varnishlog.c
@@ -9,7 +9,6 @@
 #include <string.h>
 #include <stdlib.h>
 #include <unistd.h>
-#include <assert.h>
 #include <vis.h>
 
 #include "vsb.h"
diff --git a/varnish-cache/bin/varnishncsa/varnishncsa.c b/varnish-cache/bin/varnishncsa/varnishncsa.c
index 372791c6..c8550d10 100644
--- a/varnish-cache/bin/varnishncsa/varnishncsa.c
+++ b/varnish-cache/bin/varnishncsa/varnishncsa.c
@@ -17,7 +17,6 @@
 #include <string.h>
 #include <stdlib.h>
 #include <unistd.h>
-#include <assert.h>
 #include <vis.h>
 #include <time.h>
 
diff --git a/varnish-cache/bin/varnishtester/varnishtester.c b/varnish-cache/bin/varnishtester/varnishtester.c
index 6ce91fd4..e310c9b4 100644
--- a/varnish-cache/bin/varnishtester/varnishtester.c
+++ b/varnish-cache/bin/varnishtester/varnishtester.c
@@ -1,5 +1,4 @@
 
-#include <assert.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
diff --git a/varnish-cache/bin/varnishtop/varnishtop.c b/varnish-cache/bin/varnishtop/varnishtop.c
index 0818c726..050836b4 100644
--- a/varnish-cache/bin/varnishtop/varnishtop.c
+++ b/varnish-cache/bin/varnishtop/varnishtop.c
@@ -10,7 +10,6 @@
 #include <string.h>
 #include <stdlib.h>
 #include <unistd.h>
-#include <assert.h>
 #include <curses.h>
 #include <vis.h>
 
diff --git a/varnish-cache/include/libvarnish.h b/varnish-cache/include/libvarnish.h
index d1dd724d..d0684b93 100644
--- a/varnish-cache/include/libvarnish.h
+++ b/varnish-cache/include/libvarnish.h
@@ -2,6 +2,7 @@
  * $Id$
  */
 
+#include <errno.h>
 #include <time.h>
 
 /* from libvarnish/argv.c */
@@ -15,5 +16,18 @@ time_t TIM_parse(const char *p);
 /* from libvarnish/version.c */
 void varnish_version(const char *);
 
+/* from libvarnish/assert.c */
+#ifdef WITHOUT_ASSERTS
+#define assert(e)	((void)0)
+#else /* WITH_ASSERTS */
+#define assert(e)							\
+do { 									\
+	if (e)								\
+		__assert(__func__, __FILE__, __LINE__, #e, errno);	\
+} while (0)
+#endif
+
+void __assert(const char *, const char *, int, const char *, int);
+
 /* Assert zero return value */
 #define AZ(foo)	do { assert((foo) == 0); } while (0)
diff --git a/varnish-cache/lib/libvarnish/Makefile.am b/varnish-cache/lib/libvarnish/Makefile.am
index 1a3469bc..b94f9742 100644
--- a/varnish-cache/lib/libvarnish/Makefile.am
+++ b/varnish-cache/lib/libvarnish/Makefile.am
@@ -6,6 +6,7 @@ lib_LTLIBRARIES = libvarnish.la
 
 libvarnish_la_SOURCES = \
 	argv.c \
+	assert.c \
 	binary_heap.c \
 	cli.c \
 	cli_common.c \
diff --git a/varnish-cache/lib/libvarnish/argv.c b/varnish-cache/lib/libvarnish/argv.c
index 29388f33..94adda91 100644
--- a/varnish-cache/lib/libvarnish/argv.c
+++ b/varnish-cache/lib/libvarnish/argv.c
@@ -12,7 +12,6 @@
  */
 
 #include <ctype.h>
-#include <assert.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <stdint.h>
diff --git a/varnish-cache/lib/libvarnish/assert.c b/varnish-cache/lib/libvarnish/assert.c
new file mode 100644
index 00000000..2d86ed45
--- /dev/null
+++ b/varnish-cache/lib/libvarnish/assert.c
@@ -0,0 +1,21 @@
+/*
+ * $Id$
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <errno.h>
+#include <string.h>
+
+
+void
+__assert(const char *func, const char *file, int line, const char *cond, int err)
+{
+
+	fprintf(stderr,
+	    "Assert error in %s(), %s line %s:\n"
+	    "  Condition(%s) not true.\n"
+	    "  errno = %d (%s)\n", func, file, line, cond, err, strerror(err));
+	abort();
+}
+
-- 
2.39.5