CLEANUP: include: tree-wide alphabetical sort of include files

This patch fixes all the leftovers from the include cleanup campaign. There
were not that many (~400 entries in ~150 files) but it was definitely worth
doing it as it revealed a few duplicates.

diff --git a/contrib/mod_defender/defender.c b/contrib/mod_defender/defender.c
index 5e759b50ab246e049b0acb8222e35e98d02cbee8..e798a2275256991b1cbc3d2801769d365739db3e 100644 (file)
--- a/contrib/mod_defender/defender.c
+++ b/contrib/mod_defender/defender.c
@@ -19,10 +19,10 @@
 #include <stdarg.h>
 
 #include <haproxy/api.h>
-#include <haproxy/tools.h>
 #include <haproxy/chunk.h>
 #include <haproxy/spoe.h>
 #include <haproxy/time.h>
+#include <haproxy/tools.h>
 
 #include <http_core.h>
 #include <http_main.h>

diff --git a/contrib/mod_defender/spoa.c b/contrib/mod_defender/spoa.c
index 35b3dd8ab7dae0b7c80c558e7df2c5a476f3e8dc..2ae1a366cf68cfe3d93bcf2a85587dc883dfa495 100644 (file)
--- a/contrib/mod_defender/spoa.c
+++ b/contrib/mod_defender/spoa.c
@@ -31,8 +31,8 @@
 #include <event2/event_struct.h>
 #include <event2/thread.h>
 
-#include <haproxy/list.h>
 #include <haproxy/chunk.h>
+#include <haproxy/list.h>
 #include <haproxy/spoe.h>
 
 #include "spoa.h"

diff --git a/contrib/modsecurity/spoa.c b/contrib/modsecurity/spoa.c
index 2c0b5459cadc317b00b973957be7f526e29f4ed1..1a6cd90103169035577a69c8deaa1ed6ee7cdde5 100644 (file)
--- a/contrib/modsecurity/spoa.c
+++ b/contrib/modsecurity/spoa.c
@@ -36,8 +36,8 @@
 #include <event2/event_struct.h>
 #include <event2/thread.h>
 
-#include <haproxy/list.h>
 #include <haproxy/chunk.h>
+#include <haproxy/list.h>
 #include <haproxy/spoe.h>
 
 #include "spoa.h"

diff --git a/contrib/prometheus-exporter/service-prometheus.c b/contrib/prometheus-exporter/service-prometheus.c
index 761569847395f43bf36e957a17d575f948e5d28f..952558c7014e390a27b53084d5d1734046c7715a 100644 (file)
--- a/contrib/prometheus-exporter/service-prometheus.c
+++ b/contrib/prometheus-exporter/service-prometheus.c
@@ -14,10 +14,11 @@
  */
 
 #include <haproxy/action-t.h>
+#include <haproxy/api.h>
 #include <haproxy/applet.h>
 #include <haproxy/backend.h>
-#include <haproxy/api.h>
 #include <haproxy/cfgparse.h>
+#include <haproxy/compression.h>
 #include <haproxy/frontend.h>
 #include <haproxy/global.h>
 #include <haproxy/http.h>
@@ -26,10 +27,8 @@
 #include <haproxy/list.h>
 #include <haproxy/listener.h>
 #include <haproxy/log.h>
-#include <haproxy/pool.h>
-
-#include <haproxy/compression.h>
 #include <haproxy/pipe.h>
+#include <haproxy/pool.h>
 #include <haproxy/proxy.h>
 #include <haproxy/sample.h>
 #include <haproxy/server.h>

diff --git a/include/haproxy/acl.h b/include/haproxy/acl.h
index fcf50a5fcc27e58438db7c83bd499a30c511bc02..cdbf9c0255c3d00a581d856102517a900a397533 100644 (file)
--- a/include/haproxy/acl.h
+++ b/include/haproxy/acl.h
@@ -23,8 +23,8 @@
 #define _HAPROXY_ACL_H
 
 #include <haproxy/acl-t.h>
-#include <haproxy/arg-t.h>
 #include <haproxy/api.h>
+#include <haproxy/arg-t.h>
 
 struct stream;
 

diff --git a/include/haproxy/action-t.h b/include/haproxy/action-t.h
index 59012fc7625f4f429b4881ceb8bd088ddc81ea87..a002153d708d3f5ace7e45dbeab21e14f81147b5 100644 (file)
--- a/include/haproxy/action-t.h
+++ b/include/haproxy/action-t.h
@@ -22,9 +22,8 @@
 #ifndef _HAPROXY_ACTION_T_H
 #define _HAPROXY_ACTION_T_H
 
-#include <haproxy/regex-t.h>
-
 #include <haproxy/applet-t.h>
