[master] 480a387 more include cleanup for flexelint
Nils Goroll
nils.goroll at uplex.de
Tue Dec 13 14:43:05 CET 2016
commit 480a38733f9c10fd3f8ed53b2b1a2fedad0d94d6
Author: Nils Goroll <nils.goroll at uplex.de>
Date: Tue Dec 13 13:50:39 2016 +0100
more include cleanup for flexelint
cache.h before system includes to avoid duplicate include warnings
- except for stddef.h, which should come before cache.h to avoid warnings on
Linux/gcc
some reordering for the same reason
remove some unused includes
misc cleanup
Still incomplete
diff --git a/bin/varnishd/cache/cache_busyobj.c b/bin/varnishd/cache/cache_busyobj.c
index 0e93dfb..8fbcf43 100644
--- a/bin/varnishd/cache/cache_busyobj.c
+++ b/bin/varnishd/cache/cache_busyobj.c
@@ -32,8 +32,8 @@
#include "config.h"
-#include <stdlib.h>
#include <stddef.h>
+#include <stdlib.h>
#include "cache.h"
diff --git a/bin/varnishd/cache/cache_esi_deliver.c b/bin/varnishd/cache/cache_esi_deliver.c
index 59323ef..97bfd63 100644
--- a/bin/varnishd/cache/cache_esi_deliver.c
+++ b/bin/varnishd/cache/cache_esi_deliver.c
@@ -30,10 +30,11 @@
#include "config.h"
+#include "cache.h"
+
#include <stdio.h>
#include <stdlib.h>
-#include "cache.h"
#include "cache_transport.h"
#include "cache_filter.h"
diff --git a/bin/varnishd/cache/cache_hash.c b/bin/varnishd/cache/cache_hash.c
index 43ad55e..51423f3 100644
--- a/bin/varnishd/cache/cache_hash.c
+++ b/bin/varnishd/cache/cache_hash.c
@@ -52,10 +52,11 @@
#include "config.h"
+#include "cache.h"
+
#include <stdio.h>
#include <stdlib.h>
-#include "cache.h"
#include "cache/cache_transport.h"
#include "hash/hash_slinger.h"
diff --git a/bin/varnishd/cache/cache_http.c b/bin/varnishd/cache/cache_http.c
index 9983911..6c39c3c 100644
--- a/bin/varnishd/cache/cache_http.c
+++ b/bin/varnishd/cache/cache_http.c
@@ -31,10 +31,9 @@
#include "config.h"
-#include <stdio.h>
#include <stddef.h>
-
#include "cache.h"
+#include <stdio.h>
#include "vend.h"
#include "vct.h"
diff --git a/bin/varnishd/cache/cache_lck.c b/bin/varnishd/cache/cache_lck.c
index 03dd243..74cc5b9 100644
--- a/bin/varnishd/cache/cache_lck.c
+++ b/bin/varnishd/cache/cache_lck.c
@@ -35,12 +35,12 @@
#include "config.h"
+#include "cache.h"
+
#include <errno.h>
#include <stdlib.h>
#include <stdio.h>
-#include "cache.h"
-
struct ilck {
unsigned magic;
#define ILCK_MAGIC 0x7b86c8a5
diff --git a/bin/varnishd/cache/cache_main.c b/bin/varnishd/cache/cache_main.c
index 7c076e2..1467706 100644
--- a/bin/varnishd/cache/cache_main.c
+++ b/bin/varnishd/cache/cache_main.c
@@ -29,10 +29,11 @@
#include "config.h"
+#include "cache.h"
+
#include <stdio.h>
#include <stdlib.h>
-#include "cache.h"
#include "common/heritage.h"
#include "vcli_serve.h"
diff --git a/bin/varnishd/cache/cache_mempool.c b/bin/varnishd/cache/cache_mempool.c
index 85ca62c..56edb20 100644
--- a/bin/varnishd/cache/cache_mempool.c
+++ b/bin/varnishd/cache/cache_mempool.c
@@ -29,12 +29,13 @@
*/
#include "config.h"
+
#include <stddef.h>
+#include "cache.h"
+
#include <stdio.h>
#include <stdlib.h>
-#include "cache.h"
-
#include "vtim.h"
struct memitem {
diff --git a/bin/varnishd/cache/cache_req.c b/bin/varnishd/cache/cache_req.c
index c06c10d..71d7733 100644
--- a/bin/varnishd/cache/cache_req.c
+++ b/bin/varnishd/cache/cache_req.c
@@ -32,12 +32,12 @@
#include "config.h"
-#include <errno.h>
+#include "cache.h"
+
#include <poll.h>
#include <stdio.h>
#include <stdlib.h>
-#include "cache.h"
#include "cache_pool.h"
#include "cache_transport.h"
diff --git a/bin/varnishd/cache/cache_session.c b/bin/varnishd/cache/cache_session.c
index 63eb665..c65ad95 100644
--- a/bin/varnishd/cache/cache_session.c
+++ b/bin/varnishd/cache/cache_session.c
@@ -36,11 +36,12 @@
#include "config.h"
+#include "cache.h"
+
#include <errno.h>
#include <stdio.h>
#include <stdlib.h>
-#include "cache.h"
#include "cache_pool.h"
#include "cache_transport.h"
diff --git a/bin/varnishd/cache/cache_shmlog.c b/bin/varnishd/cache/cache_shmlog.c
index 5656b31..a294d65 100644
--- a/bin/varnishd/cache/cache_shmlog.c
+++ b/bin/varnishd/cache/cache_shmlog.c
@@ -29,11 +29,12 @@
#include "config.h"
+#include "cache.h"
+
#include <errno.h>
#include <stdio.h>
#include <stdlib.h>
-#include "cache.h"
#include "common/heritage.h"
#include "vsl_priv.h"
diff --git a/bin/varnishd/cache/cache_vcl.c b/bin/varnishd/cache/cache_vcl.c
index 8df1304..2379d8e 100644
--- a/bin/varnishd/cache/cache_vcl.c
+++ b/bin/varnishd/cache/cache_vcl.c
@@ -30,13 +30,13 @@
#include "config.h"
+#include "cache.h"
+
#include <errno.h>
#include <dlfcn.h>
#include <stdio.h>
#include <stdlib.h>
-#include "cache.h"
-
#include "vcl.h"
#include "vrt.h"
diff --git a/bin/varnishd/cache/cache_vrt_vmod.c b/bin/varnishd/cache/cache_vrt_vmod.c
index 0b7e15f..b7d7bab 100644
--- a/bin/varnishd/cache/cache_vrt_vmod.c
+++ b/bin/varnishd/cache/cache_vrt_vmod.c
@@ -31,12 +31,12 @@
#include "config.h"
+#include "cache.h"
+
#include <dlfcn.h>
#include <stdio.h>
#include <stdlib.h>
-#include "cache.h"
-
#include "vcli_serve.h"
#include "vrt.h"
diff --git a/bin/varnishd/cache/cache_ws.c b/bin/varnishd/cache/cache_ws.c
index 2eb443f..bc416c9 100644
--- a/bin/varnishd/cache/cache_ws.c
+++ b/bin/varnishd/cache/cache_ws.c
@@ -30,10 +30,10 @@
#include "config.h"
-#include <stdio.h>
-
#include "cache.h"
+#include <stdio.h>
+
void
WS_Assert(const struct ws *ws)
{
diff --git a/bin/varnishd/hash/hash_classic.c b/bin/varnishd/hash/hash_classic.c
index 29fffd9..6ad5a0d 100644
--- a/bin/varnishd/hash/hash_classic.c
+++ b/bin/varnishd/hash/hash_classic.c
@@ -31,11 +31,11 @@
#include "config.h"
+#include "cache/cache.h"
+
#include <stdio.h>
#include <stdlib.h>
-#include "cache/cache.h"
-
#include "hash/hash_slinger.h"
static struct VSC_C_lck *lck_hcl;
diff --git a/bin/varnishd/http1/cache_http1_fetch.c b/bin/varnishd/http1/cache_http1_fetch.c
index 153f1d3..f29da00 100644
--- a/bin/varnishd/http1/cache_http1_fetch.c
+++ b/bin/varnishd/http1/cache_http1_fetch.c
@@ -29,12 +29,12 @@
#include "config.h"
+#include "cache/cache.h"
+
#include <errno.h>
#include <stdio.h>
#include <stdlib.h>
-#include "cache/cache.h"
-
#include "vrt.h"
#include "vtcp.h"
#include "vtim.h"
diff --git a/bin/varnishd/http1/cache_http1_fsm.c b/bin/varnishd/http1/cache_http1_fsm.c
index ce1dc7e..dc325e0 100644
--- a/bin/varnishd/http1/cache_http1_fsm.c
+++ b/bin/varnishd/http1/cache_http1_fsm.c
@@ -33,17 +33,17 @@
#include "config.h"
+#include "cache/cache.h"
+
#include <errno.h>
#include <stdio.h>
#include <stdlib.h>
-#include "cache/cache.h"
#include "cache/cache_filter.h"
#include "cache/cache_transport.h"
#include "cache_http1.h"
#include "hash/hash_slinger.h"
-#include "vsb.h"
#include "vtcp.h"
static const char H1NEWREQ[] = "HTTP1::NewReq";
diff --git a/bin/varnishd/http1/cache_http1_line.c b/bin/varnishd/http1/cache_http1_line.c
index 4dcb8c2..8267fca 100644
--- a/bin/varnishd/http1/cache_http1_line.c
+++ b/bin/varnishd/http1/cache_http1_line.c
@@ -35,11 +35,11 @@
#include "config.h"
#include <sys/uio.h>
+#include "cache/cache.h"
#include <errno.h>
#include <stdio.h>
-#include "cache/cache.h"
#include "cache_http1.h"
#include "vtim.h"
diff --git a/bin/varnishd/http1/cache_http1_pipe.c b/bin/varnishd/http1/cache_http1_pipe.c
index 85df545..678a2b1 100644
--- a/bin/varnishd/http1/cache_http1_pipe.c
+++ b/bin/varnishd/http1/cache_http1_pipe.c
@@ -31,11 +31,11 @@
#include "config.h"
+#include "cache/cache.h"
+
#include <poll.h>
#include <stdio.h>
-#include "cache/cache.h"
-
#include "vrt.h"
#include "cache_http1.h"
diff --git a/bin/varnishd/http2/cache_http2_deliver.c b/bin/varnishd/http2/cache_http2_deliver.c
index ab8402f..7666a4d 100644
--- a/bin/varnishd/http2/cache_http2_deliver.c
+++ b/bin/varnishd/http2/cache_http2_deliver.c
@@ -29,6 +29,8 @@
#include "config.h"
+#include "cache/cache.h"
+
#include <netinet/in.h>
#include <ctype.h>
@@ -36,14 +38,12 @@
#include <stdio.h>
#include <stdlib.h>
-#include "cache/cache.h"
#include "cache/cache_filter.h"
#include "cache/cache_transport.h"
#include "http2/cache_http2.h"
#include "vct.h"
-#include "vend.h"
/**********************************************************************/
diff --git a/bin/varnishd/http2/cache_http2_hpack.c b/bin/varnishd/http2/cache_http2_hpack.c
index 9717292..16bf33c 100644
--- a/bin/varnishd/http2/cache_http2_hpack.c
+++ b/bin/varnishd/http2/cache_http2_hpack.c
@@ -29,10 +29,11 @@
#include "config.h"
+#include "cache/cache.h"
+
#include <ctype.h>
#include <stdio.h>
-#include "cache/cache.h"
#include "http2/cache_http2.h"
#include "vct.h"
diff --git a/bin/varnishd/http2/cache_http2_panic.c b/bin/varnishd/http2/cache_http2_panic.c
index 114b25b..6fe519b 100644
--- a/bin/varnishd/http2/cache_http2_panic.c
+++ b/bin/varnishd/http2/cache_http2_panic.c
@@ -29,6 +29,8 @@
#include "config.h"
+#include "cache/cache.h"
+
#include <netinet/in.h>
#include <ctype.h>
@@ -36,14 +38,10 @@
#include <stdio.h>
#include <stdlib.h>
-#include "cache/cache.h"
#include "cache/cache_filter.h"
#include "cache/cache_transport.h"
#include "http2/cache_http2.h"
-#include "vend.h"
-#include "vsb.h"
-
void
h2_sess_panic(struct vsb *vsb, const struct sess *sp)
{
diff --git a/bin/varnishd/http2/cache_http2_proto.c b/bin/varnishd/http2/cache_http2_proto.c
index 06346f8..0f03e15 100644
--- a/bin/varnishd/http2/cache_http2_proto.c
+++ b/bin/varnishd/http2/cache_http2_proto.c
@@ -29,6 +29,8 @@
#include "config.h"
+#include "cache/cache.h"
+
#include <netinet/in.h>
#include <ctype.h>
@@ -36,13 +38,11 @@
#include <stdio.h>
#include <stdlib.h>
-#include "cache/cache.h"
#include "cache/cache_filter.h"
#include "cache/cache_transport.h"
#include "http2/cache_http2.h"
#include "vend.h"
-#include "vsb.h"
#include "vtcp.h"
#include "vtim.h"
diff --git a/bin/varnishd/http2/cache_http2_send.c b/bin/varnishd/http2/cache_http2_send.c
index 2f4aa9f..257d518 100644
--- a/bin/varnishd/http2/cache_http2_send.c
+++ b/bin/varnishd/http2/cache_http2_send.c
@@ -29,6 +29,8 @@
#include "config.h"
+#include "cache/cache.h"
+
#include <netinet/in.h>
#include <ctype.h>
@@ -36,13 +38,11 @@
#include <stdio.h>
#include <stdlib.h>
-#include "cache/cache.h"
#include "cache/cache_filter.h"
#include "cache/cache_transport.h"
#include "http2/cache_http2.h"
#include "vend.h"
-#include "vsb.h"
static void
h2_mk_hdr(uint8_t *hdr, enum h2_frame_e type, uint8_t flags,
diff --git a/bin/varnishd/mgt/mgt_child.c b/bin/varnishd/mgt/mgt_child.c
index 8bba5b7..dded01e 100644
--- a/bin/varnishd/mgt/mgt_child.c
+++ b/bin/varnishd/mgt/mgt_child.c
@@ -31,13 +31,13 @@
#include "config.h"
+#include <signal.h>
#include <sys/types.h>
#include <sys/wait.h>
#include <errno.h>
#include <fcntl.h>
#include <poll.h>
-#include <signal.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
diff --git a/bin/varnishd/mgt/mgt_jail_unix.c b/bin/varnishd/mgt/mgt_jail_unix.c
index 147d00e..a28cdc8 100644
--- a/bin/varnishd/mgt/mgt_jail_unix.c
+++ b/bin/varnishd/mgt/mgt_jail_unix.c
@@ -30,12 +30,12 @@
#include "config.h"
+#include <stdio.h>
#include <errno.h>
#include <fcntl.h>
#include <grp.h>
#include <pwd.h>
#include <string.h>
-#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
#include <sys/stat.h>
diff --git a/bin/varnishd/mgt/mgt_main.c b/bin/varnishd/mgt/mgt_main.c
index 61f8a90..82641f8 100644
--- a/bin/varnishd/mgt/mgt_main.c
+++ b/bin/varnishd/mgt/mgt_main.c
@@ -33,15 +33,15 @@
#include <sys/utsname.h>
+#include <stdarg.h>
+#include <time.h>
#include <ctype.h>
#include <errno.h>
#include <fcntl.h>
#include <stdio.h>
-#include <stdarg.h>
#include <stdlib.h>
#include <string.h>
#include <syslog.h>
-#include <time.h>
#include <unistd.h>
#include "mgt/mgt.h"
diff --git a/bin/varnishd/mgt/mgt_param_tcp.c b/bin/varnishd/mgt/mgt_param_tcp.c
index 27dd249..8def2a4 100644
--- a/bin/varnishd/mgt/mgt_param_tcp.c
+++ b/bin/varnishd/mgt/mgt_param_tcp.c
@@ -34,11 +34,11 @@
#include "config.h"
+#include <sys/types.h>
+#include <sys/socket.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <sys/types.h>
-#include <sys/socket.h>
#include <netinet/in.h>
#include <netinet/tcp.h>
#include <unistd.h>
diff --git a/bin/varnishd/mgt/mgt_shmem.c b/bin/varnishd/mgt/mgt_shmem.c
index e565d06..a131533 100644
--- a/bin/varnishd/mgt/mgt_shmem.c
+++ b/bin/varnishd/mgt/mgt_shmem.c
@@ -46,7 +46,6 @@
#include "vfl.h"
#include "vsm_priv.h"
-#include "vmb.h"
#include "vfil.h"
#ifndef MAP_HASSEMAPHORE
diff --git a/bin/varnishd/proxy/cache_proxy_proto.c b/bin/varnishd/proxy/cache_proxy_proto.c
index 8c777c5..f890b81 100644
--- a/bin/varnishd/proxy/cache_proxy_proto.c
+++ b/bin/varnishd/proxy/cache_proxy_proto.c
@@ -29,17 +29,17 @@
#include "config.h"
+#include "cache/cache.h"
+
#include <netinet/in.h>
#include <netdb.h>
#include <stdlib.h>
-#include "cache/cache.h"
#include "cache/cache_transport.h"
#include "vend.h"
#include "vsa.h"
-#include "vsb.h"
#include "vtcp.h"
/**********************************************************************
diff --git a/bin/varnishd/storage/mgt_storage_persistent.c b/bin/varnishd/storage/mgt_storage_persistent.c
index 918b612..0c87733 100644
--- a/bin/varnishd/storage/mgt_storage_persistent.c
+++ b/bin/varnishd/storage/mgt_storage_persistent.c
@@ -35,13 +35,14 @@
#include "config.h"
+#include "cache/cache.h"
+
#include <sys/mman.h>
#include <errno.h>
#include <stdio.h>
#include <stdlib.h>
-#include "cache/cache.h"
#include "storage/storage.h"
#include "storage/storage_simple.h"
diff --git a/bin/varnishd/storage/stevedore.c b/bin/varnishd/storage/stevedore.c
index c646bdd..0a3fd3f 100644
--- a/bin/varnishd/storage/stevedore.c
+++ b/bin/varnishd/storage/stevedore.c
@@ -33,10 +33,11 @@
#include "config.h"
+#include "cache/cache.h"
+
#include <stdio.h>
#include <stdlib.h>
-#include "cache/cache.h"
#include "hash/hash_slinger.h"
#include "storage/storage.h"
diff --git a/bin/varnishd/storage/storage_file.c b/bin/varnishd/storage/storage_file.c
index 982f70f..139dc02 100644
--- a/bin/varnishd/storage/storage_file.c
+++ b/bin/varnishd/storage/storage_file.c
@@ -31,13 +31,14 @@
#include "config.h"
+#include "cache/cache.h"
+
#include <sys/mman.h>
#include <errno.h>
#include <stdio.h>
#include <stdlib.h>
-#include "cache/cache.h"
#include "storage/storage.h"
#include "storage/storage_simple.h"
diff --git a/bin/varnishd/storage/storage_malloc.c b/bin/varnishd/storage/storage_malloc.c
index e6022e8..0361e52 100644
--- a/bin/varnishd/storage/storage_malloc.c
+++ b/bin/varnishd/storage/storage_malloc.c
@@ -31,10 +31,11 @@
#include "config.h"
+#include "cache/cache.h"
+
#include <stdio.h>
#include <stdlib.h>
-#include "cache/cache.h"
#include "storage/storage.h"
#include "storage/storage_simple.h"
diff --git a/bin/varnishd/storage/storage_persistent.c b/bin/varnishd/storage/storage_persistent.c
index 535ff37..5af148e 100644
--- a/bin/varnishd/storage/storage_persistent.c
+++ b/bin/varnishd/storage/storage_persistent.c
@@ -35,13 +35,14 @@
#include "config.h"
+#include "cache/cache.h"
+
#include <sys/param.h>
#include <sys/mman.h>
#include <stdio.h>
#include <stdlib.h>
-#include "cache/cache.h"
#include "cache/cache_obj.h"
#include "storage/storage.h"
#include "storage/storage_simple.h"
diff --git a/bin/varnishd/storage/storage_persistent_silo.c b/bin/varnishd/storage/storage_persistent_silo.c
index 6a1771a..1ee1c1d 100644
--- a/bin/varnishd/storage/storage_persistent_silo.c
+++ b/bin/varnishd/storage/storage_persistent_silo.c
@@ -34,10 +34,11 @@
#include "config.h"
+#include "cache/cache.h"
+
#include <stdio.h>
#include <stdlib.h>
-#include "cache/cache.h"
#include "cache/cache_obj.h"
#include "storage/storage.h"
#include "storage/storage_simple.h"
diff --git a/bin/varnishd/storage/storage_persistent_subr.c b/bin/varnishd/storage/storage_persistent_subr.c
index 50e36c2..25f0af6 100644
--- a/bin/varnishd/storage/storage_persistent_subr.c
+++ b/bin/varnishd/storage/storage_persistent_subr.c
@@ -35,13 +35,14 @@
#include "config.h"
+#include <stddef.h>
+#include "cache/cache.h"
+
#include <sys/mman.h>
-#include <stddef.h>
#include <stdio.h>
#include <stdlib.h>
-#include "cache/cache.h"
#include "storage/storage.h"
#include "vsha256.h"
diff --git a/bin/varnishd/storage/storage_simple.c b/bin/varnishd/storage/storage_simple.c
index 091aa29..6eba0a8 100644
--- a/bin/varnishd/storage/storage_simple.c
+++ b/bin/varnishd/storage/storage_simple.c
@@ -29,18 +29,17 @@
#include "config.h"
+#include "cache/cache.h"
+
#include <stdio.h>
#include <stdlib.h>
-#include "cache/cache.h"
#include "cache/cache_obj.h"
#include "hash/hash_slinger.h"
#include "storage/storage.h"
#include "storage/storage_simple.h"
-#include "vsb.h"
-
#include "vtim.h"
/* Flags for allocating memory in sml_stv_alloc */
diff --git a/bin/varnishd/waiter/cache_waiter.c b/bin/varnishd/waiter/cache_waiter.c
index f05a865..2d31d36 100644
--- a/bin/varnishd/waiter/cache_waiter.c
+++ b/bin/varnishd/waiter/cache_waiter.c
@@ -30,14 +30,13 @@
#include "config.h"
-#include <errno.h>
+#include "cache/cache.h"
+
#include <stdio.h>
#include <stdlib.h>
#include "binary_heap.h"
-#include "cache/cache.h"
-
#include "waiter/waiter_priv.h"
#include "waiter/mgt_waiter.h"
diff --git a/bin/varnishd/waiter/cache_waiter_epoll.c b/bin/varnishd/waiter/cache_waiter_epoll.c
index 6b6d39b..f19b20b 100644
--- a/bin/varnishd/waiter/cache_waiter_epoll.c
+++ b/bin/varnishd/waiter/cache_waiter_epoll.c
@@ -45,7 +45,6 @@
#include "waiter/waiter_priv.h"
#include "waiter/mgt_waiter.h"
#include "vtim.h"
-#include "vfil.h"
#ifndef EPOLLRDHUP
# define EPOLLRDHUP 0
diff --git a/lib/libvarnish/vcli_proto.c b/lib/libvarnish/vcli_proto.c
index 2409aa4..e9ea299 100644
--- a/lib/libvarnish/vcli_proto.c
+++ b/lib/libvarnish/vcli_proto.c
@@ -39,8 +39,7 @@
#include <string.h>
#include <unistd.h>
-#include "vdef.h"
-#include "vas.h"
+#include "vas.h" // XXX Flexelint "not used" - but req'ed for assert()
#include "vcli.h"
#include "vsha256.h"
diff --git a/lib/libvarnish/vcli_serve.c b/lib/libvarnish/vcli_serve.c
index 119b5f1..9a6cf3e 100644
--- a/lib/libvarnish/vcli_serve.c
+++ b/lib/libvarnish/vcli_serve.c
@@ -31,6 +31,7 @@
#include "config.h"
+#include <time.h>
#include <ctype.h>
#include <errno.h>
#include <poll.h>
@@ -39,7 +40,6 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <time.h>
#include <unistd.h>
#include "vdef.h"
diff --git a/lib/libvarnish/vev.c b/lib/libvarnish/vev.c
index 0ceaaa9..e3f10cf 100644
--- a/lib/libvarnish/vev.c
+++ b/lib/libvarnish/vev.c
@@ -29,6 +29,7 @@
#include "config.h"
+#include <time.h>
#include <errno.h>
#include <poll.h>
#include <pthread.h>
@@ -36,7 +37,6 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <time.h>
#include "vdef.h"
#include "miniobj.h"
diff --git a/lib/libvarnish/vfil.c b/lib/libvarnish/vfil.c
index 9c7af4d..3684fd1 100644
--- a/lib/libvarnish/vfil.c
+++ b/lib/libvarnish/vfil.c
@@ -29,18 +29,17 @@
#include "config.h"
+#include <time.h>
+#include <sys/types.h>
#include <sys/stat.h>
-
#include <errno.h>
#include <fcntl.h>
#include <limits.h>
#include <stdio.h>
#include <stdlib.h>
-#include <time.h>
#include <unistd.h>
#include <stdint.h>
#include <string.h>
-#include <sys/types.h>
#ifdef HAVE_SYS_MOUNT_H
# include <sys/param.h>
# include <sys/mount.h>
diff --git a/lib/libvarnish/vin.c b/lib/libvarnish/vin.c
index be5b0bd..e06a2c0 100644
--- a/lib/libvarnish/vin.c
+++ b/lib/libvarnish/vin.c
@@ -38,7 +38,7 @@
#include <unistd.h>
#include "vsm_priv.h"
-#include "vas.h"
+#include "vas.h" // XXX Flexelint "not used" - but req'ed for assert()
#include "vdef.h"
#include "vin.h"
diff --git a/lib/libvarnish/vlu.c b/lib/libvarnish/vlu.c
index 1029cfd..7a9672e 100644
--- a/lib/libvarnish/vlu.c
+++ b/lib/libvarnish/vlu.c
@@ -34,8 +34,8 @@
#include <string.h>
#include <unistd.h>
+#include "vas.h" // XXX Flexelint "not used" - but req'ed for assert()
#include "miniobj.h"
-#include "vas.h"
#include "vlu.h"
diff --git a/lib/libvarnish/vmb.c b/lib/libvarnish/vmb.c
index a3a7dea..13fc87c 100644
--- a/lib/libvarnish/vmb.c
+++ b/lib/libvarnish/vmb.c
@@ -28,14 +28,14 @@
#include "config.h"
+#ifdef VMB_NEEDS_PTHREAD_WORKAROUND_THIS_IS_BAD_FOR_PERFORMANCE
+
#include <pthread.h>
#include <unistd.h>
#include "vas.h"
#include "vmb.h"
-#ifdef VMB_NEEDS_PTHREAD_WORKAROUND_THIS_IS_BAD_FOR_PERFORMANCE
-
static pthread_mutex_t mb_mtx;
static pthread_once_t mb_mtx_once = PTHREAD_ONCE_INIT;
diff --git a/lib/libvarnish/vpf.c b/lib/libvarnish/vpf.c
index 7670d87..7883adb 100644
--- a/lib/libvarnish/vpf.c
+++ b/lib/libvarnish/vpf.c
@@ -40,8 +40,8 @@
#include <string.h>
#include <unistd.h>
+#include "vas.h" // XXX Flexelint "not used" - but req'ed for assert()
#include "vfl.h"
-#include "vas.h"
#include "vpf.h"
struct vpf_fh {
diff --git a/lib/libvarnish/vre.c b/lib/libvarnish/vre.c
index 56abccf..b625566 100644
--- a/lib/libvarnish/vre.c
+++ b/lib/libvarnish/vre.c
@@ -31,8 +31,8 @@
#include <pcre.h>
#include <string.h>
+#include "vas.h" // XXX Flexelint "not used" - but req'ed for assert()
#include "miniobj.h"
-#include "vas.h"
#include "vre.h"
diff --git a/lib/libvarnish/vsb.c b/lib/libvarnish/vsb.c
index 23fa142..b713642 100644
--- a/lib/libvarnish/vsb.c
+++ b/lib/libvarnish/vsb.c
@@ -37,7 +37,7 @@ __FBSDID("$FreeBSD: head/sys/kern/subr_vsb.c 222004 2011-05-17 06:36:32Z phk $")
#include <string.h>
#include "vdef.h"
-#include "vas.h"
+#include "vas.h" // XXX Flexelint "not used" - but req'ed for assert()
#include "vsb.h"
#define KASSERT(e, m) assert(e)
diff --git a/lib/libvarnish/vtim.c b/lib/libvarnish/vtim.c
index ae19c6f..1af791c 100644
--- a/lib/libvarnish/vtim.c
+++ b/lib/libvarnish/vtim.c
@@ -54,13 +54,13 @@
#include "config.h"
+#include <time.h>
#include <sys/time.h>
#include <math.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <time.h>
#include <unistd.h>
#ifdef __MACH__
#include <mach/mach_time.h>
diff --git a/lib/libvcc/vcc_acl.c b/lib/libvcc/vcc_acl.c
index 10d4ffa..8a8a87a 100644
--- a/lib/libvcc/vcc_acl.c
+++ b/lib/libvcc/vcc_acl.c
@@ -29,13 +29,14 @@
#include "config.h"
+#include <stddef.h>
+
#include <sys/types.h>
#include <sys/socket.h>
#include <netinet/in.h>
#include <netdb.h>
-#include <stddef.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
More information about the varnish-commit
mailing list