From 08674c48c35c67bcef856a866a1ddb71812efb1c Mon Sep 17 00:00:00 2001
From: phk <phk@d4fa192b-c00b-0410-8231-f00ffab90ce4>
Date: Sat, 8 Jul 2006 20:19:17 +0000
Subject: [PATCH] Sanitize #includes a bit in the cache process by moving
 fundamental #includes to cache.h

git-svn-id: svn+ssh://projects.linpro.no/svn/varnish/trunk@382 d4fa192b-c00b-0410-8231-f00ffab90ce4
---
 varnish-cache/bin/varnishd/cache.h            | 1 +
 varnish-cache/bin/varnishd/cache_acceptor.c   | 4 ----
 varnish-cache/bin/varnishd/cache_backend.c    | 5 -----
 varnish-cache/bin/varnishd/cache_ban.c        | 2 --
 varnish-cache/bin/varnishd/cache_expire.c     | 2 --
 varnish-cache/bin/varnishd/cache_fetch.c      | 4 ----
 varnish-cache/bin/varnishd/cache_hash.c       | 4 ----
 varnish-cache/bin/varnishd/cache_http.c       | 3 ---
 varnish-cache/bin/varnishd/cache_main.c       | 6 ------
 varnish-cache/bin/varnishd/cache_pass.c       | 4 ----
 varnish-cache/bin/varnishd/cache_pipe.c       | 4 ----
 varnish-cache/bin/varnishd/cache_pool.c       | 5 -----
 varnish-cache/bin/varnishd/cache_shmlog.c     | 3 +--
 varnish-cache/bin/varnishd/cache_vcl.c        | 3 ---
 varnish-cache/bin/varnishd/cache_vrt.c        | 3 ---
 varnish-cache/bin/varnishd/hash_classic.c     | 3 ---
 varnish-cache/bin/varnishd/hash_simple_list.c | 3 ---
 varnish-cache/bin/varnishd/rfc2616.c          | 1 -
 varnish-cache/bin/varnishd/storage_file.c     | 3 ---
 varnish-cache/bin/varnishd/storage_malloc.c   | 3 ---
 20 files changed, 2 insertions(+), 64 deletions(-)

diff --git a/varnish-cache/bin/varnishd/cache.h b/varnish-cache/bin/varnishd/cache.h
index 302ef08a..fc6dfbbc 100644
--- a/varnish-cache/bin/varnishd/cache.h
+++ b/varnish-cache/bin/varnishd/cache.h
@@ -2,6 +2,7 @@
  * $Id$
  */
 
+#include <assert.h>
 #include <pthread.h>
 #include <sys/time.h>
 #include <queue.h>
diff --git a/varnish-cache/bin/varnishd/cache_acceptor.c b/varnish-cache/bin/varnishd/cache_acceptor.c
index 66fc17a6..b542fdd9 100644
--- a/varnish-cache/bin/varnishd/cache_acceptor.c
+++ b/varnish-cache/bin/varnishd/cache_acceptor.c
@@ -8,20 +8,16 @@
 
 #include <stdio.h>
 #include <string.h>
-#include <assert.h>
 #include <stdlib.h>
 #include <unistd.h>
-#include <pthread.h>
 
 #include <sys/uio.h>
 #include <sys/types.h>
 #include <sys/socket.h>
-#include <queue.h>
 
 #include <netdb.h>
 
 #include <sbuf.h>
-#include <event.h>
 
 #include "config.h"
 #include "compat.h"
diff --git a/varnish-cache/bin/varnishd/cache_backend.c b/varnish-cache/bin/varnishd/cache_backend.c
index 9930cc6f..06ee4a9e 100644
--- a/varnish-cache/bin/varnishd/cache_backend.c
+++ b/varnish-cache/bin/varnishd/cache_backend.c
@@ -25,10 +25,7 @@
 #include <sys/types.h>
 #include <sys/socket.h>
 
-#include <assert.h>
 #include <netdb.h>
-#include <pthread.h>
-#include <queue.h>
 #include <sbuf.h>
 #include <errno.h>
 #include <stdio.h>
@@ -38,8 +35,6 @@
 #include <sys/select.h>
 #include <sys/ioctl.h>
 
-#include <event.h>
-
 #include "libvarnish.h"
 #include "shmlog.h"
 #include "cache.h"
diff --git a/varnish-cache/bin/varnishd/cache_ban.c b/varnish-cache/bin/varnishd/cache_ban.c
index fb996c21..1a2777f9 100644
--- a/varnish-cache/bin/varnishd/cache_ban.c
+++ b/varnish-cache/bin/varnishd/cache_ban.c
@@ -4,11 +4,9 @@
  * Ban processing
  */
 
-#include <assert.h>
 #include <stdlib.h>
 #include <string.h>
 #include <regex.h>
-#include <pthread.h>
 
 #include "shmlog.h"
 #include "cli_priv.h"