+#include <haproxy/regex-t.h>
 #include <haproxy/stick_table-t.h>
 
 enum act_from {

diff --git a/include/haproxy/activity.h b/include/haproxy/activity.h
index 7b68530668734f819c47af74f0337018f8b81a0a..05ee7738460dcfb2084b750ecb8dfa907d8820ae 100644 (file)
--- a/include/haproxy/activity.h
+++ b/include/haproxy/activity.h
@@ -22,10 +22,10 @@
 #ifndef _HAPROXY_ACTIVITY_H
 #define _HAPROXY_ACTIVITY_H
 
-#include <haproxy/api.h>
-#include <haproxy/time.h>
 #include <haproxy/activity-t.h>
+#include <haproxy/api.h>
 #include <haproxy/freq_ctr.h>
+#include <haproxy/time.h>
 
 extern unsigned int profiling;
 extern unsigned long task_profiling_mask;

diff --git a/include/haproxy/api.h b/include/haproxy/api.h
index dd8b02a4fb2b3acc1986400014c9323cc230e117..b1af6fffec82989ba8e6091d74d9e0a9d507b0f2 100644 (file)
--- a/include/haproxy/api.h
+++ b/include/haproxy/api.h
@@ -30,9 +30,9 @@
 #ifndef _HAPROXY_BASE_H
 #define _HAPROXY_BASE_H
 
+#include <haproxy/api-t.h>
 #include <haproxy/atomic.h>
 #include <haproxy/bug.h>
 #include <haproxy/initcall.h>
-#include <haproxy/api-t.h>
 
 #endif

diff --git a/include/haproxy/applet-t.h b/include/haproxy/applet-t.h
index 08467fc241e66bfb0a7b1e80cf90044fa57de547..60f30c56f081e0b446beb1fc39d12bf08909e6eb 100644 (file)
--- a/include/haproxy/applet-t.h
+++ b/include/haproxy/applet-t.h
@@ -22,6 +22,7 @@
 #ifndef _HAPROXY_APPLET_T_H
 #define _HAPROXY_APPLET_T_H
 
+#include <haproxy/api-t.h>
 #include <haproxy/buf-t.h>
 #include <haproxy/dynbuf-t.h>
 #include <haproxy/freq_ctr-t.h>
@@ -29,7 +30,6 @@
 #include <haproxy/obj_type-t.h>
 #include <haproxy/proxy-t.h>
 #include <haproxy/stream-t.h>
-#include <haproxy/api-t.h>
 #include <haproxy/xref-t.h>
 
 /* flags for appctx->state */

diff --git a/include/haproxy/applet.h b/include/haproxy/applet.h
index 00ef4f6beab3de89e6f9063f18a8f69a873fbc6a..f6d764d82c83f7dd14815e2e6c32c1eb8e2d0175 100644 (file)
--- a/include/haproxy/applet.h
+++ b/include/haproxy/applet.h
@@ -24,8 +24,8 @@
 
 #include <stdlib.h>
 
-#include <haproxy/applet-t.h>
 #include <haproxy/api.h>
+#include <haproxy/applet-t.h>
 #include <haproxy/list.h>
 #include <haproxy/pool.h>
 #include <haproxy/task.h>

diff --git a/include/haproxy/arg-t.h b/include/haproxy/arg-t.h
index c5a95d387e244a2e2ed103dbdfe7ad7ac462a59e..04d2d9e4f7774386ecc1f0076174aa239b3336a8 100644 (file)
--- a/include/haproxy/arg-t.h
+++ b/include/haproxy/arg-t.h
@@ -28,9 +28,8 @@
 #include <haproxy/buf-t.h>
 #include <haproxy/list-t.h>
 #include <haproxy/protobuf-t.h>
-#include <haproxy/vars-t.h>
-
 #include <haproxy/stick_table-t.h>
+#include <haproxy/vars-t.h>
 
 /* encoding of each arg type : up to 31 types are supported */
 #define ARGT_BITS      5

diff --git a/include/haproxy/auth-t.h b/include/haproxy/auth-t.h
index 83f2c7c43ca58b62d438663a0bf8bfdc32bef6b8..26716acdafe4821641aa458e215b6bd72ee469d2 100644 (file)
--- a/include/haproxy/auth-t.h
+++ b/include/haproxy/auth-t.h
@@ -14,8 +14,8 @@
 #ifndef _HAPROXY_AUTH_T_H
 #define _HAPROXY_AUTH_T_H
 
-#include <haproxy/auth-t.h>
 #include <haproxy/api-t.h>
+#include <haproxy/auth-t.h>
 #include <haproxy/list-t.h>
 
 #define AU_O_INSECURE  0x00000001              /* insecure, unencrypted password */

diff --git a/include/haproxy/auth.h b/include/haproxy/auth.h
index d7ec2f7229d15adf945c76ccf70bff7de4bf03fb..2fe2b351567ebc6857084d24013689c45e273066 100644 (file)
--- a/include/haproxy/auth.h
+++ b/include/haproxy/auth.h
@@ -14,8 +14,8 @@
 #ifndef _HAPROXY_AUTH_H
 #define _HAPROXY_AUTH_H
 
-#include <haproxy/auth-t.h>
 #include <haproxy/api.h>
+#include <haproxy/auth-t.h>
 #include <haproxy/pattern-t.h>
 #include <haproxy/sample-t.h>
 

diff --git a/include/haproxy/backend-t.h b/include/haproxy/backend-t.h
index af05cc8173ecc317c771fe42066279c9049eb29d..daaf386631751a671f03ab0d2f0a4c724235cc98 100644 (file)
--- a/include/haproxy/backend-t.h
+++ b/include/haproxy/backend-t.h
@@ -22,6 +22,7 @@
 #ifndef _HAPROXY_BACKEND_T_H
 #define _HAPROXY_BACKEND_T_H
 
+#include <haproxy/api-t.h>
 #include <haproxy/lb_chash-t.h>
 #include <haproxy/lb_fas-t.h>
 #include <haproxy/lb_fwlc-t.h>
@@ -29,7 +30,6 @@
 #include <haproxy/lb_map-t.h>
 #include <haproxy/server-t.h>
 #include <haproxy/thread-t.h>
-#include <haproxy/api-t.h>
 
 /* Parameters for lbprm.algo */
 

diff --git a/include/haproxy/backend.h b/include/haproxy/backend.h
index a5e3b464a11275bf9d50eab1e64bcf6b651fe319..f6b25e7bee4ac9813101692c8b9854aaf7f8a4fa 100644 (file)
--- a/include/haproxy/backend.h
+++ b/include/haproxy/backend.h
@@ -22,8 +22,8 @@
 #ifndef _HAPROXY_BACKEND_H
 #define _HAPROXY_BACKEND_H
 
-#include <haproxy/backend-t.h>
 #include <haproxy/api.h>
+#include <haproxy/backend-t.h>
 #include <haproxy/proxy-t.h>
 #include <haproxy/server-t.h>
 #include <haproxy/stream-t.h>

diff --git a/include/haproxy/channel-t.h b/include/haproxy/channel-t.h
index affa942f074aa0117742a63200e057d7092bcc1a..8bd06e147a3b27fe429b37e10fcdb13e812ef995 100644 (file)
--- a/include/haproxy/channel-t.h
+++ b/include/haproxy/channel-t.h
@@ -22,8 +22,8 @@
 #ifndef _HAPROXY_CHANNEL_T_H
 #define _HAPROXY_CHANNEL_T_H
 
-#include <haproxy/buf-t.h>
 #include <haproxy/api-t.h>
+#include <haproxy/buf-t.h>
 
 /* The CF_* macros designate Channel Flags, which may be ORed in the bit field
  * member 'flags' in struct channel. Here we have several types of flags :

diff --git a/include/haproxy/channel.h b/include/haproxy/channel.h
index 5484d43157310deaefbfcde2f0dc8b3a09f24cd0..3cd3bb3b1f277ab3b0da65b485c21bacdd340178 100644 (file)
--- a/include/haproxy/channel.h
+++ b/include/haproxy/channel.h
@@ -30,9 +30,9 @@
 #include <haproxy/stream.h>
 #include <haproxy/stream_interface-t.h>
 #include <haproxy/task.h>
-#include <haproxy/tools-t.h>
 #include <haproxy/ticks.h>
 #include <haproxy/time.h>
+#include <haproxy/tools-t.h>
 
 
 /* perform minimal intializations, report 0 in case of error, 1 if OK. */

diff --git a/include/haproxy/check-t.h b/include/haproxy/check-t.h
index fb2f0a1f2be920aa63f2777817c99f0ca80918d5..901805dd4ebc02d5bfa55939c9ab6c6a9de93a38 100644 (file)
--- a/include/haproxy/check-t.h
+++ b/include/haproxy/check-t.h
@@ -17,11 +17,11 @@
 
 #include <import/ebpttree.h>
 #include <import/ist.h>
+#include <haproxy/api-t.h>
 #include <haproxy/buf-t.h>
 #include <haproxy/connection-t.h>
 #include <haproxy/list-t.h>
 #include <haproxy/obj_type-t.h>
-#include <haproxy/api-t.h>
 #include <haproxy/vars-t.h>
 
 /* Please note: this file tends to commonly be part of circular dependencies,

diff --git a/include/haproxy/chunk.h b/include/haproxy/chunk.h
index 8bb9372f1b13388af57397b5bb6911dc5571c321..b5052d135b2343d07a0dd556c87dafc032b3e811 100644 (file)
--- a/include/haproxy/chunk.h
+++ b/include/haproxy/chunk.h
@@ -25,9 +25,9 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include <import/ist.h>
 #include <haproxy/api.h>
 #include <haproxy/buf-t.h>
-#include <import/ist.h>
 #include <haproxy/pool.h>
 
 

diff --git a/include/haproxy/connection-t.h b/include/haproxy/connection-t.h
index b7b97a5fe958214eaaa74c0e182b542c858ef65b..3755e83e4904e8767d86cd3b84762c735dc30e43 100644 (file)
--- a/include/haproxy/connection-t.h
+++ b/include/haproxy/connection-t.h
@@ -30,12 +30,12 @@
 
 #include <import/ist.h>
 
+#include <haproxy/api-t.h>
 #include <haproxy/list-t.h>
 #include <haproxy/listener-t.h>
 #include <haproxy/obj_type-t.h>
 #include <haproxy/port_range-t.h>
 #include <haproxy/protocol-t.h>
-#include <haproxy/api-t.h>
 
 /* referenced below */
 struct connection;

diff --git a/include/haproxy/dns-t.h b/include/haproxy/dns-t.h
index e75edc5f2d049575f63096d28ae102950e16dace..6816b0835a7fddddf979e10bbde10f5ac6508bcd 100644 (file)
--- a/include/haproxy/dns-t.h
+++ b/include/haproxy/dns-t.h
@@ -25,12 +25,11 @@
 #include <import/eb32tree.h>
 
 #include <haproxy/connection-t.h>
-#include <haproxy/obj_type-t.h>
 #include <haproxy/list-t.h>
-#include <haproxy/thread.h>
-
+#include <haproxy/obj_type-t.h>
 #include <haproxy/proto_udp-t.h>
 #include <haproxy/task-t.h>
+#include <haproxy/thread.h>
 
 extern struct pool_head *dns_requester_pool;
 

diff --git a/include/haproxy/fcgi-app-t.h b/include/haproxy/fcgi-app-t.h
index 602310da951c408ed4d5d82ed023285bcabae25f..3148260979bf5bab106932085ef7d3ea0a60a8c1 100644 (file)
--- a/include/haproxy/fcgi-app-t.h
+++ b/include/haproxy/fcgi-app-t.h
@@ -26,12 +26,12 @@
 #include <import/ist.h>
 
 #include <haproxy/acl-t.h>
+#include <haproxy/api-t.h>
 #include <haproxy/arg-t.h>
 #include <haproxy/fcgi.h>
 #include <haproxy/filters-t.h>
 #include <haproxy/list-t.h>
 #include <haproxy/regex-t.h>
-#include <haproxy/api-t.h>
 
 #define FCGI_APP_FL_KEEP_CONN     0x00000001 /* Keep the connection alive */
 #define FCGI_APP_FL_GET_VALUES    0x00000002 /* Retrieve FCGI variables on connection establishment */

diff --git a/include/haproxy/filters-t.h b/include/haproxy/filters-t.h
index a158d22db71c4e030257da7d8916e560ffdd420a..f41fa10902bd4f17666e0a270fbcaf1debcbd1ce 100644 (file)
--- a/include/haproxy/filters-t.h
+++ b/include/haproxy/filters-t.h
@@ -21,8 +21,8 @@
 #ifndef _HAPROXY_FILTERS_T_H
 #define _HAPROXY_FILTERS_T_H
 
-#include <haproxy/list-t.h>
 #include <haproxy/api-t.h>
+#include <haproxy/list-t.h>
 
 /* Flags set on a filter config */
 #define FLT_CFG_FL_HTX    0x00000001  /* The filter can filter HTX streams */

diff --git a/include/haproxy/global-t.h b/include/haproxy/global-t.h
index 9cf30fa7dcdad189ae9bcff1c6b2f98e40c8bdb0..078889d78c2a0bbb477d0603b63f461f7f4f80d9 100644 (file)
--- a/include/haproxy/global-t.h
+++ b/include/haproxy/global-t.h
@@ -22,10 +22,10 @@
 #ifndef _HAPROXY_GLOBAL_T_H
 #define _HAPROXY_GLOBAL_T_H
 
+#include <haproxy/api-t.h>
 #include <haproxy/buf-t.h>
 #include <haproxy/freq_ctr-t.h>
 #include <haproxy/list-t.h>
-#include <haproxy/api-t.h>
 #include <haproxy/vars-t.h>
 
 /* modes of operation (global.mode) */

diff --git a/include/haproxy/global.h b/include/haproxy/global.h
index 416784b5b334d87497a69103584c367e29320387..4cf5374030ac473b58db565d5a7416224e5c697a 100644 (file)
--- a/include/haproxy/global.h
+++ b/include/haproxy/global.h
@@ -22,10 +22,10 @@
 #ifndef _HAPROXY_GLOBAL_H
 #define _HAPROXY_GLOBAL_H
 
-#include <haproxy/global-t.h>
 #include <haproxy/api-t.h>
-#include <haproxy/vars-t.h>
+#include <haproxy/global-t.h>
 #include <haproxy/mworker-t.h>
+#include <haproxy/vars-t.h>
 
 extern struct global global;
 extern int  pid;                /* current process id */

diff --git a/include/haproxy/hlua-t.h b/include/haproxy/hlua-t.h
index 75a47535807402ac416a848427dec1eafb09f1cd..6764bfa57d4ab539aa0638d5404d1025e42d25a4 100644 (file)
--- a/include/haproxy/hlua-t.h
+++ b/include/haproxy/hlua-t.h
@@ -33,9 +33,8 @@
 #include <haproxy/proxy-t.h>
 #include <haproxy/regex-t.h>
 #include <haproxy/server-t.h>
-#include <haproxy/xref-t.h>
-
 #include <haproxy/stick_table-t.h>
+#include <haproxy/xref-t.h>
 
 #define CLASS_CORE         "Core"
 #define CLASS_TXN          "TXN"

diff --git a/include/haproxy/http_ana-t.h b/include/haproxy/http_ana-t.h
index 16119249a9460aaa5a0e101207d34587d764de9b..bab438ea54096f6f1c971cd55aa4da229c2d5ea3 100644 (file)
--- a/include/haproxy/http_ana-t.h
+++ b/include/haproxy/http_ana-t.h
@@ -22,9 +22,9 @@
 #ifndef _HAPROXY_PROTO_HTTP_T_H
 #define _HAPROXY_PROTO_HTTP_T_H
 
+#include <haproxy/api-t.h>
 #include <haproxy/channel-t.h>
 #include <haproxy/http-t.h>
-#include <haproxy/api-t.h>
 
 /* These are the flags that are found in txn->flags */
 

diff --git a/include/haproxy/http_fetch.h b/include/haproxy/http_fetch.h
index c409b1633c8b01a444156f5bb028af5c0990947b..7997629edaa3920050980df2f900636e8b8368cc 100644 (file)
--- a/include/haproxy/http_fetch.h
+++ b/include/haproxy/http_fetch.h
@@ -22,8 +22,8 @@
 #ifndef _HAPROXY_HTTP_FETCH_H
 #define _HAPROXY_HTTP_FETCH_H
 
-#include <haproxy/arg-t.h>
 #include <haproxy/api.h>
+#include <haproxy/arg-t.h>
 #include <haproxy/channel-t.h>
 #include <haproxy/check-t.h>
 #include <haproxy/sample-t.h>

diff --git a/include/haproxy/http_htx-t.h b/include/haproxy/http_htx-t.h
index dd3b2381ff1a45cb7dc733472d02b273ccbcfa34..9ca06a03e3fdd1f8ff995641659b7234c53720aa 100644 (file)
--- a/include/haproxy/http_htx-t.h
+++ b/include/haproxy/http_htx-t.h
@@ -24,9 +24,9 @@
 #define _HAPROXY_HTTP_HTX_T_H
 
 #include <import/ebistree.h>
+#include <import/ist.h>
 
 #include <haproxy/buf-t.h>
-#include <import/ist.h>
 #include <haproxy/http-t.h>
 #include <haproxy/htx-t.h>
 #include <haproxy/list-t.h>

diff --git a/include/haproxy/http_rules.h b/include/haproxy/http_rules.h
index 2006742cfa5314182cf37678481df1d0f6121138..55788bd9198bbcb219350bc9a596ea179fd2c62a 100644 (file)
--- a/include/haproxy/http_rules.h
+++ b/include/haproxy/http_rules.h
@@ -22,9 +22,9 @@
 #ifndef _HAPROXY_HTTP_RULES_H
 #define _HAPROXY_HTTP_RULES_H
 
+#include <haproxy/action-t.h>
 #include <haproxy/api.h>
 #include <haproxy/list.h>
-#include <haproxy/action-t.h>
 #include <haproxy/proxy-t.h>
 
 extern struct action_kw_list http_req_keywords;

diff --git a/include/haproxy/htx.h b/include/haproxy/htx.h
index c0b56666381aea3226270285545f32cdb2fde530..a849f12557e765871d04468a2d0c3fb2a308097a 100644 (file)
--- a/include/haproxy/htx.h
+++ b/include/haproxy/htx.h
@@ -26,8 +26,8 @@
 #include <haproxy/api.h>
 #include <haproxy/buf.h>
 #include <haproxy/chunk.h>
-#include <haproxy/http-t.h>
 #include <haproxy/http-hdr-t.h>
+#include <haproxy/http-t.h>
 #include <haproxy/htx-t.h>
 
 extern struct htx htx_empty;

diff --git a/include/haproxy/lb_chash-t.h b/include/haproxy/lb_chash-t.h
index ac615b354bc47813f9122cbea870d5c207560013..e96193e4ba30d4bb36d414e70c38c29c03f5f6ef 100644 (file)
--- a/include/haproxy/lb_chash-t.h
+++ b/include/haproxy/lb_chash-t.h
@@ -22,8 +22,8 @@
 #ifndef _HAPROXY_LB_CHASH_T_H
 #define _HAPROXY_LB_CHASH_T_H
 
-#include <import/ebtree.h>
 #include <import/eb32tree.h>
+#include <import/ebtree.h>
 
 struct lb_chash {
        struct eb_root act;     /* weighted chash entries of active servers */

diff --git a/include/haproxy/lb_map-t.h b/include/haproxy/lb_map-t.h
index 0c45c256150fd16818f9673c9f8a25457848dbf9..6d1dd1ae8333205614e4f5f6be5a6fb281b0c151 100644 (file)
--- a/include/haproxy/lb_map-t.h
+++ b/include/haproxy/lb_map-t.h
@@ -22,8 +22,8 @@
 #ifndef _HAPROXY_LB_MAP_T_H
 #define _HAPROXY_LB_MAP_T_H
 
-#include <haproxy/server-t.h>
 #include <haproxy/api-t.h>
+#include <haproxy/server-t.h>
 
 struct lb_map {
        struct server **srv;    /* the server map used to apply weights */

diff --git a/include/haproxy/listener-t.h b/include/haproxy/listener-t.h
index da432d87fe6a40a3a2385456ec6a0a9598b29b8f..4412cf7be0710902fb2c74d37bfc9f00d42ba32a 100644 (file)
--- a/include/haproxy/listener-t.h
+++ b/include/haproxy/listener-t.h
@@ -27,10 +27,10 @@
 
 #include <import/eb32tree.h>
 
+#include <haproxy/api-t.h>
 #include <haproxy/list-t.h>
 #include <haproxy/obj_type-t.h>
 #include <haproxy/thread.h>
-#include <haproxy/api-t.h>
 
 #ifdef USE_OPENSSL
 #include <haproxy/openssl-compat.h>

diff --git a/include/haproxy/log-t.h b/include/haproxy/log-t.h
index c3efa2c7de1756921d220490c15b0d080587f92b..bee43283f7f3d7ef688efa6a476e7204aa62a69a 100644 (file)
--- a/include/haproxy/log-t.h
+++ b/include/haproxy/log-t.h
@@ -26,10 +26,10 @@
 #include <sys/un.h>
 #include <netinet/in.h>
 
+#include <haproxy/api-t.h>
 #include <haproxy/list-t.h>
 #include <haproxy/ring-t.h>
 #include <haproxy/thread-t.h>
-#include <haproxy/api-t.h>
 
 
 #define NB_LOG_FACILITIES       24

diff --git a/include/haproxy/namespace.h b/include/haproxy/namespace.h
index ad52cb139734be693b9b7a0f290843960eb4db6e..2d6b6f8156acfc7f8754e7723ebef178d868e934 100644 (file)
--- a/include/haproxy/namespace.h
+++ b/include/haproxy/namespace.h
@@ -25,8 +25,8 @@
 
 #include <sys/types.h>
 #include <sys/socket.h>
-#include <haproxy/namespace-t.h>
 #include <import/ebistree.h>
+#include <haproxy/namespace-t.h>
 
 #ifdef USE_NS
 

diff --git a/include/haproxy/obj_type.h b/include/haproxy/obj_type.h
index 0946c40b77758675189b5762d3b9b948271cbfc9..215bff4d45c0d4f956288c75ac5d0248ddff84ce 100644 (file)
--- a/include/haproxy/obj_type.h
+++ b/include/haproxy/obj_type.h
@@ -22,8 +22,8 @@
 #ifndef _HAPROXY_OBJ_TYPE_H
 #define _HAPROXY_OBJ_TYPE_H
 
-#include <haproxy/applet-t.h>
 #include <haproxy/api.h>
+#include <haproxy/applet-t.h>
 #include <haproxy/check-t.h>
 #include <haproxy/connection-t.h>
 #include <haproxy/listener-t.h>

diff --git a/include/haproxy/pattern-t.h b/include/haproxy/pattern-t.h
index 592de81bcaf943539fffa1df7c918e401dd07428..63e4c7271c439be7f57adbcbe0c4e8826c067ce3 100644 (file)
--- a/include/haproxy/pattern-t.h
+++ b/include/haproxy/pattern-t.h
@@ -24,12 +24,11 @@
 
 #include <import/ebmbtree.h>
 
+#include <haproxy/api-t.h>
 #include <haproxy/list-t.h>
 #include <haproxy/regex-t.h>
-#include <haproxy/thread-t.h>
-#include <haproxy/api-t.h>
-
 #include <haproxy/sample_data-t.h>
+#include <haproxy/thread-t.h>
 
 
 /* Pattern matching function result.

diff --git a/include/haproxy/peers-t.h b/include/haproxy/peers-t.h
index ea96751840dcf3590939f1e19509468a25e1fcf9..a681cff674a141ad08bfee1be7872f426b057957 100644 (file)
--- a/include/haproxy/peers-t.h
+++ b/include/haproxy/peers-t.h
@@ -29,10 +29,10 @@
 
 #include <import/eb32tree.h>
 
-#include <haproxy/dict-t.h>
-#include <haproxy/thread-t.h>
 #include <haproxy/api-t.h>
+#include <haproxy/dict-t.h>
 #include <haproxy/list-t.h>
+#include <haproxy/thread-t.h>
 
 
 struct shared_table {

diff --git a/include/haproxy/proto_tcp.h b/include/haproxy/proto_tcp.h
index c9ce231016d8ae508a82829e69cb01189c0c5b81..50748a68fe186309db37e41895f396f178b6c495 100644 (file)
--- a/include/haproxy/proto_tcp.h
+++ b/include/haproxy/proto_tcp.h
@@ -22,8 +22,8 @@
 #ifndef _HAPROXY_PROTO_TCP_H
 #define _HAPROXY_PROTO_TCP_H
 
-#include <haproxy/arg-t.h>
 #include <haproxy/api.h>
+#include <haproxy/arg-t.h>
 #include <haproxy/connection-t.h>
 #include <haproxy/listener-t.h>
 #include <haproxy/sample-t.h>

diff --git a/include/haproxy/proxy-t.h b/include/haproxy/proxy-t.h
index f4ccaa388dcb2f056184aa8cb31bff6ede5e95ea..5cdba708f0d74c0ee731d276fbd14ccf79e90d64 100644 (file)
--- a/include/haproxy/proxy-t.h
+++ b/include/haproxy/proxy-t.h
@@ -30,6 +30,7 @@
 #include <import/eb32tree.h>
 #include <import/ebpttree.h>
 
+#include <haproxy/api-t.h>
 #include <haproxy/arg-t.h>
 #include <haproxy/backend-t.h>
 #include <haproxy/counters-t.h>
@@ -39,7 +40,6 @@
 #include <haproxy/server-t.h>
 #include <haproxy/tcpcheck-t.h>
 #include <haproxy/thread-t.h>
-#include <haproxy/api-t.h>
 
 /* values for proxy->state */
 enum pr_state {

diff --git a/include/haproxy/proxy.h b/include/haproxy/proxy.h
index 2263c26f312541f73d7e29b5ff2fd10ccb9f75b9..f6d8944a6950c98525bfb460683ebc71aa192761 100644 (file)
--- a/include/haproxy/proxy.h
+++ b/include/haproxy/proxy.h
@@ -22,8 +22,8 @@
 #ifndef _HAPROXY_PROXY_H
 #define _HAPROXY_PROXY_H
 
-#include <haproxy/applet-t.h>
 #include <haproxy/api.h>
+#include <haproxy/applet-t.h>
 #include <haproxy/freq_ctr.h>
 #include <haproxy/listener-t.h>
 #include <haproxy/proxy-t.h>

diff --git a/include/haproxy/queue.h b/include/haproxy/queue.h
index 19e1c5177d20c255e883306e22e721e0f1047292..f803bdd9db7327893a05d9ca150af96dd268f3d5 100644 (file)
--- a/include/haproxy/queue.h
+++ b/include/haproxy/queue.h
@@ -22,8 +22,8 @@
 #ifndef _HAPROXY_QUEUE_H
 #define _HAPROXY_QUEUE_H
 
-#include <haproxy/backend.h>
 #include <haproxy/api.h>
+#include <haproxy/backend.h>
 #include <haproxy/pool.h>
 #include <haproxy/proxy-t.h>
 #include <haproxy/queue-t.h>

diff --git a/include/haproxy/sample-t.h b/include/haproxy/sample-t.h
index 0f38f186bfbf1d43309d2d17aa7832cd67865a06..2873037fb9eb8b095f004058d9364072fec67217 100644 (file)
--- a/include/haproxy/sample-t.h
+++ b/include/haproxy/sample-t.h
@@ -23,8 +23,8 @@
 #ifndef _HAPROXY_SAMPLE_T_H
 #define _HAPROXY_SAMPLE_T_H
 
-#include <haproxy/list-t.h>
 #include <haproxy/api-t.h>
+#include <haproxy/list-t.h>
 #include <haproxy/sample_data-t.h>
 
 /* input and output sample types */

diff --git a/include/haproxy/sample.h b/include/haproxy/sample.h
index 970dc1b6e8ce8a37245531584de8bfb45748a2cd..4a0561015fd68f0350fdfeb6db2b69fad8c0d9a6 100644 (file)
--- a/include/haproxy/sample.h
+++ b/include/haproxy/sample.h
@@ -23,8 +23,8 @@
 #ifndef _HAPROXY_SAMPLE_H
 #define _HAPROXY_SAMPLE_H
 
-#include <haproxy/arg-t.h>
 #include <haproxy/api.h>
+#include <haproxy/arg-t.h>
 #include <haproxy/sample-t.h>
 #include <haproxy/stick_table-t.h>
 

diff --git a/include/haproxy/server-t.h b/include/haproxy/server-t.h
index 564619dd08cfd2e8d9345b9dae13d63a4105d790..1db69b461d86d1a67de17faa86de24f3d609a6be 100644 (file)
--- a/include/haproxy/server-t.h
+++ b/include/haproxy/server-t.h
@@ -28,6 +28,7 @@
 #include <import/eb32tree.h>
 #include <import/ebmbtree.h>
 
+#include <haproxy/api-t.h>
 #include <haproxy/check-t.h>
 #include <haproxy/connection-t.h>
 #include <haproxy/counters-t.h>
@@ -40,7 +41,6 @@
 #include <haproxy/ssl_sock-t.h>
 #include <haproxy/task-t.h>
 #include <haproxy/thread-t.h>
-#include <haproxy/api-t.h>
 
 
 /* server states. Only SRV_ST_STOPPED indicates a down server. */

diff --git a/include/haproxy/server.h b/include/haproxy/server.h
index 3d47cb02b5b2c255f0fce53226257fa5a03799d2..8d89b97e12b410f7428ab3d1c8a029e24c61b390 100644 (file)
--- a/include/haproxy/server.h
+++ b/include/haproxy/server.h
@@ -24,9 +24,8 @@
 
 #include <unistd.h>
 
-
-#include <haproxy/applet-t.h>
 #include <haproxy/api.h>
+#include <haproxy/applet-t.h>
 #include <haproxy/dns-t.h>
 #include <haproxy/freq_ctr.h>
 #include <haproxy/proxy-t.h>

diff --git a/include/haproxy/sink-t.h b/include/haproxy/sink-t.h
index 5168fe74da2ed0e7722c6fad16e3b0fc36e36ee4..a2464357c34bbe0c228ba797d0f7369ced40a972 100644 (file)
--- a/include/haproxy/sink-t.h
+++ b/include/haproxy/sink-t.h
@@ -23,8 +23,8 @@
 #define _HAPROXY_SINK_T_H
 
 #include <import/ist.h>
-#include <haproxy/list-t.h>
 #include <haproxy/api-t.h>
+#include <haproxy/list-t.h>
 
 /* A sink may be of 4 distinct types :
  *   - file descriptor (such as stdout)

diff --git a/include/haproxy/ssl_sock-t.h b/include/haproxy/ssl_sock-t.h
index 437e56329513142da675679b28eafd1fda22c06b..fbaa8f068ef781b6be4c37c98b782538ca7e4eb0 100644 (file)
--- a/include/haproxy/ssl_sock-t.h
+++ b/include/haproxy/ssl_sock-t.h
@@ -29,12 +29,12 @@
 
 #include <haproxy/buf-t.h>
 #include <haproxy/connection-t.h> /* struct wait_event */
-#include <haproxy/thread-t.h>
 #include <haproxy/list-t.h>
 #include <haproxy/listener-t.h>
 #include <haproxy/openssl-compat.h>
 #include <haproxy/ssl_ckch-t.h>
 #include <haproxy/ssl_crtlist-t.h>
+#include <haproxy/thread-t.h>
 
 /* ***** READ THIS before adding code here! *****
  *

diff --git a/include/haproxy/ssl_sock.h b/include/haproxy/ssl_sock.h
index f15b1cebda67438a32c4ca0feddfc1fda7a3288c..794ccf0d11a7caca536bcabf9628dde1a20c29c2 100644 (file)
--- a/include/haproxy/ssl_sock.h
+++ b/include/haproxy/ssl_sock.h
@@ -26,9 +26,9 @@
 
 #include <haproxy/connection.h>
 #include <haproxy/openssl-compat.h>
-#include <haproxy/ssl_sock-t.h>
 #include <haproxy/pool-t.h>
 #include <haproxy/proxy-t.h>
+#include <haproxy/ssl_sock-t.h>
 #include <haproxy/thread.h>
 
 extern struct list tlskeys_reference;

diff --git a/include/haproxy/stats.h b/include/haproxy/stats.h
index b79e1abb5218cd7a2d8f4c80504eb05df7699f65..4e1b5353c2df5d914c9e7c03a7388bf13e1f1388 100644 (file)
--- a/include/haproxy/stats.h
+++ b/include/haproxy/stats.h
@@ -23,10 +23,10 @@
 #ifndef _HAPROXY_STATS_H
 #define _HAPROXY_STATS_H
 
-#include <haproxy/applet-t.h>
 #include <haproxy/api.h>
-#include <haproxy/stream_interface-t.h>
+#include <haproxy/applet-t.h>
 #include <haproxy/stats-t.h>
+#include <haproxy/stream_interface-t.h>
 #include <haproxy/tools-t.h>
 
 

diff --git a/include/haproxy/stick_table-t.h b/include/haproxy/stick_table-t.h
index 86d8dad1fb6436d96091712bca1dff0063a427cf..9dd495010358024c27f6f1ce9f29f1b2b64dc483 100644 (file)
--- a/include/haproxy/stick_table-t.h
+++ b/include/haproxy/stick_table-t.h
@@ -30,9 +30,9 @@
 #include <import/ebmbtree.h>
 #include <import/ebpttree.h>
 
+#include <haproxy/api-t.h>
 #include <haproxy/freq_ctr-t.h>
 #include <haproxy/thread-t.h>
-#include <haproxy/api-t.h>
 
 
 /* The types of extra data we can store in a stick table */

diff --git a/include/haproxy/stick_table.h b/include/haproxy/stick_table.h
index c77988f4f94db4f6f377919f539f10013eb14bd9..3ca08f0c2189799e694eaa6dd4d7944bf63eb627 100644 (file)
--- a/include/haproxy/stick_table.h
+++ b/include/haproxy/stick_table.h
@@ -28,9 +28,9 @@
 #include <haproxy/errors.h>
 #include <haproxy/sample-t.h>
 #include <haproxy/stick_table-t.h>
-#include <haproxy/tools.h>
 #include <haproxy/ticks.h>
 #include <haproxy/time.h>
+#include <haproxy/tools.h>
 
 extern struct stktable *stktables_list;
 extern struct stktable_type stktable_types[];

diff --git a/include/haproxy/stream-t.h b/include/haproxy/stream-t.h
index 9d8c1fe1cde65e73b78d73984ea82e5d4d89e3ec..525373c8b309d9320d3659c4f23577f557304f88 100644 (file)
--- a/include/haproxy/stream-t.h
+++ b/include/haproxy/stream-t.h
@@ -26,6 +26,7 @@
 #include <netinet/in.h>
 #include <arpa/inet.h>
 
+#include <haproxy/api-t.h>
 #include <haproxy/channel-t.h>
 #include <haproxy/dynbuf-t.h>
 #include <haproxy/filters-t.h>
@@ -40,7 +41,6 @@
 #include <haproxy/stick_table-t.h>
 #include <haproxy/stream_interface-t.h>
 #include <haproxy/task-t.h>
-#include <haproxy/api-t.h>
 #include <haproxy/vars-t.h>
 
 

diff --git a/include/haproxy/stream_interface.h b/include/haproxy/stream_interface.h
index f3e60b7becf7ecfa777ee2890b95e9c47a0bc77f..66159d581a762c01b05d75f727835befd407654c 100644 (file)
--- a/include/haproxy/stream_interface.h
+++ b/include/haproxy/stream_interface.h
@@ -22,8 +22,8 @@
 #ifndef _HAPROXY_STREAM_INTERFACE_H
 #define _HAPROXY_STREAM_INTERFACE_H
 
-#include <haproxy/applet.h>
 #include <haproxy/api.h>
+#include <haproxy/applet.h>
 #include <haproxy/channel.h>
 #include <haproxy/connection.h>
 #include <haproxy/stream-t.h>

diff --git a/include/haproxy/task-t.h b/include/haproxy/task-t.h
index 11f0cb664b946cdc2f6fa5e1bcaa819147ae443b..872918815ff15f44debde3bb7edd499305c71b4a 100644 (file)
--- a/include/haproxy/task-t.h
+++ b/include/haproxy/task-t.h
@@ -27,9 +27,9 @@
 #include <import/eb32sctree.h>
 #include <import/eb32tree.h>
 
+#include <haproxy/api-t.h>
 #include <haproxy/list-t.h>
 #include <haproxy/thread-t.h>
-#include <haproxy/api-t.h>
 
 /* values for task->state */
 #define TASK_SLEEPING     0x0000  /* task sleeping */

diff --git a/include/haproxy/tcpcheck-t.h b/include/haproxy/tcpcheck-t.h
index b65b2517ad1a54e041202b9763729bdc146c52ea..d767d8e3f5495c5f9560a24e7be96fb5a966b4dc 100644 (file)
--- a/include/haproxy/tcpcheck-t.h
+++ b/include/haproxy/tcpcheck-t.h
@@ -20,12 +20,12 @@
 
 #include <import/ebpttree.h>
 #include <import/ist.h>
+#include <haproxy/api-t.h>
 #include <haproxy/buf-t.h>
 #include <haproxy/check-t.h>
 #include <haproxy/connection-t.h>
 #include <haproxy/list-t.h>
 #include <haproxy/obj_type-t.h>
-#include <haproxy/api-t.h>
 #include <haproxy/vars-t.h>
 
 /* options for tcp-check connect */

diff --git a/include/haproxy/tools.h b/include/haproxy/tools.h
index 627675a95b7c6c1b8ca1f12fb1bccbc32b397a9c..ca38de1a886c88751d464e76b0f36a30ff954fdb 100644 (file)
--- a/include/haproxy/tools.h
+++ b/include/haproxy/tools.h
@@ -37,11 +37,11 @@
 #include <sys/un.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
-#include <import/eb32tree.h>
 #include <import/eb32sctree.h>
+#include <import/eb32tree.h>
 #include <haproxy/api.h>
-#include <haproxy/intops.h>
 #include <haproxy/chunk.h>
+#include <haproxy/intops.h>
 #include <haproxy/namespace-t.h>
 #include <haproxy/protocol-t.h>
 #include <haproxy/tools-t.h>

diff --git a/include/haproxy/trace-t.h b/include/haproxy/trace-t.h
index b8295bd52d3433c505f7a9237003c46309be3de3..2ceddfb1ff43b2828941f6186059ccf38df15a8e 100644 (file)
--- a/include/haproxy/trace-t.h
+++ b/include/haproxy/trace-t.h
@@ -23,9 +23,9 @@
 #define _HAPROXY_TRACE_T_H
 
 #include <import/ist.h>
+#include <haproxy/api-t.h>
 #include <haproxy/list-t.h>
 #include <haproxy/sink-t.h>
-#include <haproxy/api-t.h>
 
 /* the macros below define an optional type for each of the 4 args passed to
  * the trace() call. When such a type is set, the caller commits to exclusively

diff --git a/include/haproxy/vars.h b/include/haproxy/vars.h
index 0b73b36e36697758acae827658c42b2dad604cd2..1d0a47abb938fbce404fc74b9d67969eaa74bee3 100644 (file)
--- a/include/haproxy/vars.h
+++ b/include/haproxy/vars.h
@@ -22,9 +22,9 @@
 #ifndef _HAPROXY_VARS_H
 #define _HAPROXY_VARS_H
 
+#include <haproxy/api-t.h>
 #include <haproxy/session-t.h>
 #include <haproxy/stream-t.h>
-#include <haproxy/api-t.h>
 #include <haproxy/vars-t.h>
 
 void vars_init(struct vars *vars, enum vars_scope scope);

diff --git a/src/51d.c b/src/51d.c
index 54e9a1ea0bb38f42208d8bb6a2c74cc1050353e9..b49695bbc43faf8ed03496a21db26ee49f60f8a6 100644 (file)
--- a/src/51d.c
+++ b/src/51d.c
@@ -1,20 +1,20 @@
 #include <stdio.h>
 
+#include <import/lru.h>
+#include <import/xxhash.h>
 #include <haproxy/api.h>
+#include <haproxy/arg.h>
+#include <haproxy/buf-t.h>
 #include <haproxy/cfgparse.h>
 #include <haproxy/chunk.h>
-#include <haproxy/buf-t.h>
 #include <haproxy/errors.h>
+#include <haproxy/global.h>
 #include <haproxy/http_ana.h>
 #include <haproxy/http_fetch.h>
 #include <haproxy/http_htx.h>
-#include <haproxy/thread.h>
-#include <haproxy/global.h>
-#include <haproxy/arg.h>
 #include <haproxy/sample.h>
+#include <haproxy/thread.h>
 #include <haproxy/tools.h>
-#include <import/xxhash.h>
-#include <import/lru.h>
 #include <51Degrees.h>
 
 struct _51d_property_names {

diff --git a/src/acl.c b/src/acl.c
index b1409bd55e415fa558cc03fba3add63b2b278aa8..c328844980ed8b043e9edd46207f6752121d0428 100644 (file)
--- a/src/acl.c
+++ b/src/acl.c
@@ -14,22 +14,20 @@
 #include <stdio.h>
 #include <string.h>
 
+#include <import/ebsttree.h>
+
 #include <haproxy/acl.h>
-#include <haproxy/auth.h>
 #include <haproxy/api.h>
+#include <haproxy/arg.h>
+#include <haproxy/auth.h>
 #include <haproxy/errors.h>
+#include <haproxy/global.h>
 #include <haproxy/list.h>
 #include <haproxy/pattern.h>
 #include <haproxy/proxy-t.h>
-#include <haproxy/tools.h>
-
-#include <haproxy/global.h>
-
-#include <haproxy/arg.h>
 #include <haproxy/sample.h>
 #include <haproxy/stick_table.h>
-
-#include <import/ebsttree.h>
+#include <haproxy/tools.h>
 
 /* List head of all known ACL keywords */
 static struct acl_kw_list acl_keywords = {

diff --git a/src/action.c b/src/action.c
index 16e96dd26e1e482daad34ca64c303514993f37b3..6c4aa62a82535f24a03d1453e18cb8dcba1fde83 100644 (file)
--- a/src/action.c
+++ b/src/action.c
@@ -13,15 +13,14 @@
 #include <haproxy/action.h>
 #include <haproxy/api.h>
 #include <haproxy/errors.h>
+#include <haproxy/list.h>
 #include <haproxy/obj_type.h>
 #include <haproxy/pool.h>
-#include <haproxy/list.h>
 #include <haproxy/proxy.h>
+#include <haproxy/stick_table.h>
 #include <haproxy/task.h>
 #include <haproxy/tools.h>
 
-#include <haproxy/stick_table.h>
-
 
 /* Find and check the target table used by an action track-sc*. This
  * function should be called during the configuration validity check.

diff --git a/src/activity.c b/src/activity.c
index 5ef38c969eca1194d7225a56572a3ae792be4cfb..53721efcd4fd726c759a95449879f774ccff01e5 100644 (file)
--- a/src/activity.c
+++ b/src/activity.c
@@ -10,14 +10,14 @@
  *
  */
 
+#include <haproxy/activity-t.h>
 #include <haproxy/api.h>
 #include <haproxy/cfgparse.h>
 #include <haproxy/channel.h>
 #include <haproxy/cli.h>
+#include <haproxy/freq_ctr.h>
 #include <haproxy/stream_interface.h>
 #include <haproxy/tools.h>
-#include <haproxy/activity-t.h>
-#include <haproxy/freq_ctr.h>
 
 
 /* bit field of profiling options. Beware, may be modified at runtime! */

diff --git a/src/applet.c b/src/applet.c
index 3ec106ce3ebe8080bc92545517e4fa3e5e00dd68..a806eca24caf42799973f139b28d3c559c382484 100644 (file)
--- a/src/applet.c
+++ b/src/applet.c
@@ -13,8 +13,8 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include <haproxy/applet.h>
 #include <haproxy/api.h>
+#include <haproxy/applet.h>
 #include <haproxy/channel.h>
 #include <haproxy/list.h>
 #include <haproxy/stream.h>

diff --git a/src/arg.c b/src/arg.c
index a0f9a5972c5303c10f5323cd1bccb56c29c30f5b..2676ce8085356aa4e46076bbed3197b96d6ae743 100644 (file)
--- a/src/arg.c
+++ b/src/arg.c
@@ -14,10 +14,10 @@
 #include <sys/socket.h>
 #include <arpa/inet.h>
 
-#include <haproxy/tools.h>
+#include <haproxy/arg.h>
 #include <haproxy/chunk.h>
 #include <haproxy/global.h>
-#include <haproxy/arg.h>
+#include <haproxy/tools.h>
 
 const char *arg_type_names[ARGT_NBTYPES] = {
        [ARGT_STOP] = "end of arguments",

diff --git a/src/auth.c b/src/auth.c
index a84e89167e22670e8b7fb9fbfc100fa9cdbfa0f4..bcb4a8e46d7a82f49792d02e04359dcac9b61a66 100644 (file)
--- a/src/auth.c
+++ b/src/auth.c
@@ -25,10 +25,10 @@
 #include <string.h>
 #include <unistd.h>
 
-#include <haproxy/auth-t.h>
 #include <haproxy/api.h>
-#include <haproxy/global.h>
+#include <haproxy/auth-t.h>
 #include <haproxy/errors.h>
+#include <haproxy/global.h>
 #include <haproxy/pattern-t.h>
 #include <haproxy/sample-t.h>
 #include <haproxy/thread.h>

diff --git a/src/backend.c b/src/backend.c
index 4927b0113efc5f23b4f07e293d70915cccf98cbc..915adc5b74c5fa1d199f184acf89ea0ac9626394 100644 (file)
--- a/src/backend.c
+++ b/src/backend.c
@@ -20,11 +20,13 @@
 #include <sys/types.h>
 
 #include <haproxy/acl.h>
-#include <haproxy/backend.h>
 #include <haproxy/api.h>
+#include <haproxy/arg.h>
+#include <haproxy/backend.h>
 #include <haproxy/channel.h>
 #include <haproxy/check.h>
 #include <haproxy/frontend.h>
+#include <haproxy/global.h>
 #include <haproxy/hash.h>
 #include <haproxy/http.h>
 #include <haproxy/http_ana.h>
@@ -36,10 +38,14 @@
 #include <haproxy/lb_fwrr.h>
 #include <haproxy/lb_map.h>
 #include <haproxy/log.h>
+#include <haproxy/namespace.h>
 #include <haproxy/obj_type.h>
 #include <haproxy/payload.h>
+#include <haproxy/proto_tcp.h>
+#include <haproxy/protocol.h>
 #include <haproxy/proxy.h>
 #include <haproxy/queue.h>
+#include <haproxy/sample.h>
 #include <haproxy/server.h>
 #include <haproxy/session.h>
 #include <haproxy/ssl_sock.h>
@@ -49,14 +55,6 @@
 #include <haproxy/ticks.h>
 #include <haproxy/time.h>
 #include <haproxy/trace.h>
-#include <haproxy/namespace.h>
-
-#include <haproxy/global.h>
-
-#include <haproxy/arg.h>
-#include <haproxy/protocol.h>
-#include <haproxy/proto_tcp.h>
-#include <haproxy/sample.h>
 
 #define TRACE_SOURCE &trace_strm
 

diff --git a/src/buffer.c b/src/buffer.c
index e0db429c0c642f98b4c4e0805863044feaccf217..0b3b69c1a207cd4bf94e55ebd49578e20799c274 100644 (file)
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -16,11 +16,10 @@
 
 #include <haproxy/api.h>
 #include <haproxy/dynbuf.h>
+#include <haproxy/global.h>
 #include <haproxy/list.h>
 #include <haproxy/pool.h>
 
-#include <haproxy/global.h>
-
 struct pool_head *pool_head_buffer;
 
 /* list of objects waiting for at least one buffer */

diff --git a/src/cache.c b/src/cache.c
index 6e8d8d2fb6357d21a030889b4d0108f226ae423b..6fc1c1487cdd381d513b268a4531850f994f9543 100644 (file)
--- a/src/cache.c
+++ b/src/cache.c
@@ -10,6 +10,9 @@
  * 2 of the License, or (at your option) any later version.
  */
 
+#include <import/eb32tree.h>
+#include <import/sha1.h>
+
 #include <haproxy/action-t.h>
 #include <haproxy/api.h>
 #include <haproxy/cfgparse.h>
@@ -17,20 +20,16 @@
 #include <haproxy/cli.h>
 #include <haproxy/errors.h>
 #include <haproxy/filters.h>
+#include <haproxy/hash.h>
 #include <haproxy/http_ana.h>
 #include <haproxy/http_htx.h>
 #include <haproxy/http_rules.h>
+#include <haproxy/htx.h>
+#include <haproxy/net_helper.h>
 #include <haproxy/proxy.h>
 #include <haproxy/shctx.h>
 #include <haproxy/stream.h>
 #include <haproxy/stream_interface.h>
-#include <import/eb32tree.h>
-#include <import/sha1.h>
-
-
-#include <haproxy/hash.h>
-#include <haproxy/htx.h>
-#include <haproxy/net_helper.h>
 
 #define CACHE_FLT_F_IMPLICIT_DECL  0x00000001 /* The cache filtre was implicitly declared (ie without
                                               * the filter keyword) */

diff --git a/src/cfgparse-listen.c b/src/cfgparse-listen.c
index 45ac8c3e17a330dd0d20c1fc1c98d97de33192bf..34cf346ab8952cf0fa7ead695f005ee7a55b3ae5 100644 (file)
--- a/src/cfgparse-listen.c
+++ b/src/cfgparse-listen.c
@@ -11,8 +11,6 @@
 #include <fcntl.h>
 #include <unistd.h>
 
-#include <haproxy/uri_auth.h>
-
 #include <haproxy/acl.h>
 #include <haproxy/capture-t.h>
 #include <haproxy/cfgparse.h>
@@ -25,14 +23,14 @@
 #include <haproxy/listener.h>
 #include <haproxy/log.h>
 #include <haproxy/peers.h>
+#include <haproxy/protocol.h>
 #include <haproxy/proxy.h>
 #include <haproxy/sample.h>
 #include <haproxy/server.h>
 #include <haproxy/stats-t.h>
-#include <haproxy/tcpcheck.h>
-
-#include <haproxy/protocol.h>
 #include <haproxy/stick_table.h>
+#include <haproxy/tcpcheck.h>
+#include <haproxy/uri_auth.h>
 
 /* Report a warning if a rule is placed after a 'tcp-request session' rule.
  * Return 1 if the warning has been emitted, otherwise 0.

diff --git a/src/cfgparse.c b/src/cfgparse.c
index fa85401872bd542fcda4a110dddedf664a8a62e8..a9d863e2c3d76926895f48c0a5209a5d60a50f4d 100644 (file)
--- a/src/cfgparse.c
+++ b/src/cfgparse.c
@@ -35,9 +35,9 @@
 
 #include <haproxy/acl.h>
 #include <haproxy/action-t.h>
+#include <haproxy/api.h>
 #include <haproxy/auth.h>
 #include <haproxy/backend.h>
-#include <haproxy/api.h>
 #include <haproxy/capture.h>
 #include <haproxy/cfgparse.h>
 #include <haproxy/channel.h>
@@ -48,6 +48,7 @@
 #include <haproxy/errors.h>
 #include <haproxy/filters.h>
 #include <haproxy/frontend.h>
+#include <haproxy/global.h>
 #include <haproxy/http_ana.h>
 #include <haproxy/http_rules.h>
 #include <haproxy/lb_chash.h>
@@ -58,28 +59,25 @@
 #include <haproxy/listener.h>
 #include <haproxy/log.h>
 #include <haproxy/mailers.h>
+#include <haproxy/namespace.h>
 #include <haproxy/obj_type-t.h>
 #include <haproxy/peers-t.h>
+#include <haproxy/peers.h>
 #include <haproxy/pool.h>
+#include <haproxy/protocol.h>
 #include <haproxy/proxy.h>
+#include <haproxy/sample.h>
+#include <haproxy/server.h>
 #include <haproxy/session.h>
 #include <haproxy/stats-t.h>
-#include <haproxy/tools.h>
-#include <haproxy/time.h>
-#include <haproxy/uri_auth-t.h>
-#include <haproxy/namespace.h>
-#include <haproxy/server.h>
-#include <haproxy/task.h>
-#include <haproxy/thread.h>
-
-#include <haproxy/global.h>
-
-#include <haproxy/protocol.h>
-#include <haproxy/peers.h>
-#include <haproxy/sample.h>
 #include <haproxy/stick_table.h>
 #include <haproxy/stream.h>
+#include <haproxy/task.h>
 #include <haproxy/tcp_rules.h>
+#include <haproxy/thread.h>
+#include <haproxy/time.h>
+#include <haproxy/tools.h>
+#include <haproxy/uri_auth-t.h>
 
 
 /* Used to chain configuration sections definitions. This list

diff --git a/src/check.c b/src/check.c
index 7e8a1d9d4c6cdaf7b9c4338477466e4f21152ead..1a9938d64305d26712510d777e8bb3fd4a732895 100644 (file)
--- a/src/check.c
+++ b/src/check.c
@@ -31,42 +31,41 @@
 
 #include <haproxy/action.h>
 #include <haproxy/api.h>
+#include <haproxy/arg.h>
 #include <haproxy/cfgparse.h>
 #include <haproxy/check.h>
 #include <haproxy/chunk.h>
 #include <haproxy/dns.h>
 #include <haproxy/extcheck.h>
-#include <haproxy/istbuf.h>
-#include <haproxy/list.h>
-#include <haproxy/mailers.h>
-#include <haproxy/queue.h>
-#include <haproxy/regex.h>
-#include <haproxy/tools.h>
-#include <haproxy/time.h>
-#include <haproxy/thread.h>
+#include <haproxy/fd.h>
+#include <haproxy/global.h>
+#include <haproxy/h1.h>
 #include <haproxy/http.h>
 #include <haproxy/http_htx.h>
-#include <haproxy/h1.h>
 #include <haproxy/htx.h>
+#include <haproxy/istbuf.h>
+#include <haproxy/list.h>
 #include <haproxy/log.h>
+#include <haproxy/mailers.h>
+#include <haproxy/port_range.h>
+#include <haproxy/proto_tcp.h>
+#include <haproxy/proto_udp.h>
+#include <haproxy/protocol.h>
 #include <haproxy/proxy.h>
+#include <haproxy/queue.h>
+#include <haproxy/regex.h>
+#include <haproxy/sample.h>
 #include <haproxy/server.h>
 #include <haproxy/ssl_sock.h>
 #include <haproxy/stats-t.h>
 #include <haproxy/stream_interface.h>
 #include <haproxy/task.h>
 #include <haproxy/tcpcheck.h>
+#include <haproxy/thread.h>
+#include <haproxy/time.h>
+#include <haproxy/tools.h>
 #include <haproxy/vars.h>
 
-#include <haproxy/global.h>
-
-#include <haproxy/arg.h>
-#include <haproxy/fd.h>
-#include <haproxy/port_range.h>
-#include <haproxy/proto_tcp.h>
-#include <haproxy/protocol.h>
-#include <haproxy/proto_udp.h>
-#include <haproxy/sample.h>
 
 static int wake_srv_chk(struct conn_stream *cs);
 struct data_cb check_conn_cb = {

diff --git a/src/chunk.c b/src/chunk.c
index 6f9aa39b3759785cb62587d45d9b2e821417d25f..ade0323a8420360813376e2eb4d5768a27eec1a8 100644 (file)
--- a/src/chunk.c
+++ b/src/chunk.c
@@ -17,9 +17,8 @@
 
 #include <haproxy/api.h>
 #include <haproxy/chunk.h>
-#include <haproxy/tools.h>
-
 #include <haproxy/global.h>
+#include <haproxy/tools.h>
 
 /* trash chunks used for various conversions */
 static THREAD_LOCAL struct buffer *trash_chunk;

diff --git a/src/cli.c b/src/cli.c
index 6ca0a1fdd4b504d0aae32ccb0dc496f156588a28..f850dd7e54f1d850961903fc21ae28e7f134029e 100644 (file)
--- a/src/cli.c
+++ b/src/cli.c
@@ -26,21 +26,29 @@
 
 #include <net/if.h>
 
-#include <haproxy/applet-t.h>
+#include <haproxy/activity.h>
 #include <haproxy/api.h>
+#include <haproxy/applet-t.h>
+#include <haproxy/base64.h>
 #include <haproxy/cfgparse.h>
 #include <haproxy/channel.h>
 #include <haproxy/check.h>
 #include <haproxy/cli.h>
+#include <haproxy/compression.h>
 #include <haproxy/dns-t.h>
 #include <haproxy/errors.h>
+#include <haproxy/fd.h>
+#include <haproxy/freq_ctr.h>
 #include <haproxy/frontend.h>
+#include <haproxy/global.h>
 #include <haproxy/list.h>
 #include <haproxy/listener.h>
 #include <haproxy/log.h>
 #include <haproxy/mworker-t.h>
 #include <haproxy/pattern-t.h>
 #include <haproxy/peers.h>
+#include <haproxy/pipe.h>
+#include <haproxy/protocol.h>
 #include <haproxy/proxy.h>
 #include <haproxy/sample-t.h>
 #include <haproxy/server.h>
@@ -49,20 +57,10 @@
 #include <haproxy/stream.h>
 #include <haproxy/stream_interface.h>
 #include <haproxy/task.h>
-#include <haproxy/tools.h>
 #include <haproxy/ticks.h>
 #include <haproxy/time.h>
+#include <haproxy/tools.h>
 #include <haproxy/version.h>
-#include <haproxy/base64.h>
-
-#include <haproxy/global.h>
-
-#include <haproxy/activity.h>
-#include <haproxy/compression.h>
-#include <haproxy/fd.h>
-#include <haproxy/freq_ctr.h>
-#include <haproxy/pipe.h>
-#include <haproxy/protocol.h>
 
 #define PAYLOAD_PATTERN "<<"
 

diff --git a/src/compression.c b/src/compression.c
index 7d4720eebfedbc69e0f602372ecf40dd83d028eb..ffe5b0b04a8c7a91804d4ca6512d10979aa013d0 100644 (file)
--- a/src/compression.c
+++ b/src/compression.c
@@ -28,16 +28,14 @@
 
 #include <haproxy/api.h>
 #include <haproxy/cfgparse.h>
-#include <haproxy/dynbuf.h>
-#include <haproxy/stream.h>
-#include <haproxy/thread.h>
-#include <haproxy/pool.h>
-
-#include <haproxy/global.h>
 #include <haproxy/compression-t.h>
-
 #include <haproxy/compression.h>
+#include <haproxy/dynbuf.h>
 #include <haproxy/freq_ctr.h>
+#include <haproxy/global.h>
+#include <haproxy/pool.h>
+#include <haproxy/stream.h>
+#include <haproxy/thread.h>
 
 
 #if defined(USE_ZLIB)

diff --git a/src/connection.c b/src/connection.c
index f9741ef5545b55d586c2e6f0ad57152cb3f1a0cb..63c511b9cfd8129a8291e6f39fdaf1d3e2acb2e3 100644 (file)
--- a/src/connection.c
+++ b/src/connection.c
@@ -15,13 +15,12 @@
 #include <haproxy/api.h>
 #include <haproxy/cfgparse.h>
 #include <haproxy/connection.h>
+#include <haproxy/fd.h>
 #include <haproxy/frontend.h>
+#include <haproxy/hash.h>
 #include <haproxy/log-t.h>
 #include <haproxy/namespace.h>
-#include <haproxy/hash.h>
 #include <haproxy/net_helper.h>
-
-#include <haproxy/fd.h>
 #include <haproxy/proto_tcp.h>
 #include <haproxy/sample.h>
 #include <haproxy/ssl_sock.h>

diff --git a/src/da.c b/src/da.c
index 9b12cc5a39d4627beec68934aaca755d6630e2bf..98dbe6c877eb27efe5a78a73f2663f0c5710f034 100644 (file)
--- a/src/da.c
+++ b/src/da.c
@@ -1,15 +1,15 @@
 #include <stdio.h>
 
 #include <haproxy/api.h>
+#include <haproxy/arg.h>
 #include <haproxy/cfgparse.h>
 #include <haproxy/errors.h>
+#include <haproxy/global.h>
 #include <haproxy/http.h>
 #include <haproxy/http_ana.h>
 #include <haproxy/http_fetch.h>
 #include <haproxy/http_htx.h>
 #include <haproxy/htx.h>
-#include <haproxy/global.h>
-#include <haproxy/arg.h>
 #include <haproxy/sample.h>
 #include <haproxy/tools.h>
 #include <dac.h>

diff --git a/src/debug.c b/src/debug.c
index 6829eb286203b28a405dd0ac3424b7d75e8b2f3c..b4475f38be8b83407daf8dec524ebab51c06299c 100644 (file)
--- a/src/debug.c
+++ b/src/debug.c
@@ -24,18 +24,17 @@
 #include <haproxy/buf.h>
 #include <haproxy/cli.h>
 #include <haproxy/debug.h>
+#include <haproxy/fd.h>
+#include <haproxy/global.h>
 #include <haproxy/hlua.h>
 #include <haproxy/log.h>
+#include <haproxy/net_helper.h>
 #include <haproxy/stream_interface.h>
 #include <haproxy/task.h>
 #include <haproxy/thread.h>
-#include <import/ist.h>
-#include <haproxy/net_helper.h>
 #include <haproxy/tools.h>
+#include <import/ist.h>
 
-#include <haproxy/global.h>
-
-#include <haproxy/fd.h>
 
 /* mask of threads still having to dump, used to respect ordering. Only used
  * when USE_THREAD_DUMP is set.

diff --git a/src/dns.c b/src/dns.c
index 9ba1873fe72ff3b3adaf43bdd1f4283c6db0e97d..55b5a3716436a3190df4881bce80756ca7fd5f0e 100644 (file)
--- a/src/dns.c
+++ b/src/dns.c
@@ -22,13 +22,17 @@
 #include <haproxy/action.h>
 #include <haproxy/api.h>
 #include <haproxy/cfgparse.h>
-#include <haproxy/check.h>
 #include <haproxy/channel.h>
+#include <haproxy/check.h>
 #include <haproxy/cli.h>
 #include <haproxy/dns.h>
 #include <haproxy/errors.h>
+#include <haproxy/fd.h>
+#include <haproxy/global.h>
 #include <haproxy/http_rules.h>
 #include <haproxy/log.h>
+#include <haproxy/net_helper.h>
+#include <haproxy/proto_udp.h>
 #include <haproxy/proxy.h>
 #include <haproxy/sample.h>
 #include <haproxy/server.h>
@@ -36,15 +40,10 @@
 #include <haproxy/stream_interface.h>
 #include <haproxy/task.h>
 #include <haproxy/tcp_rules.h>
-#include <haproxy/time.h>
 #include <haproxy/ticks.h>
-#include <haproxy/net_helper.h>
+#include <haproxy/time.h>
 #include <haproxy/vars.h>
 
-#include <haproxy/global.h>
-
-#include <haproxy/fd.h>
-#include <haproxy/proto_udp.h>
 
 struct list dns_resolvers  = LIST_HEAD_INIT(dns_resolvers);
 struct list dns_srvrq_list = LIST_HEAD_INIT(dns_srvrq_list);

diff --git a/src/ebimtree.c b/src/ebimtree.c
index e6b82cc364801195acb30b51a28191093240544e..1ac444a198e0c976235ab76051a3591435c43c8c 100644 (file)
--- a/src/ebimtree.c
+++ b/src/ebimtree.c
@@ -20,8 +20,8 @@
 
 /* Consult ebimtree.h for more details about those functions */
 
-#include <import/ebpttree.h>
 #include <import/ebimtree.h>
+#include <import/ebpttree.h>
 
 /* Find the first occurrence of a key of <len> bytes in the tree <root>.
  * If none can be found, return NULL.

diff --git a/src/ev_epoll.c b/src/ev_epoll.c
index 8096988bd89d8f2a27e1d4b13ad36b0b4f15ecca..2501dd5b885d14d35646b61a28fa91548e665c09 100644 (file)
--- a/src/ev_epoll.c
+++ b/src/ev_epoll.c
@@ -14,15 +14,14 @@
 #include <sys/time.h>
 #include <sys/types.h>
 
+#include <haproxy/activity.h>
 #include <haproxy/api.h>
+#include <haproxy/fd.h>
 #include <haproxy/global.h>
 #include <haproxy/signal.h>
-#include <haproxy/tools.h>
 #include <haproxy/ticks.h>
 #include <haproxy/time.h>
-
-#include <haproxy/activity.h>
-#include <haproxy/fd.h>
+#include <haproxy/tools.h>
 
 
 /* private data */

diff --git a/src/ev_evports.c b/src/ev_evports.c
index cbb1bc8fd33eb7dc30665765518ba3b0390be485..6b14ea0694238245528938428e3e139873e6aa88 100644 (file)
--- a/src/ev_evports.c
+++ b/src/ev_evports.c
@@ -18,16 +18,14 @@
 #include <errno.h>
 #include <syslog.h>
 
+#include <haproxy/activity.h>
 #include <haproxy/api.h>
+#include <haproxy/fd.h>
+#include <haproxy/global.h>
 #include <haproxy/signal.h>
 #include <haproxy/ticks.h>
 #include <haproxy/time.h>
 
-#include <haproxy/global.h>
-
-#include <haproxy/activity.h>
-#include <haproxy/fd.h>
-
 /*
  * Private data:
  */

diff --git a/src/ev_kqueue.c b/src/ev_kqueue.c
index c699fe23ce251f8be4ccc349aa43fcb78b1ae03d..3a0b0a3fa885fb2cf7dc218dd0de39b4bad52be5 100644 (file)
--- a/src/ev_kqueue.c
+++ b/src/ev_kqueue.c
@@ -17,16 +17,14 @@
 #include <sys/event.h>
 #include <sys/time.h>
 
+#include <haproxy/activity.h>
 #include <haproxy/api.h>
+#include <haproxy/fd.h>
+#include <haproxy/global.h>
 #include <haproxy/signal.h>
 #include <haproxy/ticks.h>
 #include <haproxy/time.h>
 
-#include <haproxy/global.h>
-
-#include <haproxy/activity.h>
-#include <haproxy/fd.h>
-
 
 /* private data */
 static int kqueue_fd[MAX_THREADS]; // per-thread kqueue_fd

diff --git a/src/ev_poll.c b/src/ev_poll.c
index 53ae81ffe74a737fb194d3f1e5c0d2ed0a633cfb..03d32b008947d50d092dae800336a1941eab3da9 100644 (file)
--- a/src/ev_poll.c
+++ b/src/ev_poll.c
@@ -17,15 +17,13 @@
 #include <sys/time.h>
 #include <sys/types.h>
 
+#include <haproxy/activity.h>
 #include <haproxy/api.h>
+#include <haproxy/fd.h>
+#include <haproxy/global.h>
 #include <haproxy/ticks.h>
 #include <haproxy/time.h>
 
-#include <haproxy/global.h>
-
-#include <haproxy/activity.h>
-#include <haproxy/fd.h>
-
 
 #ifndef POLLRDHUP
 /* POLLRDHUP was defined late in libc, and it appeared in kernel 2.6.17 */

diff --git a/src/ev_select.c b/src/ev_select.c
index bf69f35fdfa214c285e5daa45745cc2ad7a99395..adc8160046efa6e83cc650d4c5d676bb91dde4ab 100644 (file)
--- a/src/ev_select.c
+++ b/src/ev_select.c
@@ -14,15 +14,13 @@
 #include <sys/time.h>
 #include <sys/types.h>
 
+#include <haproxy/activity.h>
 #include <haproxy/api.h>
+#include <haproxy/fd.h>
+#include <haproxy/global.h>
 #include <haproxy/ticks.h>
 #include <haproxy/time.h>
 
-#include <haproxy/global.h>
-
-#include <haproxy/activity.h>
-#include <haproxy/fd.h>
-
 
 /* private data */
 static int maxfd;   /* # of the highest fd + 1 */

diff --git a/src/fcgi-app.c b/src/fcgi-app.c
index 1833557561c564317ca4a12c63aeca0f63262d41..964cc7d3f6800131bc1802fd2ba46a2c11025b07 100644 (file)
--- a/src/fcgi-app.c
+++ b/src/fcgi-app.c
@@ -17,6 +17,7 @@
 #include <haproxy/errors.h>
 #include <haproxy/fcgi-app.h>
 #include <haproxy/filters.h>
+#include <haproxy/global.h>
 #include <haproxy/http_fetch.h>
 #include <haproxy/http_htx.h>
 #include <haproxy/log.h>
@@ -27,7 +28,6 @@
 #include <haproxy/session.h>
 #include <haproxy/tools.h>
 
-#include <haproxy/global.h>
 
 /* Global list of all FCGI applications */
 static struct fcgi_app *fcgi_apps = NULL;

diff --git a/src/fcgi.c b/src/fcgi.c
index 455cc2228c4c86060d5ecd9db07f7e416920c034..1c2543def6b04436495a44f285f070b45ae66714 100644 (file)
--- a/src/fcgi.c
+++ b/src/fcgi.c
@@ -24,8 +24,8 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include <haproxy/fcgi.h>
 #include <haproxy/buf.h>
+#include <haproxy/fcgi.h>
 #include <haproxy/istbuf.h>
 
 /* Encodes header of a FCGI record into the chunk <out>. It returns non-zero on

diff --git a/src/fd.c b/src/fd.c
index d3940bb12ad1e2f56014d8506afd0c447fd53a03..2356a9002b5de80f6b489e37c3fa917fdc2b7584 100644 (file)
--- a/src/fd.c
+++ b/src/fd.c
@@ -87,13 +87,12 @@
 #include <errno.h>
 #endif
 
-
 #include <haproxy/api.h>
-#include <haproxy/global.h>
-
 #include <haproxy/fd.h>
+#include <haproxy/global.h>
 #include <haproxy/port_range.h>
 
+
 struct fdtab *fdtab = NULL;     /* array of all the file descriptors */
 struct polled_mask *polled_mask = NULL; /* Array for the polled_mask of each fd */
 struct fdinfo *fdinfo = NULL;   /* less-often used infos for file descriptors */

diff --git a/src/flt_spoe.c b/src/flt_spoe.c
index a53bcd9dddedb8a9b3382e9fe0d73f61876f821a..6302fc83e05ad9b08136c1d16ae5d64eb0368437 100644 (file)
--- a/src/flt_spoe.c
+++ b/src/flt_spoe.c
@@ -14,8 +14,8 @@
 
 #include <haproxy/acl.h>
 #include <haproxy/action-t.h>
-#include <haproxy/arg.h>
 #include <haproxy/api.h>
+#include <haproxy/arg.h>
 #include <haproxy/cfgparse.h>
 #include <haproxy/filters.h>
 #include <haproxy/freq_ctr.h>
@@ -23,17 +23,17 @@
 #include <haproxy/global.h>
 #include <haproxy/http_rules.h>
 #include <haproxy/log.h>
-#include <haproxy/sample.h>
-#include <haproxy/signal.h>
-#include <haproxy/thread.h>
 #include <haproxy/pool.h>
 #include <haproxy/proxy.h>
+#include <haproxy/sample.h>
 #include <haproxy/session.h>
+#include <haproxy/signal.h>
 #include <haproxy/spoe.h>
 #include <haproxy/stream.h>
 #include <haproxy/stream_interface.h>
 #include <haproxy/task.h>
 #include <haproxy/tcp_rules.h>
+#include <haproxy/thread.h>
 #include <haproxy/time.h>
 #include <haproxy/vars.h>
 

diff --git a/src/flt_trace.c b/src/flt_trace.c
index 910f5c486165a052cbbbfeca733f345b12d28e69..f9fd24820af76e0bc34cf386f371a48124158ed4 100644 (file)
--- a/src/flt_trace.c
+++ b/src/flt_trace.c
@@ -22,8 +22,8 @@
 #include <haproxy/htx.h>
 #include <haproxy/proxy-t.h>
 #include <haproxy/stream.h>
-#include <haproxy/tools.h>
 #include <haproxy/time.h>
+#include <haproxy/tools.h>
 
 const char *trace_flt_id = "trace filter";
 

diff --git a/src/freq_ctr.c b/src/freq_ctr.c
index 17d27720c69715127c0d259ed4fa022d3025a19d..ad032a338bf0706892181166076a3d1e117771b7 100644 (file)
--- a/src/freq_ctr.c
+++ b/src/freq_ctr.c
@@ -11,9 +11,9 @@
  */
 
 #include <haproxy/api.h>
-#include <haproxy/tools.h>
-#include <haproxy/time.h>
 #include <haproxy/freq_ctr.h>
+#include <haproxy/time.h>
+#include <haproxy/tools.h>
 
 /* Read a frequency counter taking history into account for missing time in
  * current period. Current second is sub-divided in 1000 chunks of one ms,

diff --git a/src/frontend.c b/src/frontend.c
index b819f5b3832f31a4f8a7a4216571b858f69bbd17..5658a5f581166a395fab0c572f350ae77a214e09 100644 (file)
--- a/src/frontend.c
+++ b/src/frontend.c
@@ -24,23 +24,22 @@
 
 #include <haproxy/acl.h>
 #include <haproxy/api.h>
+#include <haproxy/arg.h>
 #include <haproxy/chunk.h>
+#include <haproxy/fd.h>
 #include <haproxy/frontend.h>
+#include <haproxy/global.h>
 #include <haproxy/http_ana.h>
 #include <haproxy/log.h>
+#include <haproxy/proto_tcp.h>
 #include <haproxy/proxy.h>
 #include <haproxy/sample.h>
 #include <haproxy/stream.h>
 #include <haproxy/stream_interface.h>
 #include <haproxy/task.h>
-#include <haproxy/tools.h>
 #include <haproxy/time.h>
+#include <haproxy/tools.h>
 
-#include <haproxy/global.h>
-
-#include <haproxy/arg.h>
-#include <haproxy/fd.h>
-#include <haproxy/proto_tcp.h>
 
 /* Finish a stream accept() for a proxy (TCP or HTTP). It returns a negative
  * value in case of a critical failure which must cause the listener to be

diff --git a/src/h2.c b/src/h2.c
index bd46ffca9fba1d4850334e98c28343e94f418bb1..66846108653484823d013bda1a12692b2a48f538 100644 (file)
--- a/src/h2.c
+++ b/src/h2.c
@@ -27,12 +27,13 @@
 
 #include <inttypes.h>
 #include <haproxy/api.h>
-#include <haproxy/http.h>
+#include <haproxy/global.h>
 #include <haproxy/h2.h>
 #include <haproxy/http-hdr-t.h>
+#include <haproxy/http.h>
 #include <haproxy/htx.h>
 #include <import/ist.h>
-#include <haproxy/global.h>
+
 
 struct h2_frame_definition h2_frame_definition[H2_FT_ENTRIES] =        {
         [H2_FT_DATA         ] = { .dir = 3, .min_id = 1, .max_id = H2_MAX_STREAM_ID, .min_len = 0, .max_len = H2_MAX_FRAME_LEN, },

diff --git a/src/haproxy.c b/src/haproxy.c
index f066f5f1394e5104c36d01187f434246bc0b1c2c..dcde0c100a7cc48a9b89d4dcd13a218170ab9537 100644 (file)
--- a/src/haproxy.c
+++ b/src/haproxy.c
@@ -78,12 +78,15 @@
 #include <systemd/sd-daemon.h>
 #endif
 
-#include <haproxy/acl.h>
-#include <haproxy/auth.h>
-#include <haproxy/api.h>
 #include <import/sha1.h>
 
+#include <haproxy/acl.h>
+#include <haproxy/activity.h>
+#include <haproxy/api.h>
+#include <haproxy/arg.h>
+#include <haproxy/auth.h>
 #include <haproxy/base64.h>
+#include <haproxy/capture-t.h>
 #include <haproxy/cfgparse.h>
 #include <haproxy/chunk.h>
 #include <haproxy/cli.h>
@@ -91,10 +94,11 @@
 #include <haproxy/dns.h>
 #include <haproxy/dynbuf.h>
 #include <haproxy/errors.h>
+#include <haproxy/fd.h>
 #include <haproxy/filters.h>
+#include <haproxy/global.h>
 #include <haproxy/hlua.h>
 #include <haproxy/http_rules.h>
-#include <haproxy/pool.h>
 #include <haproxy/list.h>
 #include <haproxy/listener.h>
 #include <haproxy/log.h>
@@ -104,29 +108,24 @@
 #include <haproxy/openssl-compat.h>
 #include <haproxy/pattern.h>
 #include <haproxy/peers.h>
+#include <haproxy/pool.h>
+#include <haproxy/protocol.h>
 #include <haproxy/proxy.h>
-#include <haproxy/sample.h>
 #include <haproxy/regex.h>
+#include <haproxy/sample.h>
 #include <haproxy/server.h>
 #include <haproxy/session.h>
 #include <haproxy/signal.h>
 #include <haproxy/ssl_sock.h>
 #include <haproxy/stream.h>
-#include <haproxy/tools.h>
-#include <haproxy/time.h>
-#include <haproxy/uri_auth-t.h>
-#include <haproxy/version.h>
 #include <haproxy/task.h>
 #include <haproxy/thread.h>
+#include <haproxy/time.h>
+#include <haproxy/tools.h>
+#include <haproxy/uri_auth-t.h>
 #include <haproxy/vars.h>
+#include <haproxy/version.h>
 
-#include <haproxy/capture-t.h>
-#include <haproxy/global.h>
-
-#include <haproxy/activity.h>
-#include <haproxy/arg.h>
-#include <haproxy/fd.h>
-#include <haproxy/protocol.h>
 
 /* array of init calls for older platforms */
 DECLARE_INIT_STAGES;

diff --git a/src/hlua.c b/src/hlua.c
index f2d471de696ce1f369dec5b3438142ca59bcf6f6..6a75e88f9c8db4cdc474995f86f7b99765ab82e4 100644 (file)
--- a/src/hlua.c
+++ b/src/hlua.c
@@ -21,24 +21,21 @@
 #error "Requires Lua 5.3 or later."
 #endif
 
-#include <haproxy/applet.h>
-#include <haproxy/api.h>
 #include <import/ebpttree.h>
 
+#include <haproxy/api.h>
+#include <haproxy/applet.h>
 #include <haproxy/arg.h>
 #include <haproxy/cfgparse.h>
 #include <haproxy/channel.h>
 #include <haproxy/cli.h>
 #include <haproxy/connection.h>
-#include <haproxy/http_htx.h>
-#include <haproxy/thread.h>
-#include <haproxy/regex.h>
-#include <haproxy/xref.h>
 #include <haproxy/h1.h>
 #include <haproxy/hlua.h>
 #include <haproxy/hlua_fcn.h>
 #include <haproxy/http_ana.h>
 #include <haproxy/http_fetch.h>
+#include <haproxy/http_htx.h>
 #include <haproxy/http_rules.h>
 #include <haproxy/log.h>
 #include <haproxy/map.h>
@@ -46,6 +43,7 @@
 #include <haproxy/pattern.h>
 #include <haproxy/payload.h>
 #include <haproxy/proxy-t.h>
+#include <haproxy/regex.h>
 #include <haproxy/sample.h>
 #include <haproxy/server-t.h>
 #include <haproxy/session.h>
@@ -54,8 +52,11 @@
 #include <haproxy/stream_interface.h>
 #include <haproxy/task.h>
 #include <haproxy/tcp_rules.h>
+#include <haproxy/thread.h>
 #include <haproxy/tools.h>
 #include <haproxy/vars.h>
+#include <haproxy/xref.h>
+
 
 /* Lua uses longjmp to perform yield or throwing errors. This
  * macro is used only for identifying the function that can

diff --git a/src/hlua_fcn.c b/src/hlua_fcn.c
index 78b9495cc37879b38b16be6bf7c49fab086f069c..ed094b7e378c2475878311c1a274554c0114db43 100644 (file)
--- a/src/hlua_fcn.c
+++ b/src/hlua_fcn.c
@@ -28,9 +28,8 @@
 #include <haproxy/regex.h>
 #include <haproxy/server.h>
 #include <haproxy/stats.h>
-#include <haproxy/time.h>
-
 #include <haproxy/stick_table.h>
+#include <haproxy/time.h>
 
 /* Contains the class reference of the concat object. */
 static int class_concat_ref;

diff --git a/src/hpack-dec.c b/src/hpack-dec.c
index 987165c64a40e3848202eb4f20d587317f5c4829..debd6119dc054e41ee7d57196b29077a57eb8f9d 100644 (file)
--- a/src/hpack-dec.c
+++ b/src/hpack-dec.c
@@ -30,13 +30,13 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <haproxy/tools.h>
+#include <import/ist.h>
+#include <haproxy/chunk.h>
+#include <haproxy/h2.h>
 #include <haproxy/hpack-dec.h>
 #include <haproxy/hpack-huff.h>
 #include <haproxy/hpack-tbl.h>
-#include <haproxy/chunk.h>
-#include <haproxy/h2.h>
-#include <import/ist.h>
+#include <haproxy/tools.h>
 
 
 #if defined(DEBUG_HPACK)

diff --git a/src/hpack-enc.c b/src/hpack-enc.c
index 64cca7873d1d3046c625141506d604e4ffbeadd6..3ab21bc5f083ccf3b180082171dfd13a3e0c6523 100644 (file)
--- a/src/hpack-enc.c
+++ b/src/hpack-enc.c
@@ -30,9 +30,9 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include <import/ist.h>
 #include <haproxy/hpack-enc.h>
 #include <haproxy/http-hdr-t.h>
-#include <import/ist.h>
 
 /*
  * HPACK encoding: these tables were generated using gen-enc.c

diff --git a/src/hpack-tbl.c b/src/hpack-tbl.c
index e7c3d33ec29c94a34a58702c6b14de64775e1d8c..da81d296b510ec71afe9ee1432a8bcc3a1d01023 100644 (file)
--- a/src/hpack-tbl.c
+++ b/src/hpack-tbl.c
@@ -30,9 +30,9 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include <import/ist.h>
 #include <haproxy/hpack-huff.h>
 #include <haproxy/hpack-tbl.h>
-#include <import/ist.h>
 
 /* static header table as in RFC7541 Appendix A. [0] unused. */
 const struct http_hdr hpack_sht[HPACK_SHT_SIZE] = {

diff --git a/src/http_acl.c b/src/http_acl.c
index 17a818e10b2b0068e5ca8e7fc1a019c0cdf92bcd..a81fb03532adb30445064e1cc39fd888d03de723 100644 (file)
--- a/src/http_acl.c
+++ b/src/http_acl.c
@@ -17,8 +17,9 @@
 #include <time.h>
 
 #include <haproxy/acl.h>
-#include <haproxy/auth.h>
 #include <haproxy/api.h>
+#include <haproxy/arg.h>
+#include <haproxy/auth.h>
 #include <haproxy/chunk.h>
 #include <haproxy/http.h>
 #include <haproxy/pattern.h>
@@ -26,8 +27,6 @@
 #include <haproxy/tools.h>
 #include <haproxy/version.h>
 
-#include <haproxy/arg.h>
-
 
 /* We use the pre-parsed method if it is known, and store its number as an
  * integer. If it is unknown, we use the pointer and the length.

diff --git a/src/http_act.c b/src/http_act.c
index 9db12de7b7cc508e489462486991f9195fbd8400..76e6d2b2c9f75fe7fa8d1daf718a11cd2627bbe9 100644 (file)
--- a/src/http_act.c
+++ b/src/http_act.c
@@ -19,6 +19,8 @@
 #include <haproxy/acl.h>
 #include <haproxy/action.h>
 #include <haproxy/api.h>
+#include <haproxy/arg.h>
+#include <haproxy/capture-t.h>
 #include <haproxy/cfgparse.h>
 #include <haproxy/chunk.h>
 #include <haproxy/global.h>
@@ -36,9 +38,6 @@
 #include <haproxy/uri_auth-t.h>
 #include <haproxy/version.h>
 
-#include <haproxy/capture-t.h>
-
-#include <haproxy/arg.h>
 
 /* Release memory allocated by most of HTTP actions. Concretly, it releases
  * <arg.http>.

diff --git a/src/http_ana.c b/src/http_ana.c
index a95f07928ff919c6d8ddfb7d0c42a3d51fe93b0a..6be34bb361209a158b92452b13221eed03c35353 100644 (file)
--- a/src/http_ana.c
+++ b/src/http_ana.c
@@ -12,8 +12,8 @@
 
 #include <haproxy/acl.h>
 #include <haproxy/action-t.h>
-#include <haproxy/backend.h>
 #include <haproxy/api.h>
+#include <haproxy/backend.h>
 #include <haproxy/base64.h>
 #include <haproxy/capture-t.h>
 #include <haproxy/channel.h>

diff --git a/src/http_conv.c b/src/http_conv.c
index c9f0ffaab4c8d3c16bcddec3a99b422a5d705f97..390d85a7951d5c4fd35fd314678871f0d042db35 100644 (file)
--- a/src/http_conv.c
+++ b/src/http_conv.c
@@ -16,8 +16,8 @@
 #include <string.h>
 #include <time.h>
 
-#include <haproxy/arg.h>
 #include <haproxy/api.h>
+#include <haproxy/arg.h>
 #include <haproxy/capture-t.h>
 #include <haproxy/chunk.h>
 #include <haproxy/http.h>

diff --git a/src/http_fetch.c b/src/http_fetch.c
index c2b82889b5c3252ef6873f5e4830a5e513e486d0..585743edf7b76c6709cf6c6ff8a937c978c79961 100644 (file)
--- a/src/http_fetch.c
+++ b/src/http_fetch.c
@@ -16,9 +16,9 @@
 #include <string.h>
 #include <time.h>
 
+#include <haproxy/api.h>
 #include <haproxy/arg.h>
 #include <haproxy/auth.h>
-#include <haproxy/api.h>
 #include <haproxy/base64.h>
 #include <haproxy/channel.h>
 #include <haproxy/chunk.h>

diff --git a/src/http_htx.c b/src/http_htx.c
index 8b615627a1445cf1b7fe71015895e541149b12d8..0af9f5184a81108a9b155e890656c7b65941fb70 100644 (file)
--- a/src/http_htx.c
+++ b/src/http_htx.c
@@ -15,19 +15,18 @@
 #include <unistd.h>
 
 #include <haproxy/api.h>
-#include <haproxy/global.h>
-#include <haproxy/http_fetch.h>
-#include <haproxy/log.h>
-#include <haproxy/regex.h>
-#include <haproxy/sample.h>
-
+#include <haproxy/arg.h>
 #include <haproxy/cfgparse.h>
+#include <haproxy/global.h>
 #include <haproxy/h1.h>
 #include <haproxy/http.h>
+#include <haproxy/http_fetch.h>
 #include <haproxy/http_htx.h>
 #include <haproxy/htx.h>
+#include <haproxy/log.h>
+#include <haproxy/regex.h>
+#include <haproxy/sample.h>
 
-#include <haproxy/arg.h>
 
 struct buffer http_err_chunks[HTTP_ERR_SIZE];
 struct http_reply http_err_replies[HTTP_ERR_SIZE];

diff --git a/src/http_rules.c b/src/http_rules.c
index 79aa39c4c3ca29fb5ea21623dfc9c690f75a3755..87d32f3777d59c5d1ba210d14671d86cd982d7a9 100644 (file)
--- a/src/http_rules.c
+++ b/src/http_rules.c
@@ -19,6 +19,8 @@
 #include <haproxy/acl.h>
 #include <haproxy/action.h>
 #include <haproxy/api.h>
+#include <haproxy/arg.h>
+#include <haproxy/capture-t.h>
 #include <haproxy/cfgparse.h>
 #include <haproxy/chunk.h>
 #include <haproxy/global.h>
@@ -26,14 +28,10 @@
 #include <haproxy/http_rules.h>
 #include <haproxy/log.h>
 #include <haproxy/pool.h>
+#include <haproxy/sample.h>
 #include <haproxy/tools.h>
 #include <haproxy/version.h>
 
-#include <haproxy/capture-t.h>
-
-#include <haproxy/arg.h>
-#include <haproxy/sample.h>
-
 
 /* List head of all known action keywords for "http-request" */
 struct action_kw_list http_req_keywords = {

diff --git a/src/lb_chash.c b/src/lb_chash.c
index 1fb44f4c7ee1b5bd66fa94c7c7d3865ca7d7ba57..9f7ad5ccddfd0093270cf2f70eeff76e8a46d564 100644 (file)
--- a/src/lb_chash.c
+++ b/src/lb_chash.c
@@ -17,8 +17,8 @@
  */
 
 #include <import/eb32tree.h>
-#include <haproxy/backend.h>
 #include <haproxy/api.h>
+#include <haproxy/backend.h>
 #include <haproxy/queue.h>
 #include <haproxy/server-t.h>
 #include <haproxy/tools.h>

diff --git a/src/lb_fas.c b/src/lb_fas.c
index be2ce47e18838d7bff4b71541ffb4eb33a883a80..0fcd5e395f686119675a6743ecd128ec3adbf9c8 100644 (file)
--- a/src/lb_fas.c
+++ b/src/lb_fas.c
@@ -17,8 +17,8 @@
  */
 
 #include <import/eb32tree.h>
-#include <haproxy/backend.h>
 #include <haproxy/api.h>
+#include <haproxy/backend.h>
 #include <haproxy/queue.h>
 #include <haproxy/server-t.h>
 

diff --git a/src/lb_fwlc.c b/src/lb_fwlc.c
index a835f014ebe72681b7c8508b6360207b74229c65..8eac2c9304f066295d6a61b5e6af232fbc39c52a 100644 (file)
--- a/src/lb_fwlc.c
+++ b/src/lb_fwlc.c
@@ -11,8 +11,8 @@
  */
 
 #include <import/eb32tree.h>
-#include <haproxy/backend.h>
 #include <haproxy/api.h>
+#include <haproxy/backend.h>
 #include <haproxy/queue.h>
 #include <haproxy/server-t.h>
 

diff --git a/src/lb_fwrr.c b/src/lb_fwrr.c
index 6183433eb2cdacb613412fc08b2ab54edbf39b1f..05ae5f6f466e4f600ae7c8950bd102d530587ab5 100644 (file)
--- a/src/lb_fwrr.c
+++ b/src/lb_fwrr.c
@@ -11,8 +11,8 @@
  */
 
 #include <import/eb32tree.h>
-#include <haproxy/backend.h>
 #include <haproxy/api.h>
+#include <haproxy/backend.h>
 #include <haproxy/queue.h>
 #include <haproxy/server-t.h>
 

diff --git a/src/lb_map.c b/src/lb_map.c
index 61debf838103e7f8270b1f678203018b51fe7936..b863d5f781c535a1333674003763aeba26f0b07d 100644 (file)
--- a/src/lb_map.c
+++ b/src/lb_map.c
@@ -11,8 +11,8 @@
  */
 
 #include <import/eb32tree.h>
-#include <haproxy/backend.h>
 #include <haproxy/api.h>
+#include <haproxy/backend.h>
 #include <haproxy/lb_map.h>
 #include <haproxy/queue.h>
 #include <haproxy/server-t.h>

diff --git a/src/listener.c b/src/listener.c
index 82eb2e7ad95fbbce41325ade3c5bbed97e1939fb..cc49c705eaa09bd3e5565713505b6dfdac822e97 100644 (file)
--- a/src/listener.c
+++ b/src/listener.c
@@ -23,22 +23,21 @@
 #include <haproxy/cfgparse.h>
 #include <haproxy/connection.h>
 #include <haproxy/errors.h>
+#include <haproxy/fd.h>
+#include <haproxy/freq_ctr.h>
 #include <haproxy/global.h>
 #include <haproxy/list.h>
 #include <haproxy/listener.h>
 #include <haproxy/log.h>
+#include <haproxy/proto_sockpair.h>
+#include <haproxy/protocol-t.h>
+#include <haproxy/protocol.h>
+#include <haproxy/sample.h>
 #include <haproxy/stream.h>
 #include <haproxy/task.h>
-#include <haproxy/tools.h>
 #include <haproxy/time.h>
+#include <haproxy/tools.h>
 
-#include <haproxy/protocol-t.h>
-
-#include <haproxy/fd.h>
-#include <haproxy/freq_ctr.h>
-#include <haproxy/protocol.h>
-#include <haproxy/proto_sockpair.h>
-#include <haproxy/sample.h>
 
 /* List head of all known bind keywords */
 static struct bind_kw_list bind_keywords = {

diff --git a/src/log.c b/src/log.c
index 8c2334ad355a2b0e8d2c9652df5dd9e604229165..385bfc71ec0721e173deeffaed1b494c2e878f6b 100644 (file)
--- a/src/log.c
+++ b/src/log.c
@@ -24,25 +24,24 @@
 #include <sys/time.h>
 #include <sys/uio.h>
 
-#include <haproxy/applet-t.h>
 #include <haproxy/api.h>
+#include <haproxy/applet-t.h>
 #include <haproxy/cli.h>
+#include <haproxy/fd.h>
 #include <haproxy/frontend.h>
+#include <haproxy/global.h>
 #include <haproxy/http.h>
 #include <haproxy/log.h>
+#include <haproxy/ring.h>
+#include <haproxy/sample.h>
+#include <haproxy/sink.h>
 #include <haproxy/ssl_sock.h>
 #include <haproxy/stream.h>
 #include <haproxy/stream_interface.h>
-#include <haproxy/tools.h>
 #include <haproxy/time.h>
+#include <haproxy/tools.h>
 #include <haproxy/version.h>
 
-#include <haproxy/global.h>
-
-#include <haproxy/fd.h>
-#include <haproxy/ring.h>
-#include <haproxy/sample.h>
-#include <haproxy/sink.h>
 
 struct log_fmt {
        char *name;

diff --git a/src/mailers.c b/src/mailers.c
index 94ed5b4fa234d22d259403d5b6c392bbd120eb1e..76d6a69ea86f7046cfc4e6a921cbf9e7ee1f25b2 100644 (file)
--- a/src/mailers.c
+++ b/src/mailers.c
@@ -20,13 +20,13 @@
 #include <haproxy/list.h>
 #include <haproxy/mailers.h>
 #include <haproxy/pool.h>
-#include <haproxy/tools.h>
-#include <haproxy/time.h>
-#include <haproxy/thread.h>
 #include <haproxy/proxy-t.h>
 #include <haproxy/server-t.h>
 #include <haproxy/task.h>
 #include <haproxy/tcpcheck.h>
+#include <haproxy/thread.h>
+#include <haproxy/time.h>
+#include <haproxy/tools.h>
 
 
 struct mailers *mailers = NULL;

diff --git a/src/map.c b/src/map.c
index 243676d2e16e0c2b2608c42be344911c53620738..adc857ba9d82a6306c46f246b1689e9b0ecb7495 100644 (file)
--- a/src/map.c
+++ b/src/map.c
@@ -12,18 +12,18 @@
 
 #include <stdio.h>
 
-#include <haproxy/applet-t.h>
 #include <haproxy/api.h>
+#include <haproxy/applet-t.h>
+#include <haproxy/arg.h>
 #include <haproxy/cli.h>
 #include <haproxy/map.h>
 #include <haproxy/pattern.h>
 #include <haproxy/regex.h>
+#include <haproxy/sample.h>
 #include <haproxy/stats-t.h>
 #include <haproxy/stream_interface.h>
 #include <haproxy/tools.h>
 
-#include <haproxy/arg.h>
-#include <haproxy/sample.h>
 
 /* Parse an IPv4 or IPv6 address and store it into the sample.
  * The output type is IPv4 or IPv6.

diff --git a/src/mux_fcgi.c b/src/mux_fcgi.c
index 03e5b9c87208387e0167c41ac999946c2e010d80..b11612179ea447740e2ca8088d01d85c8878b351 100644 (file)
--- a/src/mux_fcgi.c
+++ b/src/mux_fcgi.c
@@ -10,17 +10,18 @@
  *
  */
 
+#include <import/ist.h>
+
 #include <haproxy/api.h>
 #include <haproxy/cfgparse.h>
 #include <haproxy/connection.h>
 #include <haproxy/errors.h>
-#include <haproxy/fcgi.h>
 #include <haproxy/fcgi-app.h>
+#include <haproxy/fcgi.h>
 #include <haproxy/h1.h>
 #include <haproxy/h1_htx.h>
 #include <haproxy/http_htx.h>
 #include <haproxy/htx.h>
-#include <import/ist.h>
 #include <haproxy/list.h>
 #include <haproxy/log.h>
 #include <haproxy/net_helper.h>
@@ -32,6 +33,7 @@
 #include <haproxy/stream_interface.h>
 #include <haproxy/trace.h>
 
+
 /* FCGI Connection flags (32 bits) */
 #define FCGI_CF_NONE           0x00000000
 

diff --git a/src/mux_h1.c b/src/mux_h1.c
index 5a66f7d41e3d35b65982b5a158a071fae6bf4fdb..8bd43c99de20b16713cc605a60c87ec28b334892 100644 (file)
--- a/src/mux_h1.c
+++ b/src/mux_h1.c
@@ -9,22 +9,20 @@
  * 2 of the License, or (at your option) any later version.
  *
  */
+#include <import/ebistree.h>
+
 #include <haproxy/api.h>
-#include <haproxy/istbuf.h>
 #include <haproxy/cfgparse.h>
 #include <haproxy/connection.h>
 #include <haproxy/h1.h>
 #include <haproxy/h1_htx.h>
 #include <haproxy/h2.h>
+#include <haproxy/http_htx.h>
 #include <haproxy/htx.h>
-
-#include <import/ebistree.h>
-
+#include <haproxy/istbuf.h>
+#include <haproxy/log.h>
 #include <haproxy/pipe-t.h>
 #include <haproxy/proxy-t.h>
-
-#include <haproxy/http_htx.h>
-#include <haproxy/log.h>
 #include <haproxy/session-t.h>
 #include <haproxy/stream.h>
 #include <haproxy/stream_interface.h>

diff --git a/src/mux_h2.c b/src/mux_h2.c
index 1a318110d91537d97368552162ebaa2f3cb84b34..9928b32c7607a3125df27157a5fd3629d0fa73c3 100644 (file)
--- a/src/mux_h2.c
+++ b/src/mux_h2.c
@@ -12,7 +12,6 @@
 
 #include <import/eb32tree.h>
 #include <haproxy/api.h>
-#include <haproxy/istbuf.h>
 #include <haproxy/cfgparse.h>
 #include <haproxy/connection.h>
 #include <haproxy/h1.h>
@@ -22,6 +21,7 @@
 #include <haproxy/hpack-tbl.h>
 #include <haproxy/http_htx.h>
 #include <haproxy/htx.h>
+#include <haproxy/istbuf.h>
 #include <haproxy/log.h>
 #include <haproxy/net_helper.h>
 #include <haproxy/session-t.h>

diff --git a/src/mworker.c b/src/mworker.c
index 14c0e5717113d5e3362d00ed942efdefcd1b0ded..1caec10ce47e3b9a80aa077a1fd560d12d7755ee 100644 (file)
--- a/src/mworker.c
+++ b/src/mworker.c
@@ -17,6 +17,10 @@
 #include <string.h>
 #include <sys/wait.h>
 
+#if defined(USE_SYSTEMD)
+#include <systemd/sd-daemon.h>
+#endif
+
 #include <haproxy/api.h>
 #include <haproxy/cfgparse.h>
 #include <haproxy/cli.h>
@@ -34,10 +38,6 @@
 #include <haproxy/version.h>
 
 
-#if defined(USE_SYSTEMD)
-#include <systemd/sd-daemon.h>
-#endif
-
 static int exitcode = -1;
 static int max_reloads = -1; /* number max of reloads a worker can have until they are killed */
 

diff --git a/src/pattern.c b/src/pattern.c
index bbd7faa2687fdd614bb26324329eb192e0c58c93..274e773ec45d54012253f088abc9e49f16dbbeb4 100644 (file)
--- a/src/pattern.c
+++ b/src/pattern.c
@@ -14,19 +14,19 @@
 #include <stdio.h>
 #include <errno.h>
 
+#include <import/ebsttree.h>
+#include <import/lru.h>
+#include <import/xxhash.h>
+
 #include <haproxy/api.h>
 #include <haproxy/global.h>
 #include <haproxy/log.h>
 #include <haproxy/net_helper.h>
 #include <haproxy/pattern.h>
 #include <haproxy/regex.h>
-#include <haproxy/tools.h>
-
 #include <haproxy/sample.h>
+#include <haproxy/tools.h>
 
-#include <import/ebsttree.h>
-#include <import/lru.h>
-#include <import/xxhash.h>
 
 char *pat_match_names[PAT_MATCH_NUM] = {
        [PAT_MATCH_FOUND] = "found",

diff --git a/src/payload.c b/src/payload.c
index d9b31072b05fc2ce3cd06d1b392f9af9036f9d84..7feea16c302c3093634bc8e64334207ffe75ea81 100644 (file)
--- a/src/payload.c
+++ b/src/payload.c
@@ -15,13 +15,13 @@
 
 #include <haproxy/acl.h>
 #include <haproxy/api.h>
+#include <haproxy/arg.h>
 #include <haproxy/channel.h>
 #include <haproxy/connection.h>
+#include <haproxy/htx.h>
 #include <haproxy/net_helper.h>
-#include <haproxy/payload.h>
 #include <haproxy/pattern.h>
-#include <haproxy/htx.h>
-#include <haproxy/arg.h>
+#include <haproxy/payload.h>
 #include <haproxy/sample.h>
 
 

diff --git a/src/peers.c b/src/peers.c
index fa444a901b92e710cf7c8544e19f6e378d53d6e8..478cbd2e67d39874f86cd1f9ba2ea284c734e10b 100644 (file)
--- a/src/peers.c
+++ b/src/peers.c
@@ -20,8 +20,8 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 
-#include <haproxy/applet.h>
 #include <haproxy/api.h>
+#include <haproxy/applet.h>
 #include <haproxy/channel.h>
 #include <haproxy/cli.h>
 #include <haproxy/dict.h>
@@ -32,16 +32,16 @@
 #include <haproxy/obj_type-t.h>
 #include <haproxy/peers.h>
 #include <haproxy/proxy.h>
-#include <haproxy/task.h>
 #include <haproxy/session-t.h>
 #include <haproxy/signal.h>
 #include <haproxy/stats-t.h>
 #include <haproxy/stick_table.h>
 #include <haproxy/stream.h>
 #include <haproxy/stream_interface.h>
+#include <haproxy/task.h>
+#include <haproxy/thread.h>
 #include <haproxy/time.h>
 #include <haproxy/tools.h>
-#include <haproxy/thread.h>
 
 
 /*******************************/

diff --git a/src/pipe.c b/src/pipe.c
index 59b8312ce32333154ab1b23a0cab5faffb623f12..efab2b44478910815fa39271c59b874e8123ea0d 100644 (file)
--- a/src/pipe.c
+++ b/src/pipe.c
@@ -15,10 +15,10 @@
 
 #include <haproxy/api.h>
 #include <haproxy/global.h>
-#include <haproxy/thread.h>
+#include <haproxy/pipe-t.h>
 #include <haproxy/pool.h>
+#include <haproxy/thread.h>
 
-#include <haproxy/pipe-t.h>
 
 DECLARE_STATIC_POOL(pool_head_pipe, "pipe", sizeof(struct pipe));
 

diff --git a/src/pool.c b/src/pool.c
index c1850697b626969e28c88e7f48326c0bf670c011..89c2ba4206e29f7179966dc5035c8a8a318bf568 100644 (file)
--- a/src/pool.c
+++ b/src/pool.c
@@ -11,23 +11,21 @@
  */
 #include <errno.h>
 
-#include <haproxy/applet-t.h>
+#include <haproxy/activity-t.h>
 #include <haproxy/api.h>
+#include <haproxy/applet-t.h>
 #include <haproxy/cfgparse.h>
 #include <haproxy/channel.h>
 #include <haproxy/cli.h>
 #include <haproxy/errors.h>
 #include <haproxy/global.h>
-
-#include <haproxy/thread.h>
-#include <haproxy/pool.h>
 #include <haproxy/list.h>
+#include <haproxy/pool.h>
 #include <haproxy/stats-t.h>
 #include <haproxy/stream_interface.h>
+#include <haproxy/thread.h>
 #include <haproxy/tools.h>
 
-#include <haproxy/activity-t.h>
-
 
 #ifdef CONFIG_HAP_LOCAL_POOLS
 /* These are the most common pools, expected to be initialized first. These

diff --git a/src/proto_sockpair.c b/src/proto_sockpair.c
index 7d5a5078e2d8b94334d5e331736325cace0f5cb9..835ce8fe04da607d621c424304bd67c417a90dd5 100644 (file)
--- a/src/proto_sockpair.c
+++ b/src/proto_sockpair.c
@@ -29,16 +29,16 @@
 #include <haproxy/api.h>
 #include <haproxy/connection.h>
 #include <haproxy/errors.h>
+#include <haproxy/fd.h>
+#include <haproxy/freq_ctr.h>
 #include <haproxy/global.h>
 #include <haproxy/list.h>
 #include <haproxy/listener.h>
-#include <haproxy/tools.h>
+#include <haproxy/protocol.h>
 #include <haproxy/time.h>
+#include <haproxy/tools.h>
 #include <haproxy/version.h>
 
-#include <haproxy/fd.h>
-#include <haproxy/freq_ctr.h>
-#include <haproxy/protocol.h>
 
 static void sockpair_add_listener(struct listener *listener, int port);
 static int sockpair_bind_listener(struct listener *listener, char *errmsg, int errlen);

diff --git a/src/proto_tcp.c b/src/proto_tcp.c
index 2a259f8a7c6afae810250cff50ca47758ae5265e..2d30ce42e09b7045534c51f44894c5acf33d2f9b 100644 (file)
--- a/src/proto_tcp.c
+++ b/src/proto_tcp.c
@@ -32,27 +32,27 @@
 
 #include <haproxy/action-t.h>
 #include <haproxy/api.h>
+#include <haproxy/arg.h>
 #include <haproxy/channel.h>
 #include <haproxy/connection.h>
 #include <haproxy/errors.h>
+#include <haproxy/fd.h>
 #include <haproxy/global.h>
 #include <haproxy/http_rules.h>
 #include <haproxy/list.h>
 #include <haproxy/listener.h>
 #include <haproxy/log.h>
+#include <haproxy/namespace.h>
+#include <haproxy/port_range.h>
+#include <haproxy/proto_tcp.h>
+#include <haproxy/protocol.h>
 #include <haproxy/proxy-t.h>
 #include <haproxy/sample.h>
 #include <haproxy/server.h>
 #include <haproxy/stream-t.h>
+#include <haproxy/tcp_rules.h>
 #include <haproxy/tools.h>
-#include <haproxy/namespace.h>
 
-#include <haproxy/arg.h>
-#include <haproxy/fd.h>
-#include <haproxy/port_range.h>
-#include <haproxy/protocol.h>
-#include <haproxy/proto_tcp.h>
-#include <haproxy/tcp_rules.h>
 
 static int tcp_bind_listeners(struct protocol *proto, char *errmsg, int errlen);
 static int tcp_bind_listener(struct listener *listener, char *errmsg, int errlen);

diff --git a/src/proto_udp.c b/src/proto_udp.c
index 617df1af1421865e489690413aa76813914c50d1..f5202f816b10aa08b20839849b67ed4427d79a96 100644 (file)
--- a/src/proto_udp.c
+++ b/src/proto_udp.c
@@ -10,10 +10,8 @@
  *
  */
 
-#include <haproxy/fd-t.h>
-#include <haproxy/proto_udp-t.h>
-
 #include <haproxy/fd.h>
+#include <haproxy/proto_udp-t.h>
 
 /* datagram handler callback */
 void dgram_fd_handler(int fd)

diff --git a/src/proto_uxst.c b/src/proto_uxst.c
index ea516ba1972a64d4b5bbe1f19b0018f7b314ada8..663f59a9bd9fc19fa4697ce0afb8c92d4a46772a 100644 (file)
--- a/src/proto_uxst.c
+++ b/src/proto_uxst.c
@@ -29,16 +29,16 @@
 #include <haproxy/api.h>
 #include <haproxy/connection.h>
 #include <haproxy/errors.h>
+#include <haproxy/fd.h>
 #include <haproxy/global.h>
 #include <haproxy/list.h>
 #include <haproxy/listener.h>
 #include <haproxy/log.h>
-#include <haproxy/tools.h>
+#include <haproxy/protocol.h>
 #include <haproxy/time.h>
+#include <haproxy/tools.h>
 #include <haproxy/version.h>
 
-#include <haproxy/fd.h>
-#include <haproxy/protocol.h>
 
 static int uxst_bind_listener(struct listener *listener, char *errmsg, int errlen);
 static int uxst_bind_listeners(struct protocol *proto, char *errmsg, int errlen);

diff --git a/src/protocol.c b/src/protocol.c
index f739444a0a66b7b2491d52fe223323b4d102a6b6..af13f42e78fea7fd6c5c82c48149278b2c258e14 100644 (file)
--- a/src/protocol.c
+++ b/src/protocol.c
@@ -16,9 +16,9 @@
 #include <haproxy/api.h>
 #include <haproxy/errors.h>
 #include <haproxy/list.h>
+#include <haproxy/protocol.h>
 #include <haproxy/tools.h>
 
-#include <haproxy/protocol.h>
 
 /* List head of all registered protocols */
 static struct list protocols = LIST_HEAD_INIT(protocols);

diff --git a/src/proxy.c b/src/proxy.c
index ba8a07d0fd3987524281d3d24e6627a325dea9b1..52f0c9d77f615c4b79cebb8f2d79c9b6c4d87ef2 100644 (file)
--- a/src/proxy.c
+++ b/src/proxy.c
@@ -17,11 +17,16 @@
 #include <sys/socket.h>
 #include <sys/stat.h>
 
-#include <haproxy/applet-t.h>
+#include <import/eb32tree.h>
+#include <import/ebistree.h>
+
 #include <haproxy/api.h>
+#include <haproxy/applet-t.h>
+#include <haproxy/capture-t.h>
 #include <haproxy/cfgparse.h>
 #include <haproxy/cli.h>
 #include <haproxy/errors.h>
+#include <haproxy/fd.h>
 #include <haproxy/filters.h>
 #include <haproxy/global.h>
 #include <haproxy/http_ana.h>
@@ -30,23 +35,16 @@
 #include <haproxy/obj_type-t.h>
 #include <haproxy/peers.h>
 #include <haproxy/pool.h>
+#include <haproxy/proto_tcp.h>
 #include <haproxy/proxy.h>
 #include <haproxy/server-t.h>
+#include <haproxy/signal.h>
 #include <haproxy/stats-t.h>
 #include <haproxy/stream.h>
 #include <haproxy/stream_interface.h>
 #include <haproxy/task.h>
 #include <haproxy/time.h>
 
-#include <import/eb32tree.h>
-#include <import/ebistree.h>
-
-#include <haproxy/capture-t.h>
-
-#include <haproxy/fd.h>
-#include <haproxy/proto_tcp.h>
-#include <haproxy/signal.h>
-
 
 int listeners; /* # of proxy listeners, set by cfgparse */
 struct proxy *proxies_list  = NULL;    /* list of all existing proxies */

diff --git a/src/queue.c b/src/queue.c
index 3cc8aeab70cd26be56a69fb224707a01696d7e45..afc2ab8cf027fa76f5a51894f71ecb1a505d0d23 100644 (file)
--- a/src/queue.c
+++ b/src/queue.c
@@ -70,8 +70,8 @@ s *     queue's lock.
  */
 
 #include <import/eb32tree.h>
-#include <haproxy/backend.h>
 #include <haproxy/api.h>
+#include <haproxy/backend.h>
 #include <haproxy/http_rules.h>
 #include <haproxy/pool.h>
 #include <haproxy/queue.h>
@@ -81,8 +81,8 @@ s *     queue's lock.
 #include <haproxy/stream_interface.h>
 #include <haproxy/task.h>
 #include <haproxy/tcp_rules.h>
-#include <haproxy/time.h>
 #include <haproxy/thread.h>
+#include <haproxy/time.h>
 
 
 #define NOW_OFFSET_BOUNDARY()          ((now_ms - (TIMER_LOOK_BACK >> 12)) & 0xfffff)

diff --git a/src/raw_sock.c b/src/raw_sock.c
index 9e7f0c523a97e06d3b4360dd72f3d33cedb60ba8..2d31b185130d5be45685c76870b09a838b8e7700 100644 (file)
--- a/src/raw_sock.c
+++ b/src/raw_sock.c
@@ -19,22 +19,20 @@
 #include <sys/socket.h>
 #include <sys/stat.h>
 #include <sys/types.h>
-
 #include <netinet/tcp.h>
 
 #include <haproxy/api.h>
 #include <haproxy/buf.h>
 #include <haproxy/connection.h>
 #include <haproxy/errors.h>
+#include <haproxy/fd.h>
+#include <haproxy/freq_ctr.h>
 #include <haproxy/global.h>
+#include <haproxy/pipe.h>
 #include <haproxy/stream_interface.h>
-#include <haproxy/tools.h>
 #include <haproxy/ticks.h>
 #include <haproxy/time.h>
-
-#include <haproxy/fd.h>
-#include <haproxy/freq_ctr.h>
-#include <haproxy/pipe.h>
+#include <haproxy/tools.h>
 
 
 #if defined(USE_LINUX_SPLICE)

diff --git a/src/ring.c b/src/ring.c
index 437ee39290fcd87684933831210ad2e592a1aff6..7c7d58edc07c31f3d6133a9085fab20bd44c59e8 100644 (file)
--- a/src/ring.c
+++ b/src/ring.c
@@ -19,13 +19,13 @@
  */
 
 #include <stdlib.h>
-#include <haproxy/applet.h>
 #include <haproxy/api.h>
+#include <haproxy/applet.h>
 #include <haproxy/buf.h>
 #include <haproxy/cli.h>
-#include <haproxy/thread.h>
 #include <haproxy/ring.h>
 #include <haproxy/stream_interface.h>
+#include <haproxy/thread.h>
 
 /* Creates and returns a ring buffer of size <size> bytes. Returns NULL on
  * allocation failure.

diff --git a/src/sample.c b/src/sample.c
index 4ee44cf493799ca624fd3f9ba231627897119d02..faf6471c0fb279bc6bbbcddbb4150e29835b088a 100644 (file)
--- a/src/sample.c
+++ b/src/sample.c
@@ -16,9 +16,13 @@
 #include <arpa/inet.h>
 #include <stdio.h>
 
-#include <haproxy/api.h>
+#include <import/sha1.h>
+#include <import/xxhash.h>
 
+#include <haproxy/api.h>
+#include <haproxy/arg.h>
 #include <haproxy/auth.h>
+#include <haproxy/base64.h>
 #include <haproxy/buf.h>
 #include <haproxy/chunk.h>
 #include <haproxy/errors.h>
@@ -30,17 +34,11 @@
 #include <haproxy/proxy.h>
 #include <haproxy/regex.h>
 #include <haproxy/sample.h>
+#include <haproxy/sink.h>
+#include <haproxy/stick_table.h>
 #include <haproxy/tools.h>
 #include <haproxy/uri_auth-t.h>
 #include <haproxy/vars.h>
-#include <haproxy/base64.h>
-
-#include <haproxy/arg.h>
-#include <haproxy/sink.h>
-#include <haproxy/stick_table.h>
-
-#include <import/sha1.h>
-#include <import/xxhash.h>
 
 /* sample type names */
 const char *smp_to_type[SMP_TYPES] = {

diff --git a/src/server.c b/src/server.c
index a0fd10f7df6de63587f65b1eab91e2fac17ae797..442756985bfd4131f0aa156dd7390f8ab082a3b6 100644 (file)
--- a/src/server.c
+++ b/src/server.c
@@ -11,14 +11,16 @@
  *
  */
 
+#include <netinet/tcp.h>
 #include <ctype.h>
 #include <errno.h>
 
+#include <import/ebsttree.h>
 #include <import/xxhash.h>
 
+#include <haproxy/api.h>
 #include <haproxy/applet-t.h>
 #include <haproxy/backend.h>
-#include <haproxy/api.h>
 #include <haproxy/cfgparse.h>
 #include <haproxy/check.h>
 #include <haproxy/cli.h>
@@ -30,6 +32,8 @@
 #include <haproxy/log.h>
 #include <haproxy/mailers.h>
 #include <haproxy/namespace.h>
+#include <haproxy/port_range.h>
+#include <haproxy/protocol.h>
 #include <haproxy/queue.h>
 #include <haproxy/sample.h>
 #include <haproxy/server.h>
@@ -40,11 +44,6 @@
 #include <haproxy/tcpcheck.h>
 #include <haproxy/time.h>
 
-#include <haproxy/port_range.h>
-#include <haproxy/protocol.h>
-#include <netinet/tcp.h>
-
-#include <import/ebsttree.h>
 
 static void srv_update_status(struct server *s);
 static void srv_update_state(struct server *srv, int version, char **params);

diff --git a/src/sink.c b/src/sink.c
index 8128775da2b977811a1daf3f4ad70f51b15cbf52..a8fd0182149129c028009a4b4632d9a542578ba5 100644 (file)
--- a/src/sink.c
+++ b/src/sink.c
@@ -25,11 +25,11 @@
 #include <haproxy/errors.h>
 #include <haproxy/list.h>
 #include <haproxy/log.h>
-#include <haproxy/time.h>
 #include <haproxy/ring.h>
 #include <haproxy/signal.h>
 #include <haproxy/sink.h>
 #include <haproxy/stream_interface.h>
+#include <haproxy/time.h>
 
 struct list sink_list = LIST_HEAD_INIT(sink_list);
 

diff --git a/src/ssl_ckch.c b/src/ssl_ckch.c
index d2fd4e1811fc014e673b4e85647fd3aa62dc7687..7a92934ac92cacbd09c6de034d6868cff7155410 100644 (file)
--- a/src/ssl_ckch.c
+++ b/src/ssl_ckch.c
@@ -22,6 +22,8 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 
+#include <import/ebsttree.h>
+
 #include <haproxy/base64.h>
 #include <haproxy/channel.h>
 #include <haproxy/cli.h>
@@ -32,8 +34,6 @@
 #include <haproxy/stream_interface.h>
 #include <haproxy/tools.h>
 
-#include <import/ebsttree.h>
-
 /* Uncommitted CKCH transaction */
 
 static struct {

diff --git a/src/ssl_crtlist.c b/src/ssl_crtlist.c
index 8e6a2e42d1215c2676f403e7c00e5eebe5bc121d..266949e59d5ba595e93bace4e58be7214d4a8d16 100644 (file)
--- a/src/ssl_crtlist.c
+++ b/src/ssl_crtlist.c
@@ -8,13 +8,17 @@
  * 2 of the License, or (at your option) any later version.
  *
  */
+#include <sys/stat.h>
+#include <sys/types.h>
 
+#include <dirent.h>
 #include <errno.h>
 #include <stdlib.h>
 #include <string.h>
 #include <syslog.h>
-#include <sys/stat.h>
-#include <sys/types.h>
+
+#include <import/ebpttree.h>
+#include <import/ebsttree.h>
 
 #include <haproxy/channel.h>
 #include <haproxy/cli.h>
@@ -25,9 +29,6 @@
 #include <haproxy/stream_interface.h>
 #include <haproxy/tools.h>
 
-#include <dirent.h>
-#include <import/ebpttree.h>
-#include <import/ebsttree.h>
 
 /* release ssl bind conf */
 void ssl_sock_free_ssl_conf(struct ssl_bind_conf *conf)

diff --git a/src/ssl_sample.c b/src/ssl_sample.c
index 70b35b2af5f6c1580a92666cef9252adac1ecf9f..cc6f53728ab50bd33370858dfbae97aa5c7375cc 100644 (file)
--- a/src/ssl_sample.c
+++ b/src/ssl_sample.c
@@ -22,6 +22,7 @@
 
 #include <haproxy/acl.h>
 #include <haproxy/api.h>
+#include <haproxy/arg.h>
 #include <haproxy/buf-t.h>
 #include <haproxy/obj_type.h>
 #include <haproxy/openssl-compat.h>
@@ -30,8 +31,6 @@
 #include <haproxy/ssl_utils.h>
 #include <haproxy/tools.h>
 
-#include <haproxy/arg.h>
-
 
 /***** Below are some sample fetching functions for ACL/patterns *****/
 

diff --git a/src/ssl_sock.c b/src/ssl_sock.c
index be3cd1645392db4a2e29f310343c146320a84c92..81a862d68cc97966da9dea53b520408d70a1cd40 100644 (file)
--- a/src/ssl_sock.c
+++ b/src/ssl_sock.c
@@ -40,22 +40,29 @@
 #include <netdb.h>
 #include <netinet/tcp.h>
 
-#include <haproxy/api.h>
+#include <import/ebpttree.h>
+#include <import/ebsttree.h>
 #include <import/lru.h>
 #include <import/xxhash.h>
 
-#include <haproxy/dynbuf.h>
+#include <haproxy/api.h>
+#include <haproxy/arg.h>
+#include <haproxy/base64.h>
 #include <haproxy/channel.h>
 #include <haproxy/chunk.h>
 #include <haproxy/cli.h>
 #include <haproxy/connection.h>
+#include <haproxy/dynbuf.h>
 #include <haproxy/errors.h>
+#include <haproxy/fd.h>
+#include <haproxy/freq_ctr.h>
 #include <haproxy/frontend.h>
 #include <haproxy/global.h>
 #include <haproxy/http_rules.h>
 #include <haproxy/log.h>
 #include <haproxy/openssl-compat.h>
 #include <haproxy/pattern-t.h>
+#include <haproxy/proto_tcp.h>
 #include <haproxy/proxy.h>
 #include <haproxy/server.h>
 #include <haproxy/shctx.h>
@@ -67,19 +74,11 @@
 #include <haproxy/stream-t.h>
 #include <haproxy/stream_interface.h>
 #include <haproxy/task.h>
-#include <haproxy/tools.h>
 #include <haproxy/ticks.h>
 #include <haproxy/time.h>
-#include <haproxy/base64.h>
+#include <haproxy/tools.h>
 #include <haproxy/vars.h>
 
-#include <import/ebpttree.h>
-#include <import/ebsttree.h>
-
-#include <haproxy/arg.h>
-#include <haproxy/fd.h>
-#include <haproxy/freq_ctr.h>
-#include <haproxy/proto_tcp.h>
 
 /* ***** READ THIS before adding code here! *****
  *

diff --git a/src/stats.c b/src/stats.c
index bb70884c4e043c92ab710dd10ac606158f569bee..72268742e580767adc4c705f0b8fb3821804d32a 100644 (file)
--- a/src/stats.c
+++ b/src/stats.c
@@ -24,9 +24,10 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 
+#include <haproxy/api.h>
 #include <haproxy/applet-t.h>
 #include <haproxy/backend.h>
-#include <haproxy/api.h>
+#include <haproxy/base64.h>
 #include <haproxy/cfgparse.h>
 #include <haproxy/channel.h>
 #include <haproxy/check.h>
@@ -35,17 +36,20 @@
 #include <haproxy/debug.h>
 #include <haproxy/dns.h>
 #include <haproxy/errors.h>
+#include <haproxy/fd.h>
+#include <haproxy/freq_ctr.h>
 #include <haproxy/frontend.h>
 #include <haproxy/global.h>
 #include <haproxy/http.h>
 #include <haproxy/http_htx.h>
 #include <haproxy/htx.h>
-#include <haproxy/pool.h>
 #include <haproxy/list.h>
-#include <haproxy/log.h>
 #include <haproxy/listener.h>
+#include <haproxy/log.h>
 #include <haproxy/map-t.h>
 #include <haproxy/pattern-t.h>
+#include <haproxy/pipe.h>
+#include <haproxy/pool.h>
 #include <haproxy/proxy.h>
 #include <haproxy/server.h>
 #include <haproxy/session.h>
@@ -54,16 +58,12 @@
 #include <haproxy/stream.h>
 #include <haproxy/stream_interface.h>
 #include <haproxy/task.h>
-#include <haproxy/tools.h>
 #include <haproxy/ticks.h>
 #include <haproxy/time.h>
+#include <haproxy/tools.h>
 #include <haproxy/uri_auth-t.h>
 #include <haproxy/version.h>
-#include <haproxy/base64.h>
 
-#include <haproxy/fd.h>
-#include <haproxy/freq_ctr.h>
-#include <haproxy/pipe.h>
 
 /* status codes available for the stats admin page (strictly 4 chars length) */
 const char *stat_status_codes[STAT_STATUS_SIZE] = {

diff --git a/src/stick_table.c b/src/stick_table.c
index c5ddd0beb25b43f76d0add24143194712df896ff..3ddb6685c6faf3e7f58ce67de4b31b8f586a1cfe 100644 (file)
--- a/src/stick_table.c
+++ b/src/stick_table.c
@@ -14,34 +14,34 @@
 #include <string.h>
 #include <errno.h>
 
+#include <import/ebmbtree.h>
+#include <import/ebsttree.h>
+#include <import/ebistree.h>
+
 #include <haproxy/api.h>
+#include <haproxy/arg.h>
 #include <haproxy/cfgparse.h>
 #include <haproxy/cli.h>
 #include <haproxy/errors.h>
 #include <haproxy/global.h>
 #include <haproxy/http_rules.h>
-#include <haproxy/pool.h>
 #include <haproxy/list.h>
 #include <haproxy/log.h>
 #include <haproxy/net_helper.h>
 #include <haproxy/peers.h>
+#include <haproxy/pool.h>
+#include <haproxy/proto_tcp.h>
 #include <haproxy/proxy.h>
+#include <haproxy/sample.h>
 #include <haproxy/stats-t.h>
+#include <haproxy/stick_table.h>
 #include <haproxy/stream.h>
 #include <haproxy/stream_interface.h>
 #include <haproxy/task.h>
 #include <haproxy/tcp_rules.h>
-#include <haproxy/tools.h>
 #include <haproxy/time.h>
+#include <haproxy/tools.h>
 
-#include <import/ebmbtree.h>
-#include <import/ebsttree.h>
-#include <import/ebistree.h>
-
-#include <haproxy/arg.h>
-#include <haproxy/proto_tcp.h>
-#include <haproxy/sample.h>
-#include <haproxy/stick_table.h>
 
 /* structure used to return a table key built from a sample */
 static THREAD_LOCAL struct stktable_key static_table_key;

diff --git a/src/stream.c b/src/stream.c
index 09f6f192ae6f6db4086280f1fd7b17b0c1ba0ce8..0c02cfba931e39dc76e2357af663f1dbe6defa04 100644 (file)
--- a/src/stream.c
+++ b/src/stream.c
@@ -18,9 +18,11 @@
 
 #include <haproxy/acl.h>
 #include <haproxy/action.h>
+#include <haproxy/activity.h>
+#include <haproxy/api.h>
 #include <haproxy/applet.h>
+#include <haproxy/arg.h>
 #include <haproxy/backend.h>
-#include <haproxy/api.h>
 #include <haproxy/capture.h>
 #include <haproxy/cfgparse.h>
 #include <haproxy/channel.h>
@@ -30,35 +32,33 @@
 #include <haproxy/dict.h>
 #include <haproxy/dns.h>
 #include <haproxy/dynbuf.h>
+#include <haproxy/fd.h>
 #include <haproxy/filters.h>
+#include <haproxy/freq_ctr.h>
 #include <haproxy/frontend.h>
 #include <haproxy/global.h>
 #include <haproxy/hlua.h>
 #include <haproxy/http_ana.h>
 #include <haproxy/http_rules.h>
-#include <haproxy/istbuf.h>
-#include <haproxy/thread.h>
 #include <haproxy/htx.h>
+#include <haproxy/istbuf.h>
 #include <haproxy/log.h>
+#include <haproxy/pipe.h>
 #include <haproxy/pool.h>
 #include <haproxy/proxy.h>
 #include <haproxy/queue.h>
 #include <haproxy/server.h>
 #include <haproxy/session.h>
 #include <haproxy/stats-t.h>
+#include <haproxy/stick_table.h>
 #include <haproxy/stream.h>
 #include <haproxy/stream_interface.h>
 #include <haproxy/task.h>
 #include <haproxy/tcp_rules.h>
+#include <haproxy/thread.h>
 #include <haproxy/trace.h>
 #include <haproxy/vars.h>
 
-#include <haproxy/activity.h>
-#include <haproxy/arg.h>
-#include <haproxy/fd.h>
-#include <haproxy/freq_ctr.h>
-#include <haproxy/pipe.h>
-#include <haproxy/stick_table.h>
 
 DECLARE_POOL(pool_head_stream, "stream", sizeof(struct stream));
 DECLARE_POOL(pool_head_uniqueid, "uniqueid", UNIQUEID_LEN);

diff --git a/src/stream_interface.c b/src/stream_interface.c
index 1d6cf5155720c1400063d8a27682499a5d798fe0..ef2fc0bee93aa62e72d9298115306a29b4557374 100644 (file)
--- a/src/stream_interface.c
+++ b/src/stream_interface.c
@@ -19,23 +19,22 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 
-#include <haproxy/applet.h>
 #include <haproxy/api.h>
+#include <haproxy/applet.h>
 #include <haproxy/channel.h>
 #include <haproxy/connection.h>
 #include <haproxy/dynbuf.h>
 #include <haproxy/http_htx.h>
+#include <haproxy/pipe-t.h>
+#include <haproxy/pipe.h>
 #include <haproxy/proxy.h>
 #include <haproxy/stream-t.h>
 #include <haproxy/stream_interface.h>
-#include <haproxy/tools.h>
+#include <haproxy/task.h>
 #include <haproxy/ticks.h>
 #include <haproxy/time.h>
-#include <haproxy/task.h>
-
-#include <haproxy/pipe.h>
+#include <haproxy/tools.h>
 
-#include <haproxy/pipe-t.h>
 
 /* functions used by default on a detached stream-interface */
 static void stream_int_shutr(struct stream_interface *si);

diff --git a/src/task.c b/src/task.c
index bcf18b239e494de07252bdee48917c23c9be46eb..3d615622e7f7d9d6ffdcf8a22fab22f250dfdc55 100644 (file)
--- a/src/task.c
+++ b/src/task.c
@@ -12,18 +12,19 @@
 
 #include <string.h>
 
+#include <import/eb32sctree.h>
+#include <import/eb32tree.h>
+
 #include <haproxy/api.h>
-#include <haproxy/pool.h>
+#include <haproxy/fd.h>
+#include <haproxy/freq_ctr.h>
 #include <haproxy/list.h>
+#include <haproxy/pool.h>
 #include <haproxy/stream.h>
 #include <haproxy/task.h>
-#include <haproxy/tools.h>
 #include <haproxy/time.h>
-#include <import/eb32sctree.h>
-#include <import/eb32tree.h>
+#include <haproxy/tools.h>
 
-#include <haproxy/fd.h>
-#include <haproxy/freq_ctr.h>
 
 DECLARE_POOL(pool_head_task,    "task",    sizeof(struct task));
 DECLARE_POOL(pool_head_tasklet, "tasklet", sizeof(struct tasklet));

diff --git a/src/tcp_rules.c b/src/tcp_rules.c
index 5f8c74dd5fed564fcbda71de9ee97aae37270838..703bd4fbbc89842ec7b62643259ebc52bdc54174 100644 (file)
--- a/src/tcp_rules.c
+++ b/src/tcp_rules.c
@@ -11,8 +11,8 @@
  */
 #include <haproxy/acl.h>
 #include <haproxy/action.h>
-#include <haproxy/arg-t.h>
 #include <haproxy/api.h>
+#include <haproxy/arg-t.h>
 #include <haproxy/capture-t.h>
 #include <haproxy/cfgparse.h>
 #include <haproxy/channel.h>
@@ -26,9 +26,9 @@
 #include <haproxy/stream-t.h>
 #include <haproxy/stream_interface.h>
 #include <haproxy/tcp_rules.h>
-#include <haproxy/tools.h>
 #include <haproxy/ticks.h>
 #include <haproxy/time.h>
+#include <haproxy/tools.h>
 #include <haproxy/trace.h>
 
 

diff --git a/src/tcpcheck.c b/src/tcpcheck.c
index 8808a0cd66c1c7e4f0a9b676de970cd867de990b..2b7c0c5def83ad984f1c674f06cb64e2dc03d726 100644 (file)
--- a/src/tcpcheck.c
+++ b/src/tcpcheck.c
@@ -48,16 +48,16 @@
 #include <haproxy/istbuf.h>
 #include <haproxy/list.h>
 #include <haproxy/log.h>
-#include <haproxy/regex.h>
-#include <haproxy/tools.h>
-#include <haproxy/time.h>
 #include <haproxy/protocol.h>
 #include <haproxy/proxy-t.h>
+#include <haproxy/regex.h>
+#include <haproxy/sample.h>
 #include <haproxy/server.h>
 #include <haproxy/ssl_sock.h>
-#include <haproxy/sample.h>
 #include <haproxy/task.h>
 #include <haproxy/tcpcheck.h>
+#include <haproxy/time.h>
+#include <haproxy/tools.h>
 #include <haproxy/vars.h>
 
 

diff --git a/src/thread.c b/src/thread.c
index c58669f4a39c56d5db6aead5cc1606000cc499b7..3ec8d8c3ea47eb13741983460db57c20a4eedd4a 100644 (file)
--- a/src/thread.c
+++ b/src/thread.c
@@ -24,10 +24,10 @@
 #endif
 
 #include <haproxy/cfgparse.h>
+#include <haproxy/fd.h>
+#include <haproxy/global.h>
 #include <haproxy/thread.h>
 #include <haproxy/tools.h>
-#include <haproxy/global.h>
-#include <haproxy/fd.h>
 
 struct thread_info ha_thread_info[MAX_THREADS] = { };
 THREAD_LOCAL struct thread_info *ti = &ha_thread_info[0];

diff --git a/src/time.c b/src/time.c
index 9c99fd53099c48bd6e4b05500df1a8ac978a825c..a586e49c37011f21f5370bc51cf3b7f4ab3c5079 100644 (file)
--- a/src/time.c
+++ b/src/time.c
@@ -14,8 +14,8 @@
 #include <sys/time.h>
 
 #include <haproxy/api.h>
-#include <haproxy/tools.h>
 #include <haproxy/time.h>
+#include <haproxy/tools.h>
 
 THREAD_LOCAL unsigned int   ms_left_scaled;  /* milliseconds left for current second (0..2^32-1) */
 THREAD_LOCAL unsigned int   now_ms;          /* internal date in milliseconds (may wrap) */

diff --git a/src/tools.c b/src/tools.c
index 52522cb3e3c2a85ac00063428b48208926e7baeb..0b7e77e7550e7ec8bd940a02d04a539dcab03cba 100644 (file)
--- a/src/tools.c
+++ b/src/tools.c
@@ -36,8 +36,8 @@
 #include <netinet/in.h>
 #include <arpa/inet.h>
 
-#include <import/eb32tree.h>
 #include <import/eb32sctree.h>
+#include <import/eb32tree.h>
 
 #include <haproxy/api.h>
 #include <haproxy/chunk.h>
@@ -46,11 +46,11 @@
 #include <haproxy/hlua.h>
 #include <haproxy/listener.h>
 #include <haproxy/namespace.h>
+#include <haproxy/proto_udp.h>
 #include <haproxy/ssl_sock.h>
 #include <haproxy/stream_interface.h>
 #include <haproxy/task.h>
 #include <haproxy/tools.h>
-#include <haproxy/proto_udp.h>
 
 /* This macro returns false if the test __x is false. Many
  * of the following parsing function must be abort the processing

diff --git a/src/vars.c b/src/vars.c
index 9ba1720e46f1433661eefab40bd32ef4fe07ae51..b154c529d30e0750c33604630364fa7fbe4997a5 100644 (file)
--- a/src/vars.c
+++ b/src/vars.c
@@ -1,7 +1,7 @@
 #include <ctype.h>
 
-#include <haproxy/arg.h>
 #include <haproxy/api.h>
+#include <haproxy/arg.h>
 #include <haproxy/cfgparse.h>
 #include <haproxy/check.h>
 #include <haproxy/global.h>
@@ -11,8 +11,8 @@
 #include <haproxy/log.h>
 #include <haproxy/sample.h>
 #include <haproxy/stream-t.h>
-#include <haproxy/tcpcheck.h>
 #include <haproxy/tcp_rules.h>
+#include <haproxy/tcpcheck.h>
 #include <haproxy/vars.h>
 
 

diff --git a/src/wurfl.c b/src/wurfl.c
index 9a1d858b2d785b06ee7f61b93bdc5effb44de0ec..06029aacbf3b8378b2779717bb5718e130d3580c 100644 (file)
--- a/src/wurfl.c
+++ b/src/wurfl.c
@@ -2,6 +2,7 @@
 #include <stdarg.h>
 
 #include <haproxy/api.h>
+#include <haproxy/arg.h>
 #include <haproxy/buf-t.h>
 #include <haproxy/cfgparse.h>
 #include <haproxy/chunk.h>
@@ -11,10 +12,9 @@
 #include <haproxy/http_fetch.h>
 #include <haproxy/http_htx.h>
 #include <haproxy/log.h>
-#include <haproxy/arg.h>
 #include <haproxy/sample.h>
-#include <import/ebsttree.h>
 #include <import/ebmbtree.h>
+#include <import/ebsttree.h>
 
 #include <wurfl/wurfl.h>