[experimental-ims] 9393154 Remove some unused #includes

Geoff Simmons geoff at varnish-cache.org
Mon Jan 9 21:52:32 CET 2012


commit 9393154348e1f28b7815ba9c7d9078243ea43645
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Sun Nov 13 09:40:14 2011 +0000

    Remove some unused #includes

diff --git a/lib/libvarnish/binary_heap.c b/lib/libvarnish/binary_heap.c
index ed99f13..33616b5 100644
--- a/lib/libvarnish/binary_heap.c
+++ b/lib/libvarnish/binary_heap.c
@@ -38,12 +38,10 @@
 #include <errno.h>
 #include <limits.h>
 #include <stdint.h>
-#include <stdio.h>		// for testcase
 #include <stdlib.h>
 #include <unistd.h>
 
 #include "binary_heap.h"
-#include "miniobj.h"		// for testcase
 #include "vas.h"
 
 /* Parameters --------------------------------------------------------*/
@@ -457,6 +455,11 @@ binheap_reorder(const struct binheap *bh, unsigned idx)
 }
 
 #ifdef TEST_DRIVER
+
+#include <stdio.h>
+
+#include "miniobj.h"
+
 /* Test driver -------------------------------------------------------*/
 
 static void
diff --git a/lib/libvarnish/vmb.c b/lib/libvarnish/vmb.c
index 8f130f1..692aab2 100644
--- a/lib/libvarnish/vmb.c
+++ b/lib/libvarnish/vmb.c
@@ -58,4 +58,4 @@ vmb_pthread(void)
 	AZ(pthread_mutex_unlock(&mb_mtx));
 }
 
-#endif
+#endif /* VMB_NEEDS_PTHREAD_WORKAROUND_THIS_IS_BAD_FOR_PERFORMANCE */
diff --git a/lib/libvarnish/vnum.c b/lib/libvarnish/vnum.c
index d2f423b..605947e 100644
--- a/lib/libvarnish/vnum.c
+++ b/lib/libvarnish/vnum.c
@@ -35,7 +35,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "vas.h"
 #include "vnum.h"
 
 static const char err_miss_num[] = "Missing number";
diff --git a/lib/libvmod_std/vmod_std.c b/lib/libvmod_std/vmod_std.c
index 79cbf02..f54958f 100644
--- a/lib/libvmod_std/vmod_std.c
+++ b/lib/libvmod_std/vmod_std.c
@@ -33,7 +33,6 @@
 #include <ctype.h>
 #include <errno.h>
 #include <stdarg.h>
-#include <stdint.h>
 #include <stdlib.h>
 #include <syslog.h>
 
diff --git a/lib/libvmod_std/vmod_std_conversions.c b/lib/libvmod_std/vmod_std_conversions.c
index 156cf13..fe8ae96 100644
--- a/lib/libvmod_std/vmod_std_conversions.c
+++ b/lib/libvmod_std/vmod_std_conversions.c
@@ -30,9 +30,7 @@
 #include "config.h"
 
 #include <ctype.h>
-#include <errno.h>
 #include <math.h>
-#include <stdint.h>
 #include <stdlib.h>
 
 #include "../../bin/varnishd/cache.h"



More information about the varnish-commit mailing list