diff --git a/varnish-cache/bin/varnishd/cache_expire.c b/varnish-cache/bin/varnishd/cache_expire.c
index 0939319c..8141682c 100644
--- a/varnish-cache/bin/varnishd/cache_expire.c
+++ b/varnish-cache/bin/varnishd/cache_expire.c
@@ -4,9 +4,7 @@
  * Expiry of cached objects and execution of prefetcher
  */
 
-#include <pthread.h>
 #include <unistd.h>
-#include <assert.h>
 #include <stdio.h>
 
 #include "libvarnish.h"
diff --git a/varnish-cache/bin/varnishd/cache_fetch.c b/varnish-cache/bin/varnishd/cache_fetch.c
index 6055259a..b14b2fd9 100644
--- a/varnish-cache/bin/varnishd/cache_fetch.c
+++ b/varnish-cache/bin/varnishd/cache_fetch.c
@@ -2,7 +2,6 @@
  * $Id$
  */
 
-#include <assert.h>
 #include <stdio.h>
 #include <ctype.h>
 #include <inttypes.h>
@@ -10,13 +9,10 @@
 #include <string.h>
 #include <stdlib.h>
 #include <fcntl.h>
-#include <pthread.h>
-#include <queue.h>
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <netdb.h>
 #include <sbuf.h>
-#include <event.h>
 
 #include "libvarnish.h"
 #include "shmlog.h"
diff --git a/varnish-cache/bin/varnishd/cache_hash.c b/varnish-cache/bin/varnishd/cache_hash.c
index df193be4..ba2d5f4c 100644
--- a/varnish-cache/bin/varnishd/cache_hash.c
+++ b/varnish-cache/bin/varnishd/cache_hash.c
@@ -4,13 +4,9 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <assert.h>
 #include <string.h>
 #include <sys/types.h>
 #include <fcntl.h>
-#include <event.h>
-#include <pthread.h>
-#include <queue.h>
 
 #include "libvarnish.h"
 #include "shmlog.h"
diff --git a/varnish-cache/bin/varnishd/cache_http.c b/varnish-cache/bin/varnishd/cache_http.c
index c88ec28f..9d9f9596 100644
--- a/varnish-cache/bin/varnishd/cache_http.c
+++ b/varnish-cache/bin/varnishd/cache_http.c
@@ -5,13 +5,10 @@
  */
 
 #include <stdio.h>
-#include <assert.h>
 #include <unistd.h>
 #include <stdlib.h>
 #include <string.h>
-#include <pthread.h>
 #include <ctype.h>
-#include <event.h>
 #include <sbuf.h>
 
 #include "libvarnish.h"
diff --git a/varnish-cache/bin/varnishd/cache_main.c b/varnish-cache/bin/varnishd/cache_main.c
index 4fada869..1a05e0f9 100644
--- a/varnish-cache/bin/varnishd/cache_main.c
+++ b/varnish-cache/bin/varnishd/cache_main.c
@@ -4,14 +4,8 @@
 
 #include <stdio.h>
 #include <unistd.h>
-#include <assert.h>
 #include <stdlib.h>
 #include <signal.h>
-#include <sys/time.h>
-
-#include <pthread.h>
-
-#include <event.h>
 
 #include <cli.h>
 #include <cli_priv.h>
diff --git a/varnish-cache/bin/varnishd/cache_pass.c b/varnish-cache/bin/varnishd/cache_pass.c
index 9f42b009..2e0e9eed 100644
--- a/varnish-cache/bin/varnishd/cache_pass.c
+++ b/varnish-cache/bin/varnishd/cache_pass.c
@@ -2,20 +2,16 @@
  * $Id$
  */
 
-#include <assert.h>
 #include <stdio.h>
 #include <inttypes.h>
 #include <unistd.h>
 #include <string.h>
 #include <stdlib.h>
 #include <fcntl.h>
-#include <pthread.h>
-#include <queue.h>
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <netdb.h>
 #include <sbuf.h>
-#include <event.h>
 
 #include "libvarnish.h"
 #include "shmlog.h"
diff --git a/varnish-cache/bin/varnishd/cache_pipe.c b/varnish-cache/bin/varnishd/cache_pipe.c
index f8e7fc67..1067beba 100644
--- a/varnish-cache/bin/varnishd/cache_pipe.c
+++ b/varnish-cache/bin/varnishd/cache_pipe.c
@@ -2,16 +2,12 @@
  * $Id$
  */
 
-#include <assert.h>
 #include <stdio.h>
 #include <unistd.h>
 #include <string.h>
 #include <stdlib.h>
-#include <pthread.h>
-#include <queue.h>
 #include <sys/socket.h>
 #include <sbuf.h>
-#include <event.h>
 
 #include "libvarnish.h"
 #include "shmlog.h"
diff --git a/varnish-cache/bin/varnishd/cache_pool.c b/varnish-cache/bin/varnishd/cache_pool.c
index 31f8d66a..0d145566 100644
--- a/varnish-cache/bin/varnishd/cache_pool.c
+++ b/varnish-cache/bin/varnishd/cache_pool.c
@@ -7,13 +7,8 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <assert.h>
-#include <pthread.h>
 #include <unistd.h>
