[master] e37a675 Cleanup some #inclues
Poul-Henning Kamp
phk at varnish-cache.org
Sat Oct 8 11:20:22 CEST 2011
commit e37a675a170c69bcad462d4af12da1cbc07425b7
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date: Sat Oct 8 09:20:10 2011 +0000
Cleanup some #inclues
diff --git a/bin/varnishd/cache_cli.c b/bin/varnishd/cache_cli.c
index dd26303..79ac6f6 100644
--- a/bin/varnishd/cache_cli.c
+++ b/bin/varnishd/cache_cli.c
@@ -49,7 +49,6 @@
#include "cli_common.h"
#include "cli_serve.h"
#include "cache.h"
-#include "vsb.h"
#include "hash_slinger.h"
pthread_t cli_thread;
diff --git a/bin/varnishd/mgt.h b/bin/varnishd/mgt.h
index a21ca1c..8958ab5 100644
--- a/bin/varnishd/mgt.h
+++ b/bin/varnishd/mgt.h
@@ -33,6 +33,7 @@
#include "vqueue.h"
#include "common.h"
+#include "vsb.h"
#include "miniobj.h"
#include "libvarnish.h"
diff --git a/bin/varnishd/mgt_child.c b/bin/varnishd/mgt_child.c
index 81e1c8d..3d6fa28 100644
--- a/bin/varnishd/mgt_child.c
+++ b/bin/varnishd/mgt_child.c
@@ -51,7 +51,6 @@
#include "mgt_cli.h"
#include "vev.h"
#include "vlu.h"
-#include "vsb.h"
#include "vss.h"
#include "vbm.h"
diff --git a/bin/varnishd/mgt_cli.c b/bin/varnishd/mgt_cli.c
index e31f3f8..45f08af 100644
--- a/bin/varnishd/mgt_cli.c
+++ b/bin/varnishd/mgt_cli.c
@@ -48,7 +48,6 @@
#include "cli_priv.h"
#include "vcli.h"
-#include "vsb.h"
#include "cli_common.h"
#include "cli_serve.h"
#include "vev.h"
diff --git a/bin/varnishd/mgt_vcc.c b/bin/varnishd/mgt_vcc.c
index 9e204bc..6c100bb 100644
--- a/bin/varnishd/mgt_vcc.c
+++ b/bin/varnishd/mgt_vcc.c
@@ -41,14 +41,13 @@
#include <string.h>
#include <unistd.h>
-#include "vsb.h"
+#include "mgt.h"
#include "libvcl.h"
#include "vcli.h"
#include "cli_priv.h"
#include "cli_common.h"
-#include "mgt.h"
#include "mgt_cli.h"
#include "heritage.h"
diff --git a/bin/varnishd/storage_synth.c b/bin/varnishd/storage_synth.c
index 24479e3..1c16b44 100644
--- a/bin/varnishd/storage_synth.c
+++ b/bin/varnishd/storage_synth.c
@@ -36,7 +36,6 @@
#include <stdlib.h>
#include "cache.h"
-#include "vsb.h"
#include "stevedore.h"
#include "hash_slinger.h"
diff --git a/bin/varnishd/varnishd.c b/bin/varnishd/varnishd.c
index fd91d08..2962e74 100644
--- a/bin/varnishd/varnishd.c
+++ b/bin/varnishd/varnishd.c
@@ -50,7 +50,6 @@
#include "compat/daemon.h"
-#include "vsb.h"
#include "vev.h"
#include "vpf.h"
#include "vsha256.h"
diff --git a/bin/varnishtest/vtc.c b/bin/varnishtest/vtc.c
index 3bee42a..f39b628 100644
--- a/bin/varnishtest/vtc.c
+++ b/bin/varnishtest/vtc.c
@@ -43,9 +43,6 @@
#include "libvarnish.h"
#include "vev.h"
-#include "vsb.h"
-#include "vqueue.h"
-#include "miniobj.h"
#include "vtc.h"
diff --git a/bin/varnishtest/vtc.h b/bin/varnishtest/vtc.h
index 5e5cce7..e96940d 100644
--- a/bin/varnishtest/vtc.h
+++ b/bin/varnishtest/vtc.h
@@ -33,7 +33,10 @@
#ifdef HAVE_PTHREAD_NP_H
#include <pthread_np.h>
#endif
+
#include "vqueue.h"
+#include "vsb.h"
+#include "miniobj.h"
struct vsb;
struct vtclog;
diff --git a/bin/varnishtest/vtc_client.c b/bin/varnishtest/vtc_client.c
index 3bd430b..d06b478 100644
--- a/bin/varnishtest/vtc_client.c
+++ b/bin/varnishtest/vtc_client.c
@@ -38,9 +38,6 @@
#include "vtc.h"
-#include "vsb.h"
-#include "vqueue.h"
-#include "miniobj.h"
#include "vss.h"
#include "libvarnish.h"
diff --git a/bin/varnishtest/vtc_http.c b/bin/varnishtest/vtc_http.c
index fddcd26..a0ee01c 100644
--- a/bin/varnishtest/vtc_http.c
+++ b/bin/varnishtest/vtc_http.c
@@ -41,8 +41,6 @@
#include "libvarnish.h"
#include "vct.h"
-#include "miniobj.h"
-#include "vsb.h"
#include "vtc.h"
diff --git a/bin/varnishtest/vtc_log.c b/bin/varnishtest/vtc_log.c
index 18f295a..6b36aa5 100644
--- a/bin/varnishtest/vtc_log.c
+++ b/bin/varnishtest/vtc_log.c
@@ -36,8 +36,6 @@
#include <stdarg.h>
#include "libvarnish.h"
-#include "vsb.h"
-#include "miniobj.h"
#include "vas.h"
#include "vtc.h"
diff --git a/bin/varnishtest/vtc_main.c b/bin/varnishtest/vtc_main.c
index 01a5fe2..d80aa6a 100644
--- a/bin/varnishtest/vtc_main.c
+++ b/bin/varnishtest/vtc_main.c
@@ -42,9 +42,6 @@
#include "libvarnish.h"
#include "vev.h"
-#include "vsb.h"
-#include "vqueue.h"
-#include "miniobj.h"
#include "vtc.h"
diff --git a/bin/varnishtest/vtc_sema.c b/bin/varnishtest/vtc_sema.c
index 071b4c0..4df1979 100644
--- a/bin/varnishtest/vtc_sema.c
+++ b/bin/varnishtest/vtc_sema.c
@@ -35,7 +35,6 @@
#include "vtc.h"
-#include "vqueue.h"
#include "miniobj.h"
#include "libvarnish.h"
diff --git a/bin/varnishtest/vtc_server.c b/bin/varnishtest/vtc_server.c
index d1787b1..9390e5b 100644
--- a/bin/varnishtest/vtc_server.c
+++ b/bin/varnishtest/vtc_server.c
@@ -39,9 +39,6 @@
#include "vtc.h"
-#include "vqueue.h"
-#include "miniobj.h"
-#include "vsb.h"
#include "vss.h"
#include "libvarnish.h"
diff --git a/bin/varnishtest/vtc_varnish.c b/bin/varnishtest/vtc_varnish.c
index 9690a23..ce6a45a 100644
--- a/bin/varnishtest/vtc_varnish.c
+++ b/bin/varnishtest/vtc_varnish.c
@@ -42,13 +42,10 @@
#include <sys/wait.h>
#include <sys/socket.h>
-#include "vqueue.h"
-#include "miniobj.h"
#include "libvarnish.h"
#include "varnishapi.h"
#include "vcli.h"
#include "vss.h"
-#include "vsb.h"
#include "vtc.h"
diff --git a/lib/libvcl/vcc_acl.c b/lib/libvcl/vcc_acl.c
index 30c9eea..6eb451c 100644
--- a/lib/libvcl/vcc_acl.c
+++ b/lib/libvcl/vcc_acl.c
@@ -38,7 +38,6 @@
#include <netdb.h>
#include <netinet/in.h>
-#include "vsb.h"
#include "vrt.h"
#include "vcc_priv.h"
diff --git a/lib/libvcl/vcc_action.c b/lib/libvcl/vcc_action.c
index 353a40b..8c538ef 100644
--- a/lib/libvcl/vcc_action.c
+++ b/lib/libvcl/vcc_action.c
@@ -35,8 +35,6 @@
#include <stdio.h>
#include <string.h>
-#include "vsb.h"
-
#include "vcc_priv.h"
#include "vcc_compile.h"
#include "libvarnish.h"
diff --git a/lib/libvcl/vcc_backend.c b/lib/libvcl/vcc_backend.c
index f79447f..dfe58d2 100644
--- a/lib/libvcl/vcc_backend.c
+++ b/lib/libvcl/vcc_backend.c
@@ -60,7 +60,6 @@
#include <stdlib.h>
#include <string.h>
-#include "vsb.h"
#include "vss.h"
#include "vcc_priv.h"
diff --git a/lib/libvcl/vcc_backend_util.c b/lib/libvcl/vcc_backend_util.c
index 968ec4e..8d2cc1a 100644
--- a/lib/libvcl/vcc_backend_util.c
+++ b/lib/libvcl/vcc_backend_util.c
@@ -34,8 +34,6 @@
#include <stdarg.h>
#include <string.h>
-#include "vsb.h"
-
#include "vcc_priv.h"
#include "vcc_compile.h"
#include "libvarnish.h"
diff --git a/lib/libvcl/vcc_compile.c b/lib/libvcl/vcc_compile.c
index f4a85a0..36efa4b 100644
--- a/lib/libvcl/vcc_compile.c
+++ b/lib/libvcl/vcc_compile.c
@@ -62,10 +62,6 @@
#include <string.h>
#include <unistd.h>
-#include "vqueue.h"
-
-#include "vsb.h"
-
#include "vcc_priv.h"
#include "vcc_compile.h"
diff --git a/lib/libvcl/vcc_compile.h b/lib/libvcl/vcc_compile.h
index ec7caed..a3aa800 100644
--- a/lib/libvcl/vcc_compile.h
+++ b/lib/libvcl/vcc_compile.h
@@ -31,6 +31,7 @@
#include "vqueue.h"
#include "miniobj.h"
+#include "vsb.h"
#include "vcl.h"
#define INDENT 2
diff --git a/lib/libvcl/vcc_dir_dns.c b/lib/libvcl/vcc_dir_dns.c
index 8168a26..a8cb24b 100644
--- a/lib/libvcl/vcc_dir_dns.c
+++ b/lib/libvcl/vcc_dir_dns.c
@@ -36,8 +36,6 @@
#include <string.h>
#include <limits.h>
-#include "vsb.h"
-
#include "vcc_priv.h"
#include "vcc_compile.h"
#include "libvarnish.h"
diff --git a/lib/libvcl/vcc_dir_random.c b/lib/libvcl/vcc_dir_random.c
index 125e7d1..aa362f9 100644
--- a/lib/libvcl/vcc_dir_random.c
+++ b/lib/libvcl/vcc_dir_random.c
@@ -36,8 +36,6 @@
#include <stdarg.h>
#include <string.h>
-#include "vsb.h"
-
#include "vcc_priv.h"
#include "vcc_compile.h"
#include "libvarnish.h"
diff --git a/lib/libvcl/vcc_dir_round_robin.c b/lib/libvcl/vcc_dir_round_robin.c
index 6229c86..67fb118 100644
--- a/lib/libvcl/vcc_dir_round_robin.c
+++ b/lib/libvcl/vcc_dir_round_robin.c
@@ -35,8 +35,6 @@
#include <stdarg.h>
#include <string.h>
-#include "vsb.h"
-
#include "vcc_priv.h"
#include "vcc_compile.h"
#include "libvarnish.h"
diff --git a/lib/libvcl/vcc_expr.c b/lib/libvcl/vcc_expr.c
index 1f1c274..b7b6ba6 100644
--- a/lib/libvcl/vcc_expr.c
+++ b/lib/libvcl/vcc_expr.c
@@ -37,8 +37,6 @@
#include <string.h>
#include <math.h>
-#include "vsb.h"
-
#include "vcc_priv.h"
#include "vcc_compile.h"
#include "libvarnish.h"
diff --git a/lib/libvcl/vcc_parse.c b/lib/libvcl/vcc_parse.c
index c616c3c..23c9bf7 100644
--- a/lib/libvcl/vcc_parse.c
+++ b/lib/libvcl/vcc_parse.c
@@ -32,8 +32,6 @@
#include <stdio.h>
#include <string.h>
-#include "vsb.h"
-
#include "vcc_priv.h"
#include "vcc_compile.h"
#include "libvarnish.h"
diff --git a/lib/libvcl/vcc_storage.c b/lib/libvcl/vcc_storage.c
index 1acb2ed..77c657c 100644
--- a/lib/libvcl/vcc_storage.c
+++ b/lib/libvcl/vcc_storage.c
@@ -59,8 +59,6 @@
#include <stdlib.h>
#include <string.h>
-#include "vsb.h"
-
#include "vcc_priv.h"
#include "vcc_compile.h"
#include "libvarnish.h"
diff --git a/lib/libvcl/vcc_string.c b/lib/libvcl/vcc_string.c
index f643a4b..c6353d7 100644
--- a/lib/libvcl/vcc_string.c
+++ b/lib/libvcl/vcc_string.c
@@ -32,8 +32,6 @@
#include <stdio.h>
#include <string.h>
-#include "vsb.h"
-
#include "vcc_priv.h"
#include "vcc_compile.h"
#include "libvarnish.h"
diff --git a/lib/libvcl/vcc_symb.c b/lib/libvcl/vcc_symb.c
index d473a50..4975c12 100644
--- a/lib/libvcl/vcc_symb.c
+++ b/lib/libvcl/vcc_symb.c
@@ -32,8 +32,6 @@
#include <stdlib.h>
#include <string.h>
-#include "vsb.h"
-
#include "vcc_priv.h"
#include "vcc_compile.h"
#include "libvarnish.h"
diff --git a/lib/libvcl/vcc_token.c b/lib/libvcl/vcc_token.c
index c5766c0..5a79732 100644
--- a/lib/libvcl/vcc_token.c
+++ b/lib/libvcl/vcc_token.c
@@ -34,10 +34,6 @@
#include <stdlib.h>
#include <string.h>
-#include "vqueue.h"
-
-#include "vsb.h"
-
#include "libvarnish.h"
#include "vcc_priv.h"
#include "vcc_compile.h"
diff --git a/lib/libvcl/vcc_var.c b/lib/libvcl/vcc_var.c
index 3871dbc..b6e1ea7 100644
--- a/lib/libvcl/vcc_var.c
+++ b/lib/libvcl/vcc_var.c
@@ -32,8 +32,6 @@
#include <stdio.h>
#include <string.h>
-#include "vsb.h"
-
#include "vcc_priv.h"
#include "vcc_compile.h"
#include "libvarnish.h"
diff --git a/lib/libvcl/vcc_vmod.c b/lib/libvcl/vcc_vmod.c
index f74f874..37a98fd 100644
--- a/lib/libvcl/vcc_vmod.c
+++ b/lib/libvcl/vcc_vmod.c
@@ -32,8 +32,6 @@
#include <dlfcn.h>
#include <string.h>
-#include "vsb.h"
-
#include "vcc_priv.h"
#include "vcc_compile.h"
#include "libvarnish.h"
diff --git a/lib/libvcl/vcc_xref.c b/lib/libvcl/vcc_xref.c
index 2188ef5..560fe78 100644
--- a/lib/libvcl/vcc_xref.c
+++ b/lib/libvcl/vcc_xref.c
@@ -41,8 +41,6 @@
#include <stdio.h>
-#include "vsb.h"
-
#include "libvarnish.h"
#include "vcc_priv.h"
#include "vcc_compile.h"
More information about the varnish-commit
mailing list