[master] 2ac54a0 Remove unncessary #includes

Poul-Henning Kamp phk at varnish-cache.org
Sat Oct 8 23:58:10 CEST 2011


commit 2ac54a0443c15f1031fbfd447029de8a7fb01fbe
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Sat Oct 8 21:30:13 2011 +0000

    Remove unncessary #includes

diff --git a/bin/varnishtest/vtc.c b/bin/varnishtest/vtc.c
index f39b628..506aee1 100644
--- a/bin/varnishtest/vtc.c
+++ b/bin/varnishtest/vtc.c
@@ -31,20 +31,16 @@
 #include <stdio.h>
 #include <string.h>
 #include <ctype.h>
-#include <fcntl.h>
-#include <limits.h>
-#include <signal.h>
 #include <stdarg.h>
 #include <stdlib.h>
 #include <unistd.h>
-#include <sys/stat.h>
 #include <sys/types.h>
 #include <sys/wait.h>
 
+#include "vtc.h"
+
 #include "libvarnish.h"
-#include "vev.h"
 
-#include "vtc.h"
 
 #ifndef HAVE_SRANDOMDEV
 #include "compat/srandomdev.h"
diff --git a/bin/varnishtest/vtc_client.c b/bin/varnishtest/vtc_client.c
index d06b478..2c75622 100644
--- a/bin/varnishtest/vtc_client.c
+++ b/bin/varnishtest/vtc_client.c
@@ -30,7 +30,6 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <unistd.h>
 #include <string.h>
 
 #include <sys/types.h>
diff --git a/bin/varnishtest/vtc_http.c b/bin/varnishtest/vtc_http.c
index a0ee01c..4582d4c 100644
--- a/bin/varnishtest/vtc_http.c
+++ b/bin/varnishtest/vtc_http.c
@@ -28,20 +28,18 @@
 
 #include "config.h"
 
-#include <poll.h>
+#include <string.h>
 #include <stdio.h>
 #include <poll.h>
-#include <stdio.h>
-#include <string.h>
 #include <stdlib.h>
-#include <unistd.h>
 
 #include <sys/types.h>
 #include <sys/socket.h>
 
-#include "libvarnish.h"
 #include "vct.h"
 
+#include "libvarnish.h"
+
 #include "vtc.h"
 
 #include "vgz.h"
diff --git a/bin/varnishtest/vtc_log.c b/bin/varnishtest/vtc_log.c
index 6b36aa5..51c6646 100644
--- a/bin/varnishtest/vtc_log.c
+++ b/bin/varnishtest/vtc_log.c
@@ -30,16 +30,13 @@
 
 #include <stdio.h>
 #include <string.h>
-#include <fcntl.h>
 #include <stdlib.h>
-#include <unistd.h>
 #include <stdarg.h>
 
-#include "libvarnish.h"
-#include "vas.h"
-
 #include "vtc.h"
 
+#include "libvarnish.h"
+
 static pthread_mutex_t	vtclog_mtx;
 static char		*vtclog_buf;
 static unsigned		vtclog_left;
diff --git a/bin/varnishtest/vtc_main.c b/bin/varnishtest/vtc_main.c
index d80aa6a..d201946 100644
--- a/bin/varnishtest/vtc_main.c
+++ b/bin/varnishtest/vtc_main.c
@@ -31,8 +31,6 @@
 #include <stdio.h>
 #include <string.h>
 #include <fcntl.h>
-#include <signal.h>
-#include <stdarg.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <sys/mman.h>
@@ -40,11 +38,11 @@
 #include <sys/types.h>
 #include <sys/wait.h>
 
+#include "vtc.h"
+
 #include "libvarnish.h"
 #include "vev.h"
 
-#include "vtc.h"
-
 #ifndef HAVE_SRANDOMDEV
 #include "compat/srandomdev.h"
 #endif
diff --git a/bin/varnishtest/vtc_sema.c b/bin/varnishtest/vtc_sema.c
index 4df1979..8a9228a 100644
--- a/bin/varnishtest/vtc_sema.c
+++ b/bin/varnishtest/vtc_sema.c
@@ -35,7 +35,6 @@
 
 #include "vtc.h"
 
-#include "miniobj.h"
 #include "libvarnish.h"
 
 struct sema {
diff --git a/bin/varnishtest/vtc_server.c b/bin/varnishtest/vtc_server.c
index 9390e5b..d541d67 100644
--- a/bin/varnishtest/vtc_server.c
+++ b/bin/varnishtest/vtc_server.c
@@ -31,7 +31,6 @@
 #include <stdio.h>
 #include <errno.h>
 #include <stdlib.h>
-#include <unistd.h>
 #include <string.h>
 
 #include <sys/types.h>
@@ -39,8 +38,8 @@
 
 #include "vtc.h"
 
-#include "vss.h"
 #include "libvarnish.h"
+#include "vss.h"
 
 struct server {
 	unsigned		magic;
diff --git a/bin/varnishtest/vtc_varnish.c b/bin/varnishtest/vtc_varnish.c
index ce6a45a..aea29a4 100644
--- a/bin/varnishtest/vtc_varnish.c
+++ b/bin/varnishtest/vtc_varnish.c
@@ -34,7 +34,6 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <string.h>
-#include <signal.h>
 #include <poll.h>
 #include <inttypes.h>
 
@@ -42,13 +41,14 @@
 #include <sys/wait.h>
 #include <sys/socket.h>
 
+#include "vtc.h"
+
 #include "libvarnish.h"
 #include "varnishapi.h"
+
 #include "vcli.h"
 #include "vss.h"
 
-#include "vtc.h"
-
 struct varnish {
 	unsigned		magic;
 #define VARNISH_MAGIC		0x208cd8e3



More information about the varnish-commit mailing list