-#include <queue.h>
-#include <sys/time.h>
 #include <sbuf.h>
-#include <event.h>
 
 #include "libvarnish.h"
 #include "heritage.h"
diff --git a/varnish-cache/bin/varnishd/cache_shmlog.c b/varnish-cache/bin/varnishd/cache_shmlog.c
index a8347012..8d333ca2 100644
--- a/varnish-cache/bin/varnishd/cache_shmlog.c
+++ b/varnish-cache/bin/varnishd/cache_shmlog.c
@@ -7,14 +7,13 @@
 #include <unistd.h>
 #include <errno.h>
 #include <fcntl.h>
-#include <assert.h>
 #include <string.h>
 #include <stdarg.h>
 #include <sys/mman.h>
-#include <pthread.h>
 
 #include "libvarnish.h"
 #include "shmlog.h"
+#include "cache.h"
 
 #include "heritage.h"
 
diff --git a/varnish-cache/bin/varnishd/cache_vcl.c b/varnish-cache/bin/varnishd/cache_vcl.c
index e8803702..43c238e4 100644
--- a/varnish-cache/bin/varnishd/cache_vcl.c
+++ b/varnish-cache/bin/varnishd/cache_vcl.c
@@ -5,11 +5,8 @@
 #include <stdio.h>
 #include <unistd.h>
 #include <string.h>
-#include <assert.h>
 #include <stdlib.h>
-#include <pthread.h>
 #include <dlfcn.h>
-#include <queue.h>
 
 #include "cli.h"
 #include "cli_priv.h"
diff --git a/varnish-cache/bin/varnishd/cache_vrt.c b/varnish-cache/bin/varnishd/cache_vrt.c
index 656f0ba8..0be28cea 100644
--- a/varnish-cache/bin/varnishd/cache_vrt.c
+++ b/varnish-cache/bin/varnishd/cache_vrt.c
@@ -7,11 +7,8 @@
 
 #include <stdio.h>
 #include <string.h>
-#include <assert.h>
 #include <stdlib.h>
-#include <pthread.h>
 #include <dlfcn.h>
-#include <queue.h>
 
 #include "cli.h"
 #include "cli_priv.h"
diff --git a/varnish-cache/bin/varnishd/hash_classic.c b/varnish-cache/bin/varnishd/hash_classic.c
index 927a989f..eed5e8bb 100644
--- a/varnish-cache/bin/varnishd/hash_classic.c
+++ b/varnish-cache/bin/varnishd/hash_classic.c
@@ -4,12 +4,9 @@
  * A classic bucketed hash
  */
 
-#include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <pthread.h>
-#include <queue.h>
 #include <sys/types.h>
 #include <md5.h>
 
diff --git a/varnish-cache/bin/varnishd/hash_simple_list.c b/varnish-cache/bin/varnishd/hash_simple_list.c
index 7eb8bf6c..506d9218 100644
--- a/varnish-cache/bin/varnishd/hash_simple_list.c
+++ b/varnish-cache/bin/varnishd/hash_simple_list.c
@@ -4,12 +4,9 @@
  * This is the reference hash(/lookup) implementation
  */
 
-#include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <pthread.h>
-#include <queue.h>
 
 #include <libvarnish.h>
 #include <cache.h>
diff --git a/varnish-cache/bin/varnishd/rfc2616.c b/varnish-cache/bin/varnishd/rfc2616.c
index a7a88c62..f79d0e64 100644
--- a/varnish-cache/bin/varnishd/rfc2616.c
+++ b/varnish-cache/bin/varnishd/rfc2616.c
@@ -4,7 +4,6 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <pthread.h>
 #include <limits.h>
 
 #include "shmlog.h"
diff --git a/varnish-cache/bin/varnishd/storage_file.c b/varnish-cache/bin/varnishd/storage_file.c
index 651ebfbb..3b3c67fc 100644
--- a/varnish-cache/bin/varnishd/storage_file.c
+++ b/varnish-cache/bin/varnishd/storage_file.c
@@ -4,7 +4,6 @@
  * Storage method based on mmap'ed file
  */
 
-#include <assert.h>
 #include <stdio.h>
 #include <unistd.h>
 #include <fcntl.h>
@@ -13,9 +12,7 @@
 #include <limits.h>
 #include <stdlib.h>
 #include <string.h>
-#include <queue.h>
 #include <sys/stat.h>
-#include <pthread.h>
 #include <sys/param.h>
 #include <sys/mount.h>
 #include <sys/mman.h>
diff --git a/varnish-cache/bin/varnishd/storage_malloc.c b/varnish-cache/bin/varnishd/storage_malloc.c
index 167ed7da..5f1af5be 100644
--- a/varnish-cache/bin/varnishd/storage_malloc.c
+++ b/varnish-cache/bin/varnishd/storage_malloc.c
@@ -4,10 +4,7 @@
  * Storage method based on malloc(3)
  */
 
-#include <assert.h>
 #include <stdlib.h>
-#include <queue.h>
-#include <pthread.h>
 
 #include "cache.h"
 
-- 
2.39.5