Sanitize #includes a bit in the cache process by moving fundamental

#includes to cache.h


git-svn-id: http://www.varnish-cache.org/svn/trunk/varnish-cache@382 d4fa192b-c00b-0410-8231-f00ffab90ce4

bin/varnishd/cache.h

@@ -2,6 +2,7 @@
  * $Id$
  */
 
+#include <assert.h>
 #include <pthread.h>
 #include <sys/time.h>
 #include <queue.h>

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"

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"

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"

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"

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"

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"

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"

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>

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"

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"

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"

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"
 

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"

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"

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>
 

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>

bin/varnishd/rfc2616.c

@@ -4,7 +4,6 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <pthread.h>
 #include <limits.h>
 
 #include "shmlog.h"

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>

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"