From 4c7e4b7738e267db3288b9eb04bec5c4e744aa69 Mon Sep 17 00:00:00 2001 From: Willy Tarreau Date: Wed, 27 May 2020 12:58:42 +0200 Subject: [PATCH] REORG: include: update all files to use haproxy/api.h or api-t.h if needed All files that were including one of the following include files have been updated to only include haproxy/api.h or haproxy/api-t.h once instead: - common/config.h - common/compat.h - common/compiler.h - common/defaults.h - common/initcall.h - common/tools.h The choice is simple: if the file only requires type definitions, it includes api-t.h, otherwise it includes the full api.h. In addition, in these files, explicit includes for inttypes.h and limits.h were dropped since these are now covered by api.h and api-t.h. No other change was performed, given that this patch is large and affects 201 files. At least one (tools.h) was already freestanding and didn't get the new one added. --- contrib/mod_defender/defender.c | 3 +-- contrib/prometheus-exporter/service-prometheus.c | 3 +-- include/common/base64.h | 2 +- include/common/buffer.h | 2 +- include/common/cfgparse.h | 4 +--- include/common/chunk.h | 2 +- include/common/config.h | 4 +--- include/common/debug.h | 2 +- include/common/fcgi.h | 3 +-- include/common/h1.h | 3 +-- include/common/h2.h | 2 +- include/common/hathreads.h | 3 +-- include/common/hpack-dec.h | 3 +-- include/common/hpack-enc.h | 3 +-- include/common/hpack-tbl.h | 3 +-- include/common/htx.h | 2 +- include/common/ist.h | 2 +- include/common/memory.h | 4 +--- include/common/mini-clist.h | 2 +- include/common/net_helper.h | 2 +- include/common/regex.h | 2 +- include/common/standard.h | 3 +-- include/common/template.h | 2 +- include/common/ticks.h | 2 +- include/common/time.h | 3 +-- include/common/tools.h | 1 - include/common/uri_auth.h | 2 +- include/common/version.h | 2 +- include/import/ebtree.h | 2 +- include/proto/acl.h | 2 +- include/proto/activity.h | 2 +- include/proto/applet.h | 2 +- include/proto/auth.h | 2 +- include/proto/backend.h | 2 +- include/proto/channel.h | 2 +- include/proto/connection.h | 2 +- include/proto/fd.h | 2 +- include/proto/freq_ctr.h | 2 +- include/proto/frontend.h | 2 +- include/proto/http_ana.h | 2 +- include/proto/http_fetch.h | 2 +- include/proto/http_rules.h | 2 +- include/proto/lb_chash.h | 2 +- include/proto/lb_fas.h | 2 +- include/proto/lb_fwlc.h | 2 +- include/proto/lb_fwrr.h | 2 +- include/proto/lb_map.h | 2 +- include/proto/log.h | 2 +- include/proto/mux_pt.h | 2 +- include/proto/obj_type.h | 2 +- include/proto/pattern.h | 2 +- include/proto/payload.h | 2 +- include/proto/peers.h | 2 +- include/proto/pipe.h | 2 +- include/proto/proto_tcp.h | 2 +- include/proto/proxy.h | 2 +- include/proto/queue.h | 2 +- include/proto/server.h | 2 +- include/proto/session.h | 2 +- include/proto/stats.h | 2 +- include/proto/stream.h | 2 +- include/proto/stream_interface.h | 2 +- include/proto/task.h | 2 +- include/proto/tcp_rules.h | 2 +- include/proto/template.h | 2 +- include/proto/trace.h | 3 +-- include/types/acl.h | 3 +-- include/types/activity.h | 2 +- include/types/applet.h | 2 +- include/types/auth.h | 2 +- include/types/backend.h | 2 +- include/types/capture.h | 2 +- include/types/channel.h | 2 +- include/types/checks.h | 2 +- include/types/connection.h | 2 +- include/types/fcgi-app.h | 2 +- include/types/fd.h | 2 +- include/types/filters.h | 2 +- include/types/freq_ctr.h | 2 +- include/types/global.h | 3 +-- include/types/http_ana.h | 2 +- include/types/lb_chash.h | 2 +- include/types/lb_fas.h | 2 +- include/types/lb_fwlc.h | 2 +- include/types/lb_fwrr.h | 2 +- include/types/lb_map.h | 2 +- include/types/listener.h | 2 +- include/types/log.h | 2 +- include/types/pattern.h | 3 +-- include/types/peers.h | 3 +-- include/types/pipe.h | 2 +- include/types/protocol.h | 2 +- include/types/proxy.h | 3 +-- include/types/queue.h | 2 +- include/types/ring.h | 3 +-- include/types/server.h | 2 +- include/types/session.h | 2 +- include/types/signal.h | 2 +- include/types/sink.h | 3 +-- include/types/stream.h | 2 +- include/types/stream_interface.h | 2 +- include/types/task.h | 2 +- include/types/template.h | 2 +- include/types/trace.h | 3 +-- src/51d.c | 2 +- src/acl.c | 3 +-- src/action.c | 2 +- src/activity.c | 3 +-- src/applet.c | 2 +- src/auth.c | 3 +-- src/backend.c | 4 +--- src/base64.c | 2 +- src/buffer.c | 2 +- src/cache.c | 2 +- src/calltrace.c | 2 +- src/cfgparse-ssl.c | 2 +- src/cfgparse.c | 2 +- src/channel.c | 2 +- src/checks.c | 3 +-- src/chunk.c | 2 +- src/cli.c | 4 +--- src/compression.c | 3 +-- src/connection.c | 4 +--- src/da.c | 2 +- src/debug.c | 3 +-- src/dns.c | 2 +- src/ev_epoll.c | 4 +--- src/ev_evports.c | 4 +--- src/ev_kqueue.c | 4 +--- src/ev_poll.c | 3 +-- src/ev_select.c | 3 +-- src/fcgi-app.c | 3 +-- src/fd.c | 3 +-- src/filters.c | 4 +--- src/flt_http_comp.c | 2 +- src/flt_spoe.c | 4 +--- src/flt_trace.c | 3 +-- src/freq_ctr.c | 3 +-- src/frontend.c | 4 +--- src/h1.c | 2 +- src/h1_htx.c | 2 +- src/h2.c | 2 +- src/haproxy.c | 5 +---- src/hlua.c | 4 +--- src/hpack-huff.c | 2 +- src/http.c | 2 +- src/http_acl.c | 4 +--- src/http_act.c | 4 +--- src/http_ana.c | 2 +- src/http_conv.c | 4 +--- src/http_fetch.c | 4 +--- src/http_htx.c | 2 +- src/http_rules.c | 3 +-- src/lb_chash.c | 3 +-- src/lb_fas.c | 3 +-- src/lb_fwlc.c | 3 +-- src/lb_fwrr.c | 3 +-- src/lb_map.c | 3 +-- src/listener.c | 3 +-- src/log.c | 4 +--- src/map.c | 3 +-- src/memory.c | 3 +-- src/mux_fcgi.c | 3 +-- src/mux_h1.c | 3 +-- src/mux_h2.c | 3 +-- src/mux_pt.c | 3 +-- src/mworker-prog.c | 2 +- src/mworker.c | 2 +- src/namespace.c | 2 +- src/pattern.c | 2 +- src/payload.c | 2 +- src/peers.c | 3 +-- src/pipe.c | 2 +- src/proto_sockpair.c | 4 +--- src/proto_tcp.c | 4 +--- src/proto_uxst.c | 4 +--- src/protocol.c | 2 +- src/proxy.c | 5 +---- src/queue.c | 3 +-- src/raw_sock.c | 3 +-- src/regex.c | 3 +-- src/ring.c | 3 +-- src/sample.c | 2 +- src/server.c | 3 +-- src/session.c | 2 +- src/sink.c | 3 +-- src/ssl_sample.c | 2 +- src/ssl_sock.c | 4 +--- src/standard.c | 3 +-- src/stats.c | 4 +--- src/stick_table.c | 3 +-- src/stream.c | 3 +-- src/stream_interface.c | 3 +-- src/task.c | 2 +- src/tcp_rules.c | 4 +--- src/time.c | 3 +-- src/trace.c | 3 +-- src/uri_auth.c | 2 +- src/vars.c | 2 +- src/wdt.c | 3 +-- src/wurfl.c | 2 +- 201 files changed, 200 insertions(+), 313 deletions(-) diff --git a/contrib/mod_defender/defender.c b/contrib/mod_defender/defender.c index 03f12a272..b552a7c71 100644 --- a/contrib/mod_defender/defender.c +++ b/contrib/mod_defender/defender.c @@ -15,11 +15,10 @@ * 3 of the License, or (at your option) any later version. * */ -#include #include #include -#include +#include #include #include #include diff --git a/contrib/prometheus-exporter/service-prometheus.c b/contrib/prometheus-exporter/service-prometheus.c index dfd5e1a43..a31aa153c 100644 --- a/contrib/prometheus-exporter/service-prometheus.c +++ b/contrib/prometheus-exporter/service-prometheus.c @@ -13,11 +13,10 @@ * */ +#include #include -#include #include #include -#include #include #include diff --git a/include/common/base64.h b/include/common/base64.h index 2f52ac745..e53a3528b 100644 --- a/include/common/base64.h +++ b/include/common/base64.h @@ -14,7 +14,7 @@ #ifndef _COMMON_BASE64_H #define _COMMON_BASE64_H -#include +#include int a2base64(char *in, int ilen, char *out, int olen); int base64dec(const char *in, size_t ilen, char *out, size_t olen); diff --git a/include/common/buffer.h b/include/common/buffer.h index 779186f60..f7aa2542f 100644 --- a/include/common/buffer.h +++ b/include/common/buffer.h @@ -26,9 +26,9 @@ #include #include +#include #include #include -#include #include #include #include diff --git a/include/common/cfgparse.h b/include/common/cfgparse.h index 1a288166a..8ecb7714a 100644 --- a/include/common/cfgparse.h +++ b/include/common/cfgparse.h @@ -22,9 +22,7 @@ #ifndef _COMMON_CFGPARSE_H #define _COMMON_CFGPARSE_H -#include -#include -#include +#include #include #include diff --git a/include/common/chunk.h b/include/common/chunk.h index a061a3442..ae7ae8538 100644 --- a/include/common/chunk.h +++ b/include/common/chunk.h @@ -25,8 +25,8 @@ #include #include +#include #include -#include #include #include diff --git a/include/common/config.h b/include/common/config.h index 30da555e1..49d219cda 100644 --- a/include/common/config.h +++ b/include/common/config.h @@ -22,8 +22,6 @@ #ifndef _COMMON_CONFIG_H #define _COMMON_CONFIG_H -#include -#include -#include +#include #endif /* _COMMON_CONFIG_H */ diff --git a/include/common/debug.h b/include/common/debug.h index c6c154cde..c234bdc70 100644 --- a/include/common/debug.h +++ b/include/common/debug.h @@ -22,7 +22,7 @@ #ifndef _COMMON_DEBUG_H #define _COMMON_DEBUG_H -#include +#include #include #ifdef DEBUG_FULL diff --git a/include/common/fcgi.h b/include/common/fcgi.h index d85e118f3..b9a752b92 100644 --- a/include/common/fcgi.h +++ b/include/common/fcgi.h @@ -22,9 +22,8 @@ #ifndef _COMMON_FCGI_H #define _COMMON_FCGI_H -#include #include -#include +#include #include #include #include diff --git a/include/common/h1.h b/include/common/h1.h index fc28b4808..0bc0f4864 100644 --- a/include/common/h1.h +++ b/include/common/h1.h @@ -22,9 +22,8 @@ #ifndef _COMMON_H1_H #define _COMMON_H1_H +#include #include -#include -#include #include #include #include diff --git a/include/common/h2.h b/include/common/h2.h index 03582992a..5654a7611 100644 --- a/include/common/h2.h +++ b/include/common/h2.h @@ -29,7 +29,7 @@ #ifndef _COMMON_H2_H #define _COMMON_H2_H -#include +#include #include #include #include diff --git a/include/common/hathreads.h b/include/common/hathreads.h index 45ec1d2e0..e25dfc8fc 100644 --- a/include/common/hathreads.h +++ b/include/common/hathreads.h @@ -27,9 +27,8 @@ #ifdef _POSIX_PRIORITY_SCHEDULING #include #endif +#include -#include -#include /* Note about all_threads_mask : * - this variable is comprised between 1 and LONGBITS. diff --git a/include/common/hpack-dec.h b/include/common/hpack-dec.h index 39d1bf0a0..f538332be 100644 --- a/include/common/hpack-dec.h +++ b/include/common/hpack-dec.h @@ -28,9 +28,8 @@ #ifndef _COMMON_HPACK_DEC_H #define _COMMON_HPACK_DEC_H -#include +#include #include -#include #include int hpack_decode_frame(struct hpack_dht *dht, const uint8_t *raw, uint32_t len, diff --git a/include/common/hpack-enc.h b/include/common/hpack-enc.h index 555dba810..f204853d7 100644 --- a/include/common/hpack-enc.h +++ b/include/common/hpack-enc.h @@ -28,10 +28,9 @@ #ifndef _COMMON_HPACK_ENC_H #define _COMMON_HPACK_ENC_H -#include #include +#include #include -#include #include #include diff --git a/include/common/hpack-tbl.h b/include/common/hpack-tbl.h index 6d529f20f..cde7114af 100644 --- a/include/common/hpack-tbl.h +++ b/include/common/hpack-tbl.h @@ -27,9 +27,8 @@ #ifndef _COMMON_HPACK_TBL_H #define _COMMON_HPACK_TBL_H -#include #include -#include +#include #include #include #include diff --git a/include/common/htx.h b/include/common/htx.h index 3d54c4a0f..5a13614f3 100644 --- a/include/common/htx.h +++ b/include/common/htx.h @@ -23,8 +23,8 @@ #define _COMMON_HTX_H #include +#include #include -#include #include #include #include diff --git a/include/common/ist.h b/include/common/ist.h index 8dd6615ed..d62924e16 100644 --- a/include/common/ist.h +++ b/include/common/ist.h @@ -36,7 +36,7 @@ #include #endif -#include +#include /* ASCII to lower case conversion table */ #define _IST_LC ((const unsigned char[256]){ \ diff --git a/include/common/memory.h b/include/common/memory.h index d3950ca5d..8b03daf8e 100644 --- a/include/common/memory.h +++ b/include/common/memory.h @@ -26,13 +26,11 @@ #include #include -#include #include -#include +#include #include #include -#include /* On architectures supporting threads and double-word CAS, we can implement * lock-less memory pools. This isn't supported for debugging modes however. diff --git a/include/common/mini-clist.h b/include/common/mini-clist.h index 5d3954cd4..188d118ac 100644 --- a/include/common/mini-clist.h +++ b/include/common/mini-clist.h @@ -22,7 +22,6 @@ #ifndef _COMMON_MINI_CLIST_H #define _COMMON_MINI_CLIST_H -#include /* these are circular or bidirectionnal lists only. Each list pointer points to * another list pointer in a structure, and not the structure itself. The @@ -258,6 +257,7 @@ struct cond_wordlist { &item->member != (list_head); \ item = back, back = LIST_ELEM(back->member.p, typeof(back), member)) +#include #include #define MT_LIST_BUSY ((struct mt_list *)1) diff --git a/include/common/net_helper.h b/include/common/net_helper.h index 0443fe1f9..8fdf12088 100644 --- a/include/common/net_helper.h +++ b/include/common/net_helper.h @@ -27,7 +27,7 @@ #ifndef _COMMON_NET_HELPER_H #define _COMMON_NET_HELPER_H -#include +#include #include #include diff --git a/include/common/regex.h b/include/common/regex.h index cecfbd93c..d106b8690 100644 --- a/include/common/regex.h +++ b/include/common/regex.h @@ -25,7 +25,7 @@ #include #include -#include +#include #include #ifdef USE_PCRE diff --git a/include/common/standard.h b/include/common/standard.h index 3f6f95438..fdbfc48a9 100644 --- a/include/common/standard.h +++ b/include/common/standard.h @@ -27,7 +27,6 @@ #include #endif -#include #include #include #include @@ -38,8 +37,8 @@ #include #include #include +#include #include -#include #include #include #include diff --git a/include/common/template.h b/include/common/template.h index c9e48bfa1..beb714ddb 100644 --- a/include/common/template.h +++ b/include/common/template.h @@ -22,7 +22,7 @@ #ifndef _COMMON_TEMPLATE_H #define _COMMON_TEMPLATE_H -#include +#include #endif /* _COMMON_TEMPLATE_H */ diff --git a/include/common/ticks.h b/include/common/ticks.h index de29b315a..807b323df 100644 --- a/include/common/ticks.h +++ b/include/common/ticks.h @@ -52,7 +52,7 @@ #ifndef _COMMON_TICKS_H #define _COMMON_TICKS_H -#include +#include #include #define TICK_ETERNITY 0 diff --git a/include/common/time.h b/include/common/time.h index e59ed5e6e..2a4ec0afc 100644 --- a/include/common/time.h +++ b/include/common/time.h @@ -22,11 +22,10 @@ #ifndef _COMMON_TIME_H #define _COMMON_TIME_H -#include #include #include #include -#include +#include #include #include diff --git a/include/common/tools.h b/include/common/tools.h index 961060109..c7c0c8869 100644 --- a/include/common/tools.h +++ b/include/common/tools.h @@ -23,7 +23,6 @@ #define _COMMON_TOOLS_H #include -#include #ifndef MIN #define MIN(a, b) (((a) < (b)) ? (a) : (b)) diff --git a/include/common/uri_auth.h b/include/common/uri_auth.h index 8223dc103..33596534e 100644 --- a/include/common/uri_auth.h +++ b/include/common/uri_auth.h @@ -13,8 +13,8 @@ #ifndef _COMMON_URI_AUTH_H #define _COMMON_URI_AUTH_H -#include +#include #include /* This is a list of proxies we are allowed to see. Later, it should go in the diff --git a/include/common/version.h b/include/common/version.h index 7eba4a3c0..b38104f28 100644 --- a/include/common/version.h +++ b/include/common/version.h @@ -22,7 +22,7 @@ #ifndef _COMMON_VERSION_H #define _COMMON_VERSION_H -#include +#include #ifdef CONFIG_PRODUCT_NAME #define PRODUCT_NAME CONFIG_PRODUCT_NAME diff --git a/include/import/ebtree.h b/include/import/ebtree.h index 9e5daca48..73ca6d5fb 100644 --- a/include/import/ebtree.h +++ b/include/import/ebtree.h @@ -247,7 +247,7 @@ #define _EBTREE_H #include -#include +#include static inline int flsnz8_generic(unsigned int x) { diff --git a/include/proto/acl.h b/include/proto/acl.h index dd6dae507..28b49c448 100644 --- a/include/proto/acl.h +++ b/include/proto/acl.h @@ -22,7 +22,7 @@ #ifndef _PROTO_ACL_H #define _PROTO_ACL_H -#include +#include #include #include diff --git a/include/proto/activity.h b/include/proto/activity.h index 673d27457..26365ca8b 100644 --- a/include/proto/activity.h +++ b/include/proto/activity.h @@ -22,7 +22,7 @@ #ifndef _PROTO_ACTIVITY_H #define _PROTO_ACTIVITY_H -#include +#include #include #include #include diff --git a/include/proto/applet.h b/include/proto/applet.h index 14fbca2a1..ea8bc0baf 100644 --- a/include/proto/applet.h +++ b/include/proto/applet.h @@ -24,7 +24,7 @@ #include -#include +#include #include #include #include diff --git a/include/proto/auth.h b/include/proto/auth.h index eea5df54c..853e38cbb 100644 --- a/include/proto/auth.h +++ b/include/proto/auth.h @@ -13,7 +13,7 @@ #ifndef _PROTO_AUTH_H #define _PROTO_AUTH_H -#include +#include #include extern struct userlist *userlist; diff --git a/include/proto/backend.h b/include/proto/backend.h index 5764c133c..516049286 100644 --- a/include/proto/backend.h +++ b/include/proto/backend.h @@ -22,7 +22,7 @@ #ifndef _PROTO_BACKEND_H #define _PROTO_BACKEND_H -#include +#include #include #include diff --git a/include/proto/channel.h b/include/proto/channel.h index 175d311e7..16954bac0 100644 --- a/include/proto/channel.h +++ b/include/proto/channel.h @@ -27,7 +27,7 @@ #include #include -#include +#include #include #include #include diff --git a/include/proto/connection.h b/include/proto/connection.h index 86294388c..9b1e3d871 100644 --- a/include/proto/connection.h +++ b/include/proto/connection.h @@ -22,7 +22,7 @@ #ifndef _PROTO_CONNECTION_H #define _PROTO_CONNECTION_H -#include +#include #include #include #include diff --git a/include/proto/fd.h b/include/proto/fd.h index 884843719..a3c476d07 100644 --- a/include/proto/fd.h +++ b/include/proto/fd.h @@ -27,7 +27,7 @@ #include #include -#include +#include #include #include #include diff --git a/include/proto/freq_ctr.h b/include/proto/freq_ctr.h index 63febb24a..7413803ef 100644 --- a/include/proto/freq_ctr.h +++ b/include/proto/freq_ctr.h @@ -22,7 +22,7 @@ #ifndef _PROTO_FREQ_CTR_H #define _PROTO_FREQ_CTR_H -#include +#include #include #include #include diff --git a/include/proto/frontend.h b/include/proto/frontend.h index 61d040906..37d484cf9 100644 --- a/include/proto/frontend.h +++ b/include/proto/frontend.h @@ -22,7 +22,7 @@ #ifndef _PROTO_FRONTEND_H #define _PROTO_FRONTEND_H -#include +#include #include int frontend_accept(struct stream *s); diff --git a/include/proto/http_ana.h b/include/proto/http_ana.h index 894357688..cdfa87e1e 100644 --- a/include/proto/http_ana.h +++ b/include/proto/http_ana.h @@ -22,7 +22,7 @@ #ifndef _PROTO_PROTO_HTTP_H #define _PROTO_PROTO_HTTP_H -#include +#include #include #include #include diff --git a/include/proto/http_fetch.h b/include/proto/http_fetch.h index 562e703c0..22c793fb0 100644 --- a/include/proto/http_fetch.h +++ b/include/proto/http_fetch.h @@ -22,7 +22,7 @@ #ifndef _PROTO_HTTP_FETCH_H #define _PROTO_HTTP_FETCH_H -#include +#include #include #include #include diff --git a/include/proto/http_rules.h b/include/proto/http_rules.h index 3e57b9d4a..27c4b6a8f 100644 --- a/include/proto/http_rules.h +++ b/include/proto/http_rules.h @@ -22,7 +22,7 @@ #ifndef _PROTO_HTTP_RULES_H #define _PROTO_HTTP_RULES_H -#include +#include #include #include #include diff --git a/include/proto/lb_chash.h b/include/proto/lb_chash.h index 679dff363..0a44967f3 100644 --- a/include/proto/lb_chash.h +++ b/include/proto/lb_chash.h @@ -22,7 +22,7 @@ #ifndef _PROTO_LB_CHASH_H #define _PROTO_LB_CHASH_H -#include +#include #include #include diff --git a/include/proto/lb_fas.h b/include/proto/lb_fas.h index 602c4f68e..4e1f02d1e 100644 --- a/include/proto/lb_fas.h +++ b/include/proto/lb_fas.h @@ -22,7 +22,7 @@ #ifndef _PROTO_LB_FAS_H #define _PROTO_LB_FAS_H -#include +#include #include #include diff --git a/include/proto/lb_fwlc.h b/include/proto/lb_fwlc.h index 8c5674656..a7a46fff7 100644 --- a/include/proto/lb_fwlc.h +++ b/include/proto/lb_fwlc.h @@ -22,7 +22,7 @@ #ifndef _PROTO_LB_FWLC_H #define _PROTO_LB_FWLC_H -#include +#include #include #include diff --git a/include/proto/lb_fwrr.h b/include/proto/lb_fwrr.h index 1189c3888..c23a4710b 100644 --- a/include/proto/lb_fwrr.h +++ b/include/proto/lb_fwrr.h @@ -22,7 +22,7 @@ #ifndef _PROTO_LB_FWRR_H #define _PROTO_LB_FWRR_H -#include +#include #include #include diff --git a/include/proto/lb_map.h b/include/proto/lb_map.h index cf7349ef4..0dc089bc7 100644 --- a/include/proto/lb_map.h +++ b/include/proto/lb_map.h @@ -22,7 +22,7 @@ #ifndef _PROTO_LB_MAP_H #define _PROTO_LB_MAP_H -#include +#include #include #include diff --git a/include/proto/log.h b/include/proto/log.h index 6e342e3c9..a84d61263 100644 --- a/include/proto/log.h +++ b/include/proto/log.h @@ -26,7 +26,7 @@ #include #include -#include +#include #include #include diff --git a/include/proto/mux_pt.h b/include/proto/mux_pt.h index 33c4e3263..d61305ace 100644 --- a/include/proto/mux_pt.h +++ b/include/proto/mux_pt.h @@ -22,7 +22,7 @@ #ifndef _PROTO_MUX_PT_H #define _PROTO_MUX_PT_H -#include +#include #include extern const struct mux_ops mux_pt_ops; diff --git a/include/proto/obj_type.h b/include/proto/obj_type.h index 799732b27..f4816b137 100644 --- a/include/proto/obj_type.h +++ b/include/proto/obj_type.h @@ -22,7 +22,7 @@ #ifndef _PROTO_OBJ_TYPE_H #define _PROTO_OBJ_TYPE_H -#include +#include #include #include #include diff --git a/include/proto/pattern.h b/include/proto/pattern.h index 39514b1d8..2d51d95ad 100644 --- a/include/proto/pattern.h +++ b/include/proto/pattern.h @@ -24,7 +24,7 @@ #include -#include +#include #include #include diff --git a/include/proto/payload.h b/include/proto/payload.h index 9674832fa..481b613b2 100644 --- a/include/proto/payload.h +++ b/include/proto/payload.h @@ -22,7 +22,7 @@ #ifndef _PROTO_PROTO_PAYLOAD_H #define _PROTO_PROTO_PAYLOAD_H -#include +#include #include #include diff --git a/include/proto/peers.h b/include/proto/peers.h index 74e20dadc..fbe6cf6a6 100644 --- a/include/proto/peers.h +++ b/include/proto/peers.h @@ -22,7 +22,7 @@ #ifndef _PROTO_PEERS_H #define _PROTO_PEERS_H -#include +#include #include #include #include diff --git a/include/proto/pipe.h b/include/proto/pipe.h index 0c0216586..4dd3dd640 100644 --- a/include/proto/pipe.h +++ b/include/proto/pipe.h @@ -22,7 +22,7 @@ #ifndef _PROTO_PIPE_H #define _PROTO_PIPE_H -#include +#include #include extern int pipes_used; /* # of pipes in use (2 fds each) */ diff --git a/include/proto/proto_tcp.h b/include/proto/proto_tcp.h index daac1d836..347305bf3 100644 --- a/include/proto/proto_tcp.h +++ b/include/proto/proto_tcp.h @@ -22,7 +22,7 @@ #ifndef _PROTO_PROTO_TCP_H #define _PROTO_PROTO_TCP_H -#include +#include #include #include #include diff --git a/include/proto/proxy.h b/include/proto/proxy.h index db4cb8961..630a0112e 100644 --- a/include/proto/proxy.h +++ b/include/proto/proxy.h @@ -22,7 +22,7 @@ #ifndef _PROTO_PROXY_H #define _PROTO_PROXY_H -#include +#include #include #include #include diff --git a/include/proto/queue.h b/include/proto/queue.h index a7ab63b35..8ef9179e6 100644 --- a/include/proto/queue.h +++ b/include/proto/queue.h @@ -22,7 +22,7 @@ #ifndef _PROTO_QUEUE_H #define _PROTO_QUEUE_H -#include +#include #include #include diff --git a/include/proto/server.h b/include/proto/server.h index f8fed3148..4c4b4bf09 100644 --- a/include/proto/server.h +++ b/include/proto/server.h @@ -24,7 +24,7 @@ #include -#include +#include #include #include #include diff --git a/include/proto/session.h b/include/proto/session.h index a5b95a8de..61a7b0020 100644 --- a/include/proto/session.h +++ b/include/proto/session.h @@ -22,7 +22,7 @@ #ifndef _PROTO_SESSION_H #define _PROTO_SESSION_H -#include +#include #include #include #include diff --git a/include/proto/stats.h b/include/proto/stats.h index d20beeab2..5342e12a0 100644 --- a/include/proto/stats.h +++ b/include/proto/stats.h @@ -23,7 +23,7 @@ #ifndef _PROTO_STATS_H #define _PROTO_STATS_H -#include +#include #include #include #include diff --git a/include/proto/stream.h b/include/proto/stream.h index 69153df5d..752c183f9 100644 --- a/include/proto/stream.h +++ b/include/proto/stream.h @@ -22,7 +22,7 @@ #ifndef _PROTO_STREAM_H #define _PROTO_STREAM_H -#include +#include #include #include #include diff --git a/include/proto/stream_interface.h b/include/proto/stream_interface.h index 490ee5ebf..98ccb2833 100644 --- a/include/proto/stream_interface.h +++ b/include/proto/stream_interface.h @@ -24,7 +24,7 @@ #include -#include +#include #include #include #include diff --git a/include/proto/task.h b/include/proto/task.h index 52b284d0f..a42431a17 100644 --- a/include/proto/task.h +++ b/include/proto/task.h @@ -25,7 +25,7 @@ #include -#include +#include #include #include #include diff --git a/include/proto/tcp_rules.h b/include/proto/tcp_rules.h index bf920a104..b9a4c932a 100644 --- a/include/proto/tcp_rules.h +++ b/include/proto/tcp_rules.h @@ -22,7 +22,7 @@ #ifndef _PROTO_TCP_RULES_H #define _PROTO_TCP_RULES_H -#include +#include #include #include #include diff --git a/include/proto/template.h b/include/proto/template.h index f7f9e553e..c6a11c2f9 100644 --- a/include/proto/template.h +++ b/include/proto/template.h @@ -22,7 +22,7 @@ #ifndef _PROTO_TEMPLATE_H #define _PROTO_TEMPLATE_H -#include +#include #include diff --git a/include/proto/trace.h b/include/proto/trace.h index ece23293b..ef88079b1 100644 --- a/include/proto/trace.h +++ b/include/proto/trace.h @@ -22,9 +22,8 @@ #ifndef _PROTO_TRACE_H #define _PROTO_TRACE_H +#include #include -#include -#include #include #include #include diff --git a/include/types/acl.h b/include/types/acl.h index f5d385896..748f3611b 100644 --- a/include/types/acl.h +++ b/include/types/acl.h @@ -22,8 +22,7 @@ #ifndef _TYPES_ACL_H #define _TYPES_ACL_H -#include -#include +#include #include #include diff --git a/include/types/activity.h b/include/types/activity.h index 01e484fac..312380f28 100644 --- a/include/types/activity.h +++ b/include/types/activity.h @@ -22,7 +22,7 @@ #ifndef _TYPES_ACTIVITY_H #define _TYPES_ACTIVITY_H -#include +#include #include /* per-thread activity reports. It's important that it's aligned on cache lines diff --git a/include/types/applet.h b/include/types/applet.h index a4e22e336..aa1bc31dd 100644 --- a/include/types/applet.h +++ b/include/types/applet.h @@ -22,6 +22,7 @@ #ifndef _TYPES_APPLET_H #define _TYPES_APPLET_H +#include #include #include #include @@ -29,7 +30,6 @@ #include #include #include -#include #include struct appctx; diff --git a/include/types/auth.h b/include/types/auth.h index 964f29b6a..c10aced5b 100644 --- a/include/types/auth.h +++ b/include/types/auth.h @@ -13,7 +13,7 @@ #ifndef _TYPES_AUTH_H #define _TYPES_AUTH_H -#include +#include #include #include diff --git a/include/types/backend.h b/include/types/backend.h index 22e5f21e6..3150ecf1b 100644 --- a/include/types/backend.h +++ b/include/types/backend.h @@ -22,7 +22,7 @@ #ifndef _TYPES_BACKEND_H #define _TYPES_BACKEND_H -#include +#include #include #include diff --git a/include/types/capture.h b/include/types/capture.h index a9ced25c7..493d0be2c 100644 --- a/include/types/capture.h +++ b/include/types/capture.h @@ -22,7 +22,7 @@ #ifndef _TYPES_CAPTURE_H #define _TYPES_CAPTURE_H -#include +#include #include struct cap_hdr { diff --git a/include/types/channel.h b/include/types/channel.h index 4bcc3b954..863c3fba6 100644 --- a/include/types/channel.h +++ b/include/types/channel.h @@ -22,7 +22,7 @@ #ifndef _TYPES_CHANNEL_H #define _TYPES_CHANNEL_H -#include +#include #include /* The CF_* macros designate Channel Flags, which may be ORed in the bit field diff --git a/include/types/checks.h b/include/types/checks.h index a23091cc2..b2be640c3 100644 --- a/include/types/checks.h +++ b/include/types/checks.h @@ -13,10 +13,10 @@ #ifndef _TYPES_CHECKS_H #define _TYPES_CHECKS_H +#include #include #include -#include #include #include #include diff --git a/include/types/connection.h b/include/types/connection.h index 8780590d8..7357174dc 100644 --- a/include/types/connection.h +++ b/include/types/connection.h @@ -25,7 +25,7 @@ #include #include -#include +#include #include #include diff --git a/include/types/fcgi-app.h b/include/types/fcgi-app.h index d7beb2602..f0fcdc7ae 100644 --- a/include/types/fcgi-app.h +++ b/include/types/fcgi-app.h @@ -22,7 +22,7 @@ #ifndef _TYPES_HTTP_FCGI_H #define _TYPES_HTTP_FCGI_H -#include +#include #include #include #include diff --git a/include/types/fd.h b/include/types/fd.h index 178dea126..0041d4d60 100644 --- a/include/types/fd.h +++ b/include/types/fd.h @@ -22,7 +22,7 @@ #ifndef _TYPES_FD_H #define _TYPES_FD_H -#include +#include #include #include #include diff --git a/include/types/filters.h b/include/types/filters.h index 1930e2aed..5de4eee6e 100644 --- a/include/types/filters.h +++ b/include/types/filters.h @@ -21,7 +21,7 @@ #ifndef _TYPES_FILTERS_H #define _TYPES_FILTERS_H -#include +#include #include struct http_msg; diff --git a/include/types/freq_ctr.h b/include/types/freq_ctr.h index 425ddf3b8..3b02cf908 100644 --- a/include/types/freq_ctr.h +++ b/include/types/freq_ctr.h @@ -22,7 +22,7 @@ #ifndef _TYPES_FREQ_CTR_H #define _TYPES_FREQ_CTR_H -#include +#include /* The implicit freq_ctr counter counts a rate of events per second. It is the * preferred form to count rates over a one-second period, because it does not diff --git a/include/types/global.h b/include/types/global.h index 592d28867..cb9ff4b24 100644 --- a/include/types/global.h +++ b/include/types/global.h @@ -24,8 +24,7 @@ #include -#include -#include +#include #include #include diff --git a/include/types/http_ana.h b/include/types/http_ana.h index c17dc18cc..7bade1303 100644 --- a/include/types/http_ana.h +++ b/include/types/http_ana.h @@ -22,7 +22,7 @@ #ifndef _TYPES_PROTO_HTTP_H #define _TYPES_PROTO_HTTP_H -#include +#include #include #include diff --git a/include/types/lb_chash.h b/include/types/lb_chash.h index 9486064dd..a57a229ca 100644 --- a/include/types/lb_chash.h +++ b/include/types/lb_chash.h @@ -22,7 +22,7 @@ #ifndef _TYPES_LB_CHASH_H #define _TYPES_LB_CHASH_H -#include +#include #include #include diff --git a/include/types/lb_fas.h b/include/types/lb_fas.h index e20d70a27..040563e74 100644 --- a/include/types/lb_fas.h +++ b/include/types/lb_fas.h @@ -22,7 +22,7 @@ #ifndef _TYPES_LB_FAS_H #define _TYPES_LB_FAS_H -#include +#include #include struct lb_fas { diff --git a/include/types/lb_fwlc.h b/include/types/lb_fwlc.h index f20659a71..c87d61ed3 100644 --- a/include/types/lb_fwlc.h +++ b/include/types/lb_fwlc.h @@ -22,7 +22,7 @@ #ifndef _TYPES_LB_FWLC_H #define _TYPES_LB_FWLC_H -#include +#include #include struct lb_fwlc { diff --git a/include/types/lb_fwrr.h b/include/types/lb_fwrr.h index 754d0c64b..6a2a04c20 100644 --- a/include/types/lb_fwrr.h +++ b/include/types/lb_fwrr.h @@ -22,7 +22,7 @@ #ifndef _TYPES_LB_FWRR_H #define _TYPES_LB_FWRR_H -#include +#include #include /* This structure is used to apply fast weighted round robin on a server group */ diff --git a/include/types/lb_map.h b/include/types/lb_map.h index 38e26af64..5409a8152 100644 --- a/include/types/lb_map.h +++ b/include/types/lb_map.h @@ -22,7 +22,7 @@ #ifndef _TYPES_LB_MAP_H #define _TYPES_LB_MAP_H -#include +#include #include struct lb_map { diff --git a/include/types/listener.h b/include/types/listener.h index d035a90fc..cbd4bab17 100644 --- a/include/types/listener.h +++ b/include/types/listener.h @@ -26,10 +26,10 @@ #include #ifdef USE_OPENSSL +#include #include #endif -#include #include #include diff --git a/include/types/log.h b/include/types/log.h index fb9aa586e..2c2ac0298 100644 --- a/include/types/log.h +++ b/include/types/log.h @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/include/types/pattern.h b/include/types/pattern.h index f4c0a1323..f1468b3e2 100644 --- a/include/types/pattern.h +++ b/include/types/pattern.h @@ -22,8 +22,7 @@ #ifndef _TYPES_PATTERN_H #define _TYPES_PATTERN_H -#include -#include +#include #include #include diff --git a/include/types/peers.h b/include/types/peers.h index 78270bf24..74613472a 100644 --- a/include/types/peers.h +++ b/include/types/peers.h @@ -27,10 +27,9 @@ #include #include -#include +#include #include #include -#include #include #include diff --git a/include/types/pipe.h b/include/types/pipe.h index 12a1eeee9..c6460298a 100644 --- a/include/types/pipe.h +++ b/include/types/pipe.h @@ -22,7 +22,7 @@ #ifndef _TYPES_PIPE_H #define _TYPES_PIPE_H -#include +#include /* A pipe is described by its read and write FDs, and the data remaining in it. * The FDs are valid if there are data pending. The user is not allowed to diff --git a/include/types/protocol.h b/include/types/protocol.h index 10437a7b1..edda61c01 100644 --- a/include/types/protocol.h +++ b/include/types/protocol.h @@ -25,7 +25,7 @@ #include #include -#include +#include #include #include diff --git a/include/types/proxy.h b/include/types/proxy.h index a9adce0b5..c75f0b679 100644 --- a/include/types/proxy.h +++ b/include/types/proxy.h @@ -27,12 +27,11 @@ #include #include +#include #include -#include #include #include #include -#include #include #include diff --git a/include/types/queue.h b/include/types/queue.h index 361c704d0..b0800f30f 100644 --- a/include/types/queue.h +++ b/include/types/queue.h @@ -22,7 +22,7 @@ #ifndef _TYPES_QUEUE_H #define _TYPES_QUEUE_H -#include +#include #include #include diff --git a/include/types/ring.h b/include/types/ring.h index 5f0827171..ac93c1219 100644 --- a/include/types/ring.h +++ b/include/types/ring.h @@ -22,9 +22,8 @@ #ifndef _TYPES_RING_H #define _TYPES_RING_H +#include #include -#include -#include #include /* The code below handles circular buffers with single-producer and multiple diff --git a/include/types/server.h b/include/types/server.h index 376fc0321..70a6e82ac 100644 --- a/include/types/server.h +++ b/include/types/server.h @@ -25,7 +25,7 @@ #include #include -#include +#include #include #include #include diff --git a/include/types/session.h b/include/types/session.h index 824799a51..fb6b6212b 100644 --- a/include/types/session.h +++ b/include/types/session.h @@ -28,7 +28,7 @@ #include #include -#include +#include #include #include diff --git a/include/types/signal.h b/include/types/signal.h index ec3dcf2da..661347a0a 100644 --- a/include/types/signal.h +++ b/include/types/signal.h @@ -16,7 +16,7 @@ #include -#include +#include #include #include diff --git a/include/types/sink.h b/include/types/sink.h index 029c20dfe..64b0bcaf4 100644 --- a/include/types/sink.h +++ b/include/types/sink.h @@ -22,9 +22,8 @@ #ifndef _TYPES_SINK_H #define _TYPES_SINK_H +#include #include -#include -#include #include /* A sink may be of 4 distinct types : diff --git a/include/types/stream.h b/include/types/stream.h index 0dcc541fa..e450c6340 100644 --- a/include/types/stream.h +++ b/include/types/stream.h @@ -28,7 +28,7 @@ #include #include -#include +#include #include #include diff --git a/include/types/stream_interface.h b/include/types/stream_interface.h index e45eb6f17..4c69d2dd9 100644 --- a/include/types/stream_interface.h +++ b/include/types/stream_interface.h @@ -22,8 +22,8 @@ #ifndef _TYPES_STREAM_INTERFACE_H #define _TYPES_STREAM_INTERFACE_H +#include #include -#include /* A stream interface must have its own errors independently of the buffer's, * so that applications can rely on what the buffer reports while the stream diff --git a/include/types/task.h b/include/types/task.h index 0fba89898..01756ead8 100644 --- a/include/types/task.h +++ b/include/types/task.h @@ -24,7 +24,7 @@ #include -#include +#include #include #include #include diff --git a/include/types/template.h b/include/types/template.h index e4292e72b..5ef691c35 100644 --- a/include/types/template.h +++ b/include/types/template.h @@ -22,7 +22,7 @@ #ifndef _TYPES_TEMPLATE_H #define _TYPES_TEMPLATE_H -#include +#include #endif /* _TYPES_TEMPLATE_H */ diff --git a/include/types/trace.h b/include/types/trace.h index db7b18550..cd5e8be15 100644 --- a/include/types/trace.h +++ b/include/types/trace.h @@ -22,9 +22,8 @@ #ifndef _TYPES_TRACE_H #define _TYPES_TRACE_H +#include #include -#include -#include #include #include #include diff --git a/src/51d.c b/src/51d.c index 78ee7483b..13997e348 100644 --- a/src/51d.c +++ b/src/51d.c @@ -1,11 +1,11 @@ #include +#include #include #include #include #include #include -#include #include #include #include diff --git a/src/acl.c b/src/acl.c index 7df433d4a..5b25fce5a 100644 --- a/src/acl.c +++ b/src/acl.c @@ -14,8 +14,7 @@ #include #include -#include -#include +#include #include #include #include diff --git a/src/action.c b/src/action.c index dad747213..085420813 100644 --- a/src/action.c +++ b/src/action.c @@ -10,7 +10,7 @@ * */ -#include +#include #include #include #include diff --git a/src/activity.c b/src/activity.c index 8844e0c5f..6da8f40e9 100644 --- a/src/activity.c +++ b/src/activity.c @@ -10,11 +10,10 @@ * */ +#include #include -#include #include #include -#include #include #include #include diff --git a/src/applet.c b/src/applet.c index 60c9e245d..5f06d6ac1 100644 --- a/src/applet.c +++ b/src/applet.c @@ -13,7 +13,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/auth.c b/src/auth.c index 1b0f3767b..2d9804433 100644 --- a/src/auth.c +++ b/src/auth.c @@ -25,11 +25,10 @@ #include #include +#include #include -#include #include #include -#include #include #include diff --git a/src/backend.c b/src/backend.c index ba968198e..f259b3917 100644 --- a/src/backend.c +++ b/src/backend.c @@ -19,13 +19,11 @@ #include #include +#include #include -#include -#include #include #include #include -#include #include #include #include diff --git a/src/base64.c b/src/base64.c index e7c951920..90e4fb85d 100644 --- a/src/base64.c +++ b/src/base64.c @@ -14,8 +14,8 @@ #include #include +#include #include -#include #define B64BASE '#' /* arbitrary chosen base value */ #define B64CMIN '+' diff --git a/src/buffer.c b/src/buffer.c index a7f405bbc..c8d7a69f2 100644 --- a/src/buffer.c +++ b/src/buffer.c @@ -14,7 +14,7 @@ #include #include -#include +#include #include #include diff --git a/src/cache.c b/src/cache.c index f68cb1416..fac9b7d76 100644 --- a/src/cache.c +++ b/src/cache.c @@ -10,6 +10,7 @@ * 2 of the License, or (at your option) any later version. */ +#include #include #include @@ -35,7 +36,6 @@ #include #include #include -#include #include #define CACHE_FLT_F_IMPLICIT_DECL 0x00000001 /* The cache filtre was implicitly declared (ie without diff --git a/src/calltrace.c b/src/calltrace.c index 1a03709f4..a4f3bbe9f 100644 --- a/src/calltrace.c +++ b/src/calltrace.c @@ -47,7 +47,7 @@ #include #include #include -#include +#include #include static FILE *log; diff --git a/src/cfgparse-ssl.c b/src/cfgparse-ssl.c index 5c3688110..e6372fb10 100644 --- a/src/cfgparse-ssl.c +++ b/src/cfgparse-ssl.c @@ -31,9 +31,9 @@ #include #include +#include #include #include -#include #include #include diff --git a/src/cfgparse.c b/src/cfgparse.c index 56f95581a..5fd288068 100644 --- a/src/cfgparse.c +++ b/src/cfgparse.c @@ -33,9 +33,9 @@ #include #include +#include #include #include -#include #include #include #include diff --git a/src/channel.c b/src/channel.c index 8b0854ef5..cd7da30b4 100644 --- a/src/channel.c +++ b/src/channel.c @@ -15,7 +15,7 @@ #include #include -#include +#include #include #include diff --git a/src/checks.c b/src/checks.c index d42edf478..de182db42 100644 --- a/src/checks.c +++ b/src/checks.c @@ -30,10 +30,9 @@ #include #include +#include #include #include -#include -#include #include #include #include diff --git a/src/chunk.c b/src/chunk.c index f2abcba4e..2ec6a7d79 100644 --- a/src/chunk.c +++ b/src/chunk.c @@ -15,7 +15,7 @@ #include #include -#include +#include #include #include diff --git a/src/cli.c b/src/cli.c index a083ae7f6..381a9e612 100644 --- a/src/cli.c +++ b/src/cli.c @@ -26,11 +26,9 @@ #include +#include #include -#include -#include #include -#include #include #include #include diff --git a/src/compression.c b/src/compression.c index 413a9d81b..5797a0646 100644 --- a/src/compression.c +++ b/src/compression.c @@ -26,10 +26,9 @@ #undef free_func #endif /* USE_ZLIB */ +#include #include -#include #include -#include #include #include diff --git a/src/connection.c b/src/connection.c index 688676807..fd6a27498 100644 --- a/src/connection.c +++ b/src/connection.c @@ -12,10 +12,8 @@ #include +#include #include -#include -#include -#include #include #include #include diff --git a/src/da.c b/src/da.c index 0e4d5a763..73e59db39 100644 --- a/src/da.c +++ b/src/da.c @@ -1,9 +1,9 @@ #include +#include #include #include #include -#include #include #include #include diff --git a/src/debug.c b/src/debug.c index efbf19fe5..7f281f029 100644 --- a/src/debug.c +++ b/src/debug.c @@ -19,11 +19,10 @@ #include #include +#include #include -#include #include #include -#include #include #include #include diff --git a/src/dns.c b/src/dns.c index 38f73c157..92c6dda63 100644 --- a/src/dns.c +++ b/src/dns.c @@ -19,9 +19,9 @@ #include +#include #include #include -#include #include #include #include diff --git a/src/ev_epoll.c b/src/ev_epoll.c index 9129402c6..97a0b28c6 100644 --- a/src/ev_epoll.c +++ b/src/ev_epoll.c @@ -14,14 +14,12 @@ #include #include -#include -#include +#include #include #include #include #include #include -#include #include diff --git a/src/ev_evports.c b/src/ev_evports.c index 3d0dd435b..c0005e198 100644 --- a/src/ev_evports.c +++ b/src/ev_evports.c @@ -18,12 +18,10 @@ #include #include -#include -#include +#include #include #include #include -#include #include diff --git a/src/ev_kqueue.c b/src/ev_kqueue.c index 852fa6e83..e9821bdf4 100644 --- a/src/ev_kqueue.c +++ b/src/ev_kqueue.c @@ -17,12 +17,10 @@ #include #include -#include -#include +#include #include #include #include -#include #include diff --git a/src/ev_poll.c b/src/ev_poll.c index 8df244566..0e6dc9445 100644 --- a/src/ev_poll.c +++ b/src/ev_poll.c @@ -17,8 +17,7 @@ #include #include -#include -#include +#include #include #include #include diff --git a/src/ev_select.c b/src/ev_select.c index c4ab023e9..9dd93b887 100644 --- a/src/ev_select.c +++ b/src/ev_select.c @@ -14,8 +14,7 @@ #include #include -#include -#include +#include #include #include #include diff --git a/src/fcgi-app.c b/src/fcgi-app.c index 8472cf58d..d0992283a 100644 --- a/src/fcgi-app.c +++ b/src/fcgi-app.c @@ -10,11 +10,10 @@ * */ -#include +#include #include #include #include -#include #include #include diff --git a/src/fd.c b/src/fd.c index 1934bd0e7..f4aa83b7a 100644 --- a/src/fd.c +++ b/src/fd.c @@ -87,9 +87,8 @@ #include #endif -#include -#include +#include #include #include diff --git a/src/filters.c b/src/filters.c index 07b904316..9b6bd5b3e 100644 --- a/src/filters.c +++ b/src/filters.c @@ -10,14 +10,12 @@ * */ +#include #include #include #include -#include -#include #include #include -#include #include #include #include diff --git a/src/flt_http_comp.c b/src/flt_http_comp.c index dc7898472..abec6b3bf 100644 --- a/src/flt_http_comp.c +++ b/src/flt_http_comp.c @@ -10,10 +10,10 @@ * */ +#include #include #include #include -#include #include #include diff --git a/src/flt_spoe.c b/src/flt_spoe.c index 9db2baa15..5b8daa144 100644 --- a/src/flt_spoe.c +++ b/src/flt_spoe.c @@ -12,12 +12,10 @@ #include #include +#include #include -#include -#include #include #include -#include #include #include diff --git a/src/flt_trace.c b/src/flt_trace.c index b06ba150b..a33629636 100644 --- a/src/flt_trace.c +++ b/src/flt_trace.c @@ -12,12 +12,11 @@ #include +#include #include #include -#include #include #include -#include #include #include diff --git a/src/freq_ctr.c b/src/freq_ctr.c index e6e016893..f4ee5ce87 100644 --- a/src/freq_ctr.c +++ b/src/freq_ctr.c @@ -10,10 +10,9 @@ * */ -#include +#include #include #include -#include #include /* Read a frequency counter taking history into account for missing time in diff --git a/src/frontend.c b/src/frontend.c index 099d839c3..6274e8a40 100644 --- a/src/frontend.c +++ b/src/frontend.c @@ -22,11 +22,9 @@ #include +#include #include -#include -#include #include -#include #include #include diff --git a/src/h1.c b/src/h1.c index 53da12a29..f30e4891f 100644 --- a/src/h1.c +++ b/src/h1.c @@ -11,7 +11,7 @@ */ #include -#include +#include #include #include diff --git a/src/h1_htx.c b/src/h1_htx.c index af18a98b3..e9d79f6f8 100644 --- a/src/h1_htx.c +++ b/src/h1_htx.c @@ -10,7 +10,7 @@ * */ -#include +#include #include #include #include diff --git a/src/h2.c b/src/h2.c index 53cb0d34a..891c3e06c 100644 --- a/src/h2.c +++ b/src/h2.c @@ -26,7 +26,7 @@ */ #include -#include +#include #include #include #include diff --git a/src/haproxy.c b/src/haproxy.c index 5d7b0fe9b..0e71ba72e 100644 --- a/src/haproxy.c +++ b/src/haproxy.c @@ -78,16 +78,13 @@ #include #endif +#include #include #include #include #include -#include -#include -#include #include -#include #include #include #include diff --git a/src/hlua.c b/src/hlua.c index 83cc3cd2e..15c34cd32 100644 --- a/src/hlua.c +++ b/src/hlua.c @@ -11,7 +11,6 @@ */ #include -#include #include #include @@ -22,12 +21,11 @@ #error "Requires Lua 5.3 or later." #endif +#include #include #include -#include #include -#include #include #include diff --git a/src/hpack-huff.c b/src/hpack-huff.c index bdcff7fe7..19ea16348 100644 --- a/src/hpack-huff.c +++ b/src/hpack-huff.c @@ -29,7 +29,7 @@ #include #include -#include +#include #include struct huff { diff --git a/src/http.c b/src/http.c index aaa6ddbe4..0bd8f87ff 100644 --- a/src/http.c +++ b/src/http.c @@ -11,7 +11,7 @@ */ #include -#include +#include #include #include diff --git a/src/http_acl.c b/src/http_acl.c index edd3be579..5a8c634b2 100644 --- a/src/http_acl.c +++ b/src/http_acl.c @@ -16,12 +16,10 @@ #include #include +#include #include -#include -#include #include #include -#include #include #include #include diff --git a/src/http_act.c b/src/http_act.c index b18da6164..d116f1d17 100644 --- a/src/http_act.c +++ b/src/http_act.c @@ -16,13 +16,11 @@ #include #include +#include #include #include -#include -#include #include #include -#include #include #include #include diff --git a/src/http_ana.c b/src/http_ana.c index cf9570c3b..bd2db1fe7 100644 --- a/src/http_ana.c +++ b/src/http_ana.c @@ -10,8 +10,8 @@ * */ +#include #include -#include #include #include #include diff --git a/src/http_conv.c b/src/http_conv.c index fdf3c42f1..d83541d34 100644 --- a/src/http_conv.c +++ b/src/http_conv.c @@ -16,12 +16,10 @@ #include #include +#include #include -#include -#include #include #include -#include #include #include #include diff --git a/src/http_fetch.c b/src/http_fetch.c index 5fc68a9f2..96c774be6 100644 --- a/src/http_fetch.c +++ b/src/http_fetch.c @@ -16,15 +16,13 @@ #include #include +#include #include #include -#include -#include #include #include #include #include -#include #include #include #include diff --git a/src/http_htx.c b/src/http_htx.c index 7211a4de1..f4a600424 100644 --- a/src/http_htx.c +++ b/src/http_htx.c @@ -14,9 +14,9 @@ #include #include +#include #include -#include #include #include #include diff --git a/src/http_rules.c b/src/http_rules.c index 2e58ec2e0..a2a4e05b4 100644 --- a/src/http_rules.c +++ b/src/http_rules.c @@ -16,10 +16,9 @@ #include #include +#include #include #include -#include -#include #include #include #include diff --git a/src/lb_chash.c b/src/lb_chash.c index 91724fdaf..b21654123 100644 --- a/src/lb_chash.c +++ b/src/lb_chash.c @@ -16,8 +16,7 @@ * */ -#include -#include +#include #include #include #include diff --git a/src/lb_fas.c b/src/lb_fas.c index 1042e4b83..ef507b7cb 100644 --- a/src/lb_fas.c +++ b/src/lb_fas.c @@ -16,8 +16,7 @@ * */ -#include -#include +#include #include #include diff --git a/src/lb_fwlc.c b/src/lb_fwlc.c index 409e5f821..89634bfe4 100644 --- a/src/lb_fwlc.c +++ b/src/lb_fwlc.c @@ -10,8 +10,7 @@ * */ -#include -#include +#include #include #include diff --git a/src/lb_fwrr.c b/src/lb_fwrr.c index fe3d86be1..31e8bb2d1 100644 --- a/src/lb_fwrr.c +++ b/src/lb_fwrr.c @@ -10,8 +10,7 @@ * */ -#include -#include +#include #include #include diff --git a/src/lb_map.c b/src/lb_map.c index a5d1ec39c..660475b96 100644 --- a/src/lb_map.c +++ b/src/lb_map.c @@ -10,8 +10,7 @@ * */ -#include -#include +#include #include #include diff --git a/src/listener.c b/src/listener.c index 01feee58f..ab9f84b56 100644 --- a/src/listener.c +++ b/src/listener.c @@ -18,10 +18,9 @@ #include #include +#include #include -#include #include -#include #include #include #include diff --git a/src/log.c b/src/log.c index b4b00cfa1..87b12fc38 100644 --- a/src/log.c +++ b/src/log.c @@ -24,9 +24,7 @@ #include #include -#include -#include -#include +#include #include #include #include diff --git a/src/map.c b/src/map.c index 39a72c952..5f98dd0a0 100644 --- a/src/map.c +++ b/src/map.c @@ -10,10 +10,9 @@ * */ -#include #include -#include +#include #include #include diff --git a/src/memory.c b/src/memory.c index b442f0a10..437ce10da 100644 --- a/src/memory.c +++ b/src/memory.c @@ -11,16 +11,15 @@ */ #include +#include #include #include #include #include #include -#include #include #include -#include #include #include #include diff --git a/src/mux_fcgi.c b/src/mux_fcgi.c index d1db2a011..5ce6f6191 100644 --- a/src/mux_fcgi.c +++ b/src/mux_fcgi.c @@ -10,12 +10,11 @@ * */ +#include #include -#include #include #include #include -#include #include #include #include diff --git a/src/mux_h1.c b/src/mux_h1.c index ac383f5bc..1c75e93cd 100644 --- a/src/mux_h1.c +++ b/src/mux_h1.c @@ -9,12 +9,11 @@ * 2 of the License, or (at your option) any later version. * */ +#include #include -#include #include #include #include -#include #include diff --git a/src/mux_h2.c b/src/mux_h2.c index a77cf840d..3c0ef5f8e 100644 --- a/src/mux_h2.c +++ b/src/mux_h2.c @@ -10,15 +10,14 @@ * */ +#include #include -#include #include #include #include #include #include #include -#include #include #include #include diff --git a/src/mux_pt.c b/src/mux_pt.c index 6b154e33b..1543f46d8 100644 --- a/src/mux_pt.c +++ b/src/mux_pt.c @@ -10,8 +10,7 @@ * */ -#include -#include +#include #include #include #include diff --git a/src/mworker-prog.c b/src/mworker-prog.c index 1d401a3c6..f445c7fa6 100644 --- a/src/mworker-prog.c +++ b/src/mworker-prog.c @@ -20,9 +20,9 @@ #include #include +#include #include #include -#include #include #include diff --git a/src/mworker.c b/src/mworker.c index 9c46fffe5..f41ee9fa3 100644 --- a/src/mworker.c +++ b/src/mworker.c @@ -17,8 +17,8 @@ #include #include +#include #include -#include #include #include diff --git a/src/namespace.c b/src/namespace.c index 89a968e36..a6d208082 100644 --- a/src/namespace.c +++ b/src/namespace.c @@ -10,8 +10,8 @@ #include +#include #include -#include #include #include #include diff --git a/src/pattern.c b/src/pattern.c index a90820f21..25c3d1050 100644 --- a/src/pattern.c +++ b/src/pattern.c @@ -14,7 +14,7 @@ #include #include -#include +#include #include #include diff --git a/src/payload.c b/src/payload.c index 05201ffbb..3b8eaeb5e 100644 --- a/src/payload.c +++ b/src/payload.c @@ -13,7 +13,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/peers.c b/src/peers.c index 9782ff3c1..e53076081 100644 --- a/src/peers.c +++ b/src/peers.c @@ -20,8 +20,7 @@ #include #include -#include -#include +#include #include #include #include diff --git a/src/pipe.c b/src/pipe.c index bc45de3a3..b08882087 100644 --- a/src/pipe.c +++ b/src/pipe.c @@ -13,7 +13,7 @@ #include #include -#include +#include #include #include diff --git a/src/proto_sockpair.c b/src/proto_sockpair.c index fdbc81d1f..a8b78caa4 100644 --- a/src/proto_sockpair.c +++ b/src/proto_sockpair.c @@ -26,11 +26,9 @@ #include #include -#include -#include +#include #include #include -#include #include #include #include diff --git a/src/proto_tcp.c b/src/proto_tcp.c index afcb1bc0a..f1e65c5f6 100644 --- a/src/proto_tcp.c +++ b/src/proto_tcp.c @@ -30,11 +30,9 @@ #include #include -#include -#include +#include #include #include -#include #include #include #include diff --git a/src/proto_uxst.c b/src/proto_uxst.c index 256a58e56..d41e1c0a4 100644 --- a/src/proto_uxst.c +++ b/src/proto_uxst.c @@ -26,11 +26,9 @@ #include #include -#include -#include +#include #include #include -#include #include #include #include diff --git a/src/protocol.c b/src/protocol.c index ac45cf2e2..6c4341e34 100644 --- a/src/protocol.c +++ b/src/protocol.c @@ -13,7 +13,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/proxy.c b/src/proxy.c index 0845bced1..a62df4d0f 100644 --- a/src/proxy.c +++ b/src/proxy.c @@ -17,12 +17,9 @@ #include #include -#include +#include #include -#include -#include #include -#include #include #include diff --git a/src/queue.c b/src/queue.c index 890574d7c..3c5007687 100644 --- a/src/queue.c +++ b/src/queue.c @@ -69,8 +69,7 @@ * - a pendconn doesn't switch between queues, it stays where it is. */ -#include -#include +#include #include #include #include diff --git a/src/raw_sock.c b/src/raw_sock.c index 340f92993..af8cc65af 100644 --- a/src/raw_sock.c +++ b/src/raw_sock.c @@ -22,9 +22,8 @@ #include +#include #include -#include -#include #include #include #include diff --git a/src/regex.c b/src/regex.c index 195f9a79d..fa1c91b45 100644 --- a/src/regex.c +++ b/src/regex.c @@ -14,9 +14,8 @@ #include #include +#include #include -#include -#include #include #include #include diff --git a/src/ring.c b/src/ring.c index 2a6bb02d1..b011f5363 100644 --- a/src/ring.c +++ b/src/ring.c @@ -19,9 +19,8 @@ */ #include +#include #include -#include -#include #include #include #include diff --git a/src/sample.c b/src/sample.c index f10f4395b..e4841fd9c 100644 --- a/src/sample.c +++ b/src/sample.c @@ -16,12 +16,12 @@ #include #include +#include #include #include #include #include -#include #include #include #include diff --git a/src/server.c b/src/server.c index 15e2f8fec..9d6e7a6a0 100644 --- a/src/server.c +++ b/src/server.c @@ -14,12 +14,11 @@ #include #include +#include #include #include -#include #include -#include #include #include diff --git a/src/session.c b/src/session.c index 74b029e79..fd842a404 100644 --- a/src/session.c +++ b/src/session.c @@ -10,7 +10,7 @@ * */ -#include +#include #include #include #include diff --git a/src/sink.c b/src/sink.c index ff498b24d..20d3d79b1 100644 --- a/src/sink.c +++ b/src/sink.c @@ -18,9 +18,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include #include -#include -#include #include #include #include diff --git a/src/ssl_sample.c b/src/ssl_sample.c index f3fd0b4b0..85703d548 100644 --- a/src/ssl_sample.c +++ b/src/ssl_sample.c @@ -20,8 +20,8 @@ #include #include +#include #include -#include #include #include diff --git a/src/ssl_sock.c b/src/ssl_sock.c index 58ff5833a..79e81d7ba 100644 --- a/src/ssl_sock.c +++ b/src/ssl_sock.c @@ -40,16 +40,14 @@ #include #include +#include #include #include #include #include -#include -#include #include #include -#include #include #include #include diff --git a/src/standard.c b/src/standard.c index 33067bb73..fe174af3a 100644 --- a/src/standard.c +++ b/src/standard.c @@ -36,10 +36,9 @@ #include #include +#include #include -#include #include -#include #include #include #include diff --git a/src/stats.c b/src/stats.c index 1413d3dcb..bfe7accb4 100644 --- a/src/stats.c +++ b/src/stats.c @@ -24,13 +24,11 @@ #include #include +#include #include -#include -#include #include #include #include -#include #include #include #include diff --git a/src/stick_table.c b/src/stick_table.c index 862aafc7e..37131f6a9 100644 --- a/src/stick_table.c +++ b/src/stick_table.c @@ -14,9 +14,8 @@ #include #include -#include +#include #include -#include #include #include #include diff --git a/src/stream.c b/src/stream.c index 1b8a86870..903060381 100644 --- a/src/stream.c +++ b/src/stream.c @@ -14,13 +14,12 @@ #include #include +#include #include -#include #include #include #include #include -#include #include #include diff --git a/src/stream_interface.c b/src/stream_interface.c index ca0519741..fc75c39fc 100644 --- a/src/stream_interface.c +++ b/src/stream_interface.c @@ -19,9 +19,8 @@ #include #include +#include #include -#include -#include #include #include #include diff --git a/src/task.c b/src/task.c index 2d965f291..a116b2e80 100644 --- a/src/task.c +++ b/src/task.c @@ -12,7 +12,7 @@ #include -#include +#include #include #include #include diff --git a/src/tcp_rules.c b/src/tcp_rules.c index fc8b4aed9..58e67ca76 100644 --- a/src/tcp_rules.c +++ b/src/tcp_rules.c @@ -9,11 +9,9 @@ * 2 of the License, or (at your option) any later version. * */ +#include #include -#include -#include #include -#include #include #include #include diff --git a/src/time.c b/src/time.c index 8e3afda0e..5c8ed4be2 100644 --- a/src/time.c +++ b/src/time.c @@ -10,11 +10,10 @@ * */ -#include #include #include -#include +#include #include #include #include diff --git a/src/trace.c b/src/trace.c index d3c27d8f4..667cd81ca 100644 --- a/src/trace.c +++ b/src/trace.c @@ -18,9 +18,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include #include -#include -#include #include #include #include diff --git a/src/uri_auth.c b/src/uri_auth.c index 352737a31..06266f338 100644 --- a/src/uri_auth.c +++ b/src/uri_auth.c @@ -13,8 +13,8 @@ #include #include +#include #include -#include #include #include diff --git a/src/vars.c b/src/vars.c index ec95aaa3d..a213657b8 100644 --- a/src/vars.c +++ b/src/vars.c @@ -1,8 +1,8 @@ #include +#include #include #include -#include #include #include diff --git a/src/wdt.c b/src/wdt.c index f8bd65723..53382ef87 100644 --- a/src/wdt.c +++ b/src/wdt.c @@ -12,10 +12,9 @@ #include #include -#include +#include #include #include -#include #include #include #include diff --git a/src/wurfl.c b/src/wurfl.c index d53e378dc..f5de52af5 100644 --- a/src/wurfl.c +++ b/src/wurfl.c @@ -1,11 +1,11 @@ #include #include +#include #include #include #include #include -#include #include #include #include