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

diff --git a/varnish-cache/bin/varnishd/cache.h b/varnish-cache/bin/varnishd/cache.h
index 302ef08a6dfc4973b694657e8e53b56cfa24a596..fc6dfbbcf3f8536d30be68d8978e19fb637ff8b7 100644 (file)
--- 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 66fc17a6035541727ed769acb551a874e863df6f..b542fdd94835eecf70aec8695cad356a9e4aeadc 100644 (file)
--- 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 9930cc6ff412d3c7c638baf9af9f3ce212179643..06ee4a9e49bda2a40f7ef4529c3c09fc114b1adc 100644 (file)
--- 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 fb996c2123fd91eddf698e3bee087e04bb44f176..1a2777f9e1a959e9e8b9b357032c6fd5ee8d4ae3 100644 (file)
--- 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 0939319c241f75efcc581bf60bf061042a2add28..8141682cfd119f546de41f9e037608910541bf7f 100644 (file)
--- 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 6055259abf1d82596c5c81d43d13a08f39d7e190..b14b2fd90dac66cb25eb64617b4296feb70fca4b 100644 (file)
--- 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 df193be4d32ea21e4d80e4c0aa30b68f9959f007..ba2d5f4ca689d9275fe11f581342745565a49a47 100644 (file)
--- 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 c88ec28fb7f4ed060a84f6cf37ee3dbc137c01e8..9d9f95960a345d57bc5320661c73a3aee2997e2a 100644 (file)
--- 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 4fada869a2dff50425e10814ec4f1a9e0b3585ef..1a05e0f991d65358318692d66c057b271b152867 100644 (file)
--- 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 9f42b0090628d35f5f9efcf7cf7bdd6ca0f9a490..2e0e9eedfa7dd655f863fbea8d54231b3a8f731e 100644 (file)
--- 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 f8e7fc67fcc7723143b251eaae4dca9ba67715c2..1067bebad9ec3fa5a4d4333d72f5ff8bd5c759b4 100644 (file)
--- 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 31f8d66a6ac85e17ffacff174189e672f674e7d3..0d1455668c668789bed8abc850d44fcda7228bdc 100644 (file)
--- 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 a834701207b4dc223ad46e8bcf128515bb2197ea..8d333ca2c72a398dfe54b9c8c1eb85ce7b5feba5 100644 (file)
--- 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 e8803702435eb1f0a94f378ec2e49d8d39d45aab..43c238e4074ef9e57e3b2371e4238217d8f78377 100644 (file)
--- 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 656f0ba89a6f47295dc0eeea5ab976d0e974c82a..0be28ceaf6a1c6e117d02865111ddca96b097736 100644 (file)
--- 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 927a989f697b70b575ab9cea85fad2bf2360351d..eed5e8bb405605c4d6b2c7039374fc33d28766ce 100644 (file)
--- 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 7eb8bf6c78b612f837c7983e8d7b0813b00046cc..506d921839fb6e7f95bd6b85244b027f67d3f123 100644 (file)
--- 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 a7a88c62e0615bd4fe06f21caf806ee4d3ee618e..f79d0e64f4ec9a11d169b3717755637b172dad1e 100644 (file)
--- 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 651ebfbbddb06e28245010c13bc25ec41eb75d02..3b3c67fc3e797fc7608b649be6a940007fd214ee 100644 (file)
--- 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 167ed7dad7b9937ca17f527865534e375909b381..5f1af5beb0d0c0e8f2f70aabcf2cef7d56d57e82 100644 (file)
--- 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"