[master] b07c34f include cleanup - found by FlexeLint

Nils Goroll nils.goroll at uplex.de
Tue Dec 13 13:40:05 CET 2016


commit b07c34fcfc4922318564af50d53ec17cfe9f59b0
Author: Nils Goroll <nils.goroll at uplex.de>
Date:   Fri Dec 9 11:27:02 2016 +0100

    include cleanup - found by FlexeLint
    
    duplicate includes via cache.h and common.h

diff --git a/bin/varnishd/cache/cache_acceptor.c b/bin/varnishd/cache/cache_acceptor.c
index ceb442c..d5ece5b 100644
--- a/bin/varnishd/cache/cache_acceptor.c
+++ b/bin/varnishd/cache/cache_acceptor.c
@@ -33,8 +33,6 @@
 
 #include "config.h"
 
-#include <sys/types.h>
-
 #include <errno.h>
 #include <stdlib.h>
 #include <netinet/in.h>
diff --git a/bin/varnishd/cache/cache_vcl.c b/bin/varnishd/cache/cache_vcl.c
index c214686..8df1304 100644
--- a/bin/varnishd/cache/cache_vcl.c
+++ b/bin/varnishd/cache/cache_vcl.c
@@ -32,7 +32,6 @@
 
 #include <errno.h>
 #include <dlfcn.h>
-#include <pthread.h>
 #include <stdio.h>
 #include <stdlib.h>
 
diff --git a/bin/varnishd/http1/cache_http1_line.c b/bin/varnishd/http1/cache_http1_line.c
index 9f13543..4dcb8c2 100644
--- a/bin/varnishd/http1/cache_http1_line.c
+++ b/bin/varnishd/http1/cache_http1_line.c
@@ -34,7 +34,6 @@
 
 #include "config.h"
 
-#include <sys/types.h>
 #include <sys/uio.h>
 
 #include <errno.h>
diff --git a/bin/varnishd/http2/cache_http2_deliver.c b/bin/varnishd/http2/cache_http2_deliver.c
index ee3d08f..ab8402f 100644
--- a/bin/varnishd/http2/cache_http2_deliver.c
+++ b/bin/varnishd/http2/cache_http2_deliver.c
@@ -29,16 +29,12 @@
 
 #include "config.h"
 
-#include <sys/types.h>
-#include <sys/socket.h>
-
 #include <netinet/in.h>
 
 #include <ctype.h>
 #include <netdb.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
 
 #include "cache/cache.h"
 #include "cache/cache_filter.h"
diff --git a/bin/varnishd/http2/cache_http2_panic.c b/bin/varnishd/http2/cache_http2_panic.c
index 875f18a..114b25b 100644
--- a/bin/varnishd/http2/cache_http2_panic.c
+++ b/bin/varnishd/http2/cache_http2_panic.c
@@ -29,16 +29,12 @@
 
 #include "config.h"
 
-#include <sys/types.h>
-#include <sys/socket.h>
-
 #include <netinet/in.h>
 
 #include <ctype.h>
 #include <netdb.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
 
 #include "cache/cache.h"
 #include "cache/cache_filter.h"
diff --git a/bin/varnishd/http2/cache_http2_proto.c b/bin/varnishd/http2/cache_http2_proto.c
index ff3278f..06346f8 100644
--- a/bin/varnishd/http2/cache_http2_proto.c
+++ b/bin/varnishd/http2/cache_http2_proto.c
@@ -29,16 +29,12 @@
 
 #include "config.h"
 
-#include <sys/types.h>
-#include <sys/socket.h>
-
 #include <netinet/in.h>
 
 #include <ctype.h>
 #include <netdb.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
 
 #include "cache/cache.h"
 #include "cache/cache_filter.h"
diff --git a/bin/varnishd/http2/cache_http2_send.c b/bin/varnishd/http2/cache_http2_send.c
index 7076cbb..2f4aa9f 100644
--- a/bin/varnishd/http2/cache_http2_send.c
+++ b/bin/varnishd/http2/cache_http2_send.c
@@ -29,16 +29,12 @@
 
 #include "config.h"
 
-#include <sys/types.h>
-#include <sys/socket.h>
-
 #include <netinet/in.h>
 
 #include <ctype.h>
 #include <netdb.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
 
 #include "cache/cache.h"
 #include "cache/cache_filter.h"
diff --git a/bin/varnishd/proxy/cache_proxy_proto.c b/bin/varnishd/proxy/cache_proxy_proto.c
index 264ad4c..8c777c5 100644
--- a/bin/varnishd/proxy/cache_proxy_proto.c
+++ b/bin/varnishd/proxy/cache_proxy_proto.c
@@ -29,14 +29,10 @@
 
 #include "config.h"
 
-#include <sys/types.h>
-#include <sys/socket.h>
-
 #include <netinet/in.h>
 
 #include <netdb.h>
 #include <stdlib.h>
-#include <string.h>
 
 #include "cache/cache.h"
 #include "cache/cache_transport.h"
diff --git a/bin/varnishd/storage/mgt_storage_persistent.c b/bin/varnishd/storage/mgt_storage_persistent.c
index 001193e..918b612 100644
--- a/bin/varnishd/storage/mgt_storage_persistent.c
+++ b/bin/varnishd/storage/mgt_storage_persistent.c
@@ -38,7 +38,6 @@
 #include <sys/mman.h>
 
 #include <errno.h>
-#include <math.h>
 #include <stdio.h>
 #include <stdlib.h>
 
diff --git a/bin/varnishd/storage/storage_persistent.c b/bin/varnishd/storage/storage_persistent.c
index 8d96a5f..535ff37 100644
--- a/bin/varnishd/storage/storage_persistent.c
+++ b/bin/varnishd/storage/storage_persistent.c
@@ -38,7 +38,6 @@
 #include <sys/param.h>
 #include <sys/mman.h>
 
-#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 
diff --git a/bin/varnishd/storage/storage_persistent_silo.c b/bin/varnishd/storage/storage_persistent_silo.c
index b1dd439..6a1771a 100644
--- a/bin/varnishd/storage/storage_persistent_silo.c
+++ b/bin/varnishd/storage/storage_persistent_silo.c
@@ -34,7 +34,6 @@
 
 #include "config.h"
 
-#include <math.h>
 #include <stdio.h>
 #include <stdlib.h>
 
diff --git a/bin/varnishd/storage/storage_umem.c b/bin/varnishd/storage/storage_umem.c
index 5387fa8..edc798f 100644
--- a/bin/varnishd/storage/storage_umem.c
+++ b/bin/varnishd/storage/storage_umem.c
@@ -34,8 +34,6 @@
 
 #if defined(HAVE_LIBUMEM) && 0
 
-#include <sys/types.h>
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <umem.h>
diff --git a/bin/varnishd/waiter/cache_waiter_kqueue.c b/bin/varnishd/waiter/cache_waiter_kqueue.c
index 42d5245..4631306 100644
--- a/bin/varnishd/waiter/cache_waiter_kqueue.c
+++ b/bin/varnishd/waiter/cache_waiter_kqueue.c
@@ -33,7 +33,6 @@
 
 #if defined(HAVE_KQUEUE)
 
-#include <sys/types.h>
 #include <sys/event.h>
 
 #include <errno.h>
diff --git a/lib/libvmod_debug/vmod_debug.c b/lib/libvmod_debug/vmod_debug.c
index 6f589e7..9b4e5e7 100644
--- a/lib/libvmod_debug/vmod_debug.c
+++ b/lib/libvmod_debug/vmod_debug.c
@@ -29,7 +29,6 @@
 #include "config.h"
 
 #include <errno.h>
-#include <pthread.h>
 #include <stdlib.h>
 #include <stdio.h>
 
diff --git a/lib/libvmod_debug/vmod_debug_dyn.c b/lib/libvmod_debug/vmod_debug_dyn.c
index 7e4afea..826595d 100644
--- a/lib/libvmod_debug/vmod_debug_dyn.c
+++ b/lib/libvmod_debug/vmod_debug_dyn.c
@@ -29,12 +29,8 @@
 #include "config.h"
 
 #include <netdb.h>
-#include <pthread.h>
 #include <stdlib.h>
 
-#include <sys/socket.h>
-#include <sys/types.h>
-
 #include "vcl.h"
 #include "vrt.h"
 
diff --git a/lib/libvmod_directors/hash.c b/lib/libvmod_directors/hash.c
index db9626f..299c950 100644
--- a/lib/libvmod_directors/hash.c
+++ b/lib/libvmod_directors/hash.c
@@ -28,7 +28,6 @@
 
 #include "config.h"
 
-#include <math.h>
 #include <stdlib.h>
 
 #include "cache/cache.h"
diff --git a/lib/libvmod_directors/random.c b/lib/libvmod_directors/random.c
index 679fe2e..d964473 100644
--- a/lib/libvmod_directors/random.c
+++ b/lib/libvmod_directors/random.c
@@ -28,7 +28,6 @@
 
 #include "config.h"
 
-#include <math.h>
 #include <stdlib.h>
 
 #include "cache/cache.h"
diff --git a/lib/libvmod_directors/shard_dir.c b/lib/libvmod_directors/shard_dir.c
index 52f9d84..f801798 100644
--- a/lib/libvmod_directors/shard_dir.c
+++ b/lib/libvmod_directors/shard_dir.c
@@ -33,9 +33,7 @@
 #include "config.h"
 
 #include <stdlib.h>
-#include <stdint.h>
 #include <stdio.h>
-#include <math.h>
 #include <time.h>
 
 #include "cache/cache.h"
diff --git a/lib/libvmod_directors/shard_hash.c b/lib/libvmod_directors/shard_hash.c
index 35f1df8..27dd7b4 100644
--- a/lib/libvmod_directors/shard_hash.c
+++ b/lib/libvmod_directors/shard_hash.c
@@ -30,9 +30,6 @@
 
 #include "config.h"
 
-#include <stdint.h>
-#include <string.h>
-
 #include "cache/cache.h"
 
 #include "vrt.h"
diff --git a/lib/libvmod_directors/vmod_shard.c b/lib/libvmod_directors/vmod_shard.c
index 031e364..25ad12d 100644
--- a/lib/libvmod_directors/vmod_shard.c
+++ b/lib/libvmod_directors/vmod_shard.c
@@ -29,7 +29,6 @@
 
 #include "config.h"
 
-#include <stdint.h>
 #include <stdlib.h>
 
 #include "cache/cache.h"
diff --git a/lib/libvmod_std/vmod_std.c b/lib/libvmod_std/vmod_std.c
index 609c56c..5b458d3 100644
--- a/lib/libvmod_std/vmod_std.c
+++ b/lib/libvmod_std/vmod_std.c
@@ -28,12 +28,9 @@
 
 #include "config.h"
 
-#include <sys/types.h>
-#include <sys/socket.h>
 #include <netinet/in.h>
 
 #include <ctype.h>
-#include <stdarg.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 778fa6f..bd746bd 100644
--- a/lib/libvmod_std/vmod_std_conversions.c
+++ b/lib/libvmod_std/vmod_std_conversions.c
@@ -30,11 +30,8 @@
 #include "config.h"
 
 #include <ctype.h>
-#include <math.h>
 #include <stdlib.h>
 
-#include <sys/types.h>
-#include <sys/socket.h>
 #include <netdb.h>
 
 #include "cache/cache.h"
diff --git a/lib/libvmod_std/vmod_std_fileread.c b/lib/libvmod_std/vmod_std_fileread.c
index 2d079a9..c2a7e5f 100644
--- a/lib/libvmod_std/vmod_std_fileread.c
+++ b/lib/libvmod_std/vmod_std_fileread.c
@@ -39,7 +39,6 @@
 
 #include "config.h"
 
-#include <stdint.h>
 #include <stdlib.h>
 
 #include "cache/cache.h"



More information about the varnish-commit mailing list