REORG: include: move the error reporting functions to from log.h to errors.h

Most of the files dealing with error reports have to include log.h in order
to access ha_alert(), ha_warning() etc. But while these functions don't
depend on anything, log.h depends on a lot of stuff because it deals with
log-formats and samples. As a result it's impossible not to embark long
dependencies when using ha_warning() or qfprintf().

This patch moves these low-level functions to errors.h, which already
defines the error codes used at the same places. About half of the users
of log.h could be adjusted, sometimes revealing other issues such as
missing tools.h. Interestingly the total preprocessed size shrunk by
4%.

diff --git a/contrib/modsecurity/modsec_wrapper.c b/contrib/modsecurity/modsec_wrapper.c
index 17fe461edf7a59337e6bf7b86d116315a8ac79ff..3a55ab2bbba6afd5ab0ccc55ecc15d65288f593c 100644 (file)
--- a/contrib/modsecurity/modsec_wrapper.c
+++ b/contrib/modsecurity/modsec_wrapper.c
@@ -17,9 +17,9 @@
 #include <stdarg.h>
 
 #include <haproxy/arg.h>
+#include <haproxy/errors.h>
 #include <haproxy/global.h>
 #include <haproxy/hlua.h>
-#include <haproxy/log.h>
 #include <haproxy/spoe.h>
 #include <haproxy/stream-t.h>
 #include <haproxy/time.h>

diff --git a/contrib/prometheus-exporter/service-prometheus.c b/contrib/prometheus-exporter/service-prometheus.c
index 9375f0a31cda93d4d68c6a818d6975b576588f35..761569847395f43bf36e957a17d575f948e5d28f 100644 (file)
--- a/contrib/prometheus-exporter/service-prometheus.c
+++ b/contrib/prometheus-exporter/service-prometheus.c
@@ -23,9 +23,10 @@
 #include <haproxy/http.h>
 #include <haproxy/http_htx.h>
 #include <haproxy/htx.h>
+#include <haproxy/list.h>
 #include <haproxy/listener.h>
+#include <haproxy/log.h>
 #include <haproxy/pool.h>
-#include <haproxy/list.h>
 
 #include <haproxy/compression.h>
 #include <haproxy/pipe.h>

diff --git a/include/haproxy/cfgparse.h b/include/haproxy/cfgparse.h
index 447c057b93e6cc155f9b9be5ba2ecaf583811001..646384e31841aaf45ecc31e575dab10bdab15892 100644 (file)
--- a/include/haproxy/cfgparse.h
+++ b/include/haproxy/cfgparse.h
@@ -23,8 +23,8 @@
 #define _HAPROXY_CFGPARSE_H
 
 #include <haproxy/api.h>
+#include <haproxy/errors.h>
 #include <haproxy/list-t.h>
-#include <haproxy/log.h>
 #include <haproxy/proxy.h>
 
 /* configuration sections */

diff --git a/include/haproxy/errors.h b/include/haproxy/errors.h
index 6277701deca6c90b0f694ca83727c5bed4f86923..521876f74ed1fb400c86c1153985debb40638e95 100644 (file)
--- a/include/haproxy/errors.h
+++ b/include/haproxy/errors.h
@@ -22,6 +22,8 @@
 #ifndef _HAPROXY_ERRORS_H
 #define _HAPROXY_ERRORS_H
 
+#include <stdio.h>
+
 /* These flags may be used in various functions which are called from within
  * loops (eg: to start all listeners from all proxies). They provide enough
  * information to let the caller decide what to do. ERR_WARN and ERR_ALERT
@@ -56,6 +58,34 @@ enum {
        PE_ARG_NOT_FOUND, /* argument references something not found */
 };
 
+
+/************ Error reporting functions from log.c ***********/
+
+/*
+ * Displays the message on stderr with the date and pid. Overrides the quiet
+ * mode during startup.
+ */
+void ha_alert(const char *fmt, ...)
+       __attribute__ ((format(printf, 1, 2)));
+
+/*
+ * Displays the message on stderr with the date and pid.
+ */
+void ha_warning(const char *fmt, ...)
+       __attribute__ ((format(printf, 1, 2)));
+
+/*
+ * Displays the message on stderr with the date and pid.
+ */
+void ha_notice(const char *fmt, ...)
+       __attribute__ ((format(printf, 1, 2)));
+
+/*
+ * Displays the message on <out> only if quiet mode is not set.
+ */
+void qfprintf(FILE *out, const char *fmt, ...)
+       __attribute__ ((format(printf, 2, 3)));
+
 #endif /* _HAPROXY_ERRORS_H */
 
 /*

diff --git a/include/haproxy/log.h b/include/haproxy/log.h
index 8eab64faaabe69d0b0f2c817927936dcd0acde90..5346ce467a86c456bfd311b67812a29f8259b752 100644 (file)
--- a/include/haproxy/log.h
+++ b/include/haproxy/log.h
@@ -83,31 +83,6 @@ int parse_logformat_string(const char *str, struct proxy *curproxy, struct list
 /* Parse "log" keyword and update the linked list. */
 int parse_logsrv(char **args, struct list *logsrvs, int do_del, char **err);
 
-/*
- * Displays the message on stderr with the date and pid. Overrides the quiet
- * mode during startup.
- */
-void ha_alert(const char *fmt, ...)
-       __attribute__ ((format(printf, 1, 2)));
-
-/*
- * Displays the message on stderr with the date and pid.
- */
-void ha_warning(const char *fmt, ...)
-       __attribute__ ((format(printf, 1, 2)));
-
-/*
- * Displays the message on stderr with the date and pid.
- */
-void ha_notice(const char *fmt, ...)
-       __attribute__ ((format(printf, 1, 2)));
-
-/*
- * Displays the message on <out> only if quiet mode is not set.
- */
-void qfprintf(FILE *out, const char *fmt, ...)
-       __attribute__ ((format(printf, 2, 3)));
-
 /*
  * This function adds a header to the message and sends the syslog message
  * using a printf format string

diff --git a/src/51d.c b/src/51d.c
index 68195cd293022200e5407a4a099157bed8e70a93..54e9a1ea0bb38f42208d8bb6a2c74cc1050353e9 100644 (file)
--- a/src/51d.c
+++ b/src/51d.c
@@ -8,11 +8,11 @@
 #include <haproxy/http_ana.h>
 #include <haproxy/http_fetch.h>
 #include <haproxy/http_htx.h>
-#include <haproxy/log.h>
 #include <haproxy/thread.h>
 #include <haproxy/global.h>
 #include <haproxy/arg.h>
 #include <haproxy/sample.h>
+#include <haproxy/tools.h>
 #include <import/xxhash.h>
 #include <import/lru.h>
 #include <51Degrees.h>

diff --git a/src/acl.c b/src/acl.c
index 77440edbedfd87e33d3429c28f1ceda32dc1de61..b1409bd55e415fa558cc03fba3add63b2b278aa8 100644 (file)
--- a/src/acl.c
+++ b/src/acl.c
@@ -17,8 +17,8 @@
 #include <haproxy/acl.h>
 #include <haproxy/auth.h>
 #include <haproxy/api.h>
+#include <haproxy/errors.h>
 #include <haproxy/list.h>
-#include <haproxy/log.h>
 #include <haproxy/pattern.h>
 #include <haproxy/proxy-t.h>
 #include <haproxy/tools.h>

diff --git a/src/action.c b/src/action.c
index d715379baf445e4378cc32b073d0ba2560bf6cce..16e96dd26e1e482daad34ca64c303514993f37b3 100644 (file)
--- a/src/action.c
+++ b/src/action.c
@@ -12,10 +12,10 @@
 
 #include <haproxy/action.h>
 #include <haproxy/api.h>
+#include <haproxy/errors.h>
 #include <haproxy/obj_type.h>
 #include <haproxy/pool.h>
 #include <haproxy/list.h>
-#include <haproxy/log.h>
 #include <haproxy/proxy.h>
 #include <haproxy/task.h>
 #include <haproxy/tools.h>

diff --git a/src/auth.c b/src/auth.c
index 646c0109eb8f07e336eae7368d3d8edc377762a2..a84e89167e22670e8b7fb9fbfc100fa9cdbfa0f4 100644 (file)
--- a/src/auth.c
+++ b/src/auth.c
@@ -29,8 +29,8 @@
 #include <haproxy/api.h>
 #include <haproxy/global.h>
 #include <haproxy/errors.h>
-#include <haproxy/log.h>
 #include <haproxy/pattern-t.h>
+#include <haproxy/sample-t.h>
 #include <haproxy/thread.h>
 
 struct userlist *userlist = NULL;    /* list of all existing userlists */

diff --git a/src/cache.c b/src/cache.c
index 56368f3cc1552cd40534c06b186acfc479bd317f..6e8d8d2fb6357d21a030889b4d0108f226ae423b 100644 (file)
--- a/src/cache.c
+++ b/src/cache.c
@@ -15,11 +15,11 @@
 #include <haproxy/cfgparse.h>
 #include <haproxy/channel.h>
 #include <haproxy/cli.h>
+#include <haproxy/errors.h>
 #include <haproxy/filters.h>
 #include <haproxy/http_ana.h>
 #include <haproxy/http_htx.h>
 #include <haproxy/http_rules.h>
-#include <haproxy/log.h>
 #include <haproxy/proxy.h>
 #include <haproxy/shctx.h>
 #include <haproxy/stream.h>

diff --git a/src/cfgparse-global.c b/src/cfgparse-global.c
index d6d7243089914606e382ab174e0db77f050ca091..a4fed04464827db40c9214171d6e2556c0d09480 100644 (file)
--- a/src/cfgparse-global.c
+++ b/src/cfgparse-global.c
@@ -14,6 +14,8 @@
 #include <haproxy/cfgparse.h>
 #include <haproxy/compression.h>
 #include <haproxy/global.h>
+#include <haproxy/log.h>
+#include <haproxy/tools.h>
 
 /*
  * parse a line in a <global> section. Returns the error code, 0 if OK, or

diff --git a/src/cfgparse-listen.c b/src/cfgparse-listen.c
index f0c52a8e6ac09512b7a17e71c4f4be35d180d726..45ac8c3e17a330dd0d20c1fc1c98d97de33192bf 100644 (file)
--- a/src/cfgparse-listen.c
+++ b/src/cfgparse-listen.c
@@ -23,6 +23,7 @@
 #include <haproxy/http_htx.h>
 #include <haproxy/http_rules.h>
 #include <haproxy/listener.h>
+#include <haproxy/log.h>
 #include <haproxy/peers.h>
 #include <haproxy/proxy.h>
 #include <haproxy/sample.h>

diff --git a/src/cli.c b/src/cli.c
index b6249ddeea7936a6f68d4c13d1c97174a81bd9bf..6ca0a1fdd4b504d0aae32ccb0dc496f156588a28 100644 (file)
--- a/src/cli.c
+++ b/src/cli.c
@@ -33,6 +33,7 @@
 #include <haproxy/check.h>
 #include <haproxy/cli.h>
 #include <haproxy/dns-t.h>
+#include <haproxy/errors.h>
 #include <haproxy/frontend.h>
 #include <haproxy/list.h>
 #include <haproxy/listener.h>

diff --git a/src/connection.c b/src/connection.c
index e27ba74387e88fd8a40964bc56c5d4e288a9a5bb..f9741ef5545b55d586c2e6f0ad57152cb3f1a0cb 100644 (file)
--- a/src/connection.c
+++ b/src/connection.c
@@ -16,6 +16,7 @@
 #include <haproxy/cfgparse.h>
 #include <haproxy/connection.h>
 #include <haproxy/frontend.h>
+#include <haproxy/log-t.h>
 #include <haproxy/namespace.h>
 #include <haproxy/hash.h>
 #include <haproxy/net_helper.h>

diff --git a/src/da.c b/src/da.c
index a47fc300eff76d10cef11e252f747f01a3e08202..9b12cc5a39d4627beec68934aaca755d6630e2bf 100644 (file)
--- a/src/da.c
+++ b/src/da.c
@@ -8,10 +8,10 @@
 #include <haproxy/http_fetch.h>
 #include <haproxy/http_htx.h>
 #include <haproxy/htx.h>
-#include <haproxy/log.h>
 #include <haproxy/global.h>
 #include <haproxy/arg.h>
 #include <haproxy/sample.h>
+#include <haproxy/tools.h>
 #include <dac.h>
 
 static struct {

diff --git a/src/extcheck.c b/src/extcheck.c
index 2a577b165481428f1acb774d9fe96d6533fcdd4d..721e49d42cd9ad62d22b31ee222c20798b2b3d04 100644 (file)
--- a/src/extcheck.c
+++ b/src/extcheck.c
@@ -30,9 +30,9 @@
 #include <haproxy/api.h>
 #include <haproxy/cfgparse.h>
 #include <haproxy/check.h>
+#include <haproxy/errors.h>
 #include <haproxy/global.h>
 #include <haproxy/list.h>
-#include <haproxy/log.h>
 #include <haproxy/proxy.h>
 #include <haproxy/server.h>
 #include <haproxy/signal.h>

diff --git a/src/flt_trace.c b/src/flt_trace.c
index b0e448a366f97ea4cee4ac6c43b30bc41eb1e169..910f5c486165a052cbbbfeca733f345b12d28e69 100644 (file)
--- a/src/flt_trace.c
+++ b/src/flt_trace.c
@@ -14,12 +14,12 @@
 
 #include <haproxy/api.h>
 #include <haproxy/channel-t.h>
+#include <haproxy/errors.h>
 #include <haproxy/filters.h>
 #include <haproxy/global.h>
 #include <haproxy/http_ana-t.h>
 #include <haproxy/http_htx.h>
 #include <haproxy/htx.h>
-#include <haproxy/log.h>
 #include <haproxy/proxy-t.h>
 #include <haproxy/stream.h>
 #include <haproxy/tools.h>

diff --git a/src/h1_htx.c b/src/h1_htx.c
index e32d845296bb18e0ecb113ba1217301d4827740c..9388680b4f98efbdaab08bb5513d4257ce98eae2 100644 (file)
--- a/src/h1_htx.c
+++ b/src/h1_htx.c
@@ -17,6 +17,7 @@
 #include <haproxy/h1_htx.h>
 #include <haproxy/http.h>
 #include <haproxy/htx.h>
+#include <haproxy/tools.h>
 
 /* Estimate the size of the HTX headers after the parsing, including the EOH. */
 static size_t h1_eval_htx_hdrs_size(const struct http_hdr *hdrs)

diff --git a/src/hlua.c b/src/hlua.c
index fd5ba062eab2054b6685245f9300312cb32ad728..f2d471de696ce1f369dec5b3438142ca59bcf6f6 100644 (file)
--- a/src/hlua.c
+++ b/src/hlua.c
@@ -40,6 +40,7 @@
 #include <haproxy/http_ana.h>
 #include <haproxy/http_fetch.h>
 #include <haproxy/http_rules.h>
+#include <haproxy/log.h>
 #include <haproxy/map.h>
 #include <haproxy/obj_type.h>
 #include <haproxy/pattern.h>

diff --git a/src/hlua_fcn.c b/src/hlua_fcn.c
index cfcbcead9076c4bcf82f042de4df5f3bb4964833..78b9495cc37879b38b16be6bf7c49fab086f069c 100644 (file)
--- a/src/hlua_fcn.c
+++ b/src/hlua_fcn.c
@@ -19,9 +19,9 @@
 #include <lualib.h>
 
 #include <haproxy/cli-t.h>
+#include <haproxy/errors.h>
 #include <haproxy/hlua-t.h>
 #include <haproxy/http.h>
-#include <haproxy/log.h>
 #include <haproxy/net_helper.h>
 #include <haproxy/pattern-t.h>
 #include <haproxy/proxy.h>

diff --git a/src/http_act.c b/src/http_act.c
index f83b32bfe309fcc6e154e824f5027727f6bd2476..9db12de7b7cc508e489462486991f9195fbd8400 100644 (file)
--- a/src/http_act.c
+++ b/src/http_act.c
@@ -26,6 +26,7 @@
 #include <haproxy/http_ana.h>
 #include <haproxy/http_htx.h>
 #include <haproxy/http_rules.h>
+#include <haproxy/log.h>
 #include <haproxy/pattern.h>
 #include <haproxy/pool.h>
 #include <haproxy/regex.h>

diff --git a/src/http_ana.c b/src/http_ana.c
index c4973e8ed58f6932bf06ef69e67cefece8ae4a96..a95f07928ff919c6d8ddfb7d0c42a3d51fe93b0a 100644 (file)
--- a/src/http_ana.c
+++ b/src/http_ana.c
@@ -19,6 +19,7 @@
 #include <haproxy/channel.h>
 #include <haproxy/check.h>
 #include <haproxy/connection.h>
+#include <haproxy/errors.h>
 #include <haproxy/filters.h>
 #include <haproxy/http.h>
 #include <haproxy/http_ana.h>

diff --git a/src/http_htx.c b/src/http_htx.c
index e3e21d772b810812c0a1d5eea4aa69962b37b129..8b615627a1445cf1b7fe71015895e541149b12d8 100644 (file)
--- a/src/http_htx.c
+++ b/src/http_htx.c
@@ -17,6 +17,7 @@
 #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>
 

diff --git a/src/http_rules.c b/src/http_rules.c
index d2bb4f29dd548acd73f2d4d4a9ccdad181a90bab..79aa39c4c3ca29fb5ea21623dfc9c690f75a3755 100644 (file)
--- a/src/http_rules.c
+++ b/src/http_rules.c
@@ -24,6 +24,7 @@
 #include <haproxy/global.h>
 #include <haproxy/http.h>
 #include <haproxy/http_rules.h>
+#include <haproxy/log.h>
 #include <haproxy/pool.h>
 #include <haproxy/tools.h>
 #include <haproxy/version.h>

diff --git a/src/mailers.c b/src/mailers.c
index 16ee60a2873cdf717a65755a1964b2e793edd00d..94ed5b4fa234d22d259403d5b6c392bbd120eb1e 100644 (file)
--- a/src/mailers.c
+++ b/src/mailers.c
@@ -16,13 +16,13 @@
 #include <haproxy/action-t.h>
 #include <haproxy/api.h>
 #include <haproxy/check.h>
+#include <haproxy/errors.h>
 #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/log.h>
 #include <haproxy/proxy-t.h>
 #include <haproxy/server-t.h>
 #include <haproxy/task.h>

diff --git a/src/mux_fcgi.c b/src/mux_fcgi.c
index b03210f7ae736d7f2a0411c0c287e89c746732b1..03e5b9c87208387e0167c41ac999946c2e010d80 100644 (file)
--- a/src/mux_fcgi.c
+++ b/src/mux_fcgi.c
@@ -13,6 +13,7 @@
 #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/h1.h>

diff --git a/src/mux_h2.c b/src/mux_h2.c
index 102e74ee721e89e63b34bb7ff0ac6c013b15b894..1a318110d91537d97368552162ebaa2f3cb84b34 100644 (file)
--- a/src/mux_h2.c
+++ b/src/mux_h2.c
@@ -22,6 +22,7 @@
 #include <haproxy/hpack-tbl.h>
 #include <haproxy/http_htx.h>
 #include <haproxy/htx.h>
+#include <haproxy/log.h>
 #include <haproxy/net_helper.h>
 #include <haproxy/session-t.h>
 #include <haproxy/stream.h>

diff --git a/src/mworker-prog.c b/src/mworker-prog.c
index d0b9446e6b0dd8a2233d4e2993724e6c6a6f7c47..e77317f4488153917d84913261b5dd4c88f7272d 100644 (file)
--- a/src/mworker-prog.c
+++ b/src/mworker-prog.c
@@ -24,7 +24,6 @@
 #include <haproxy/cfgparse.h>
 #include <haproxy/errors.h>
 #include <haproxy/global.h>
-#include <haproxy/log.h>
 #include <haproxy/mworker.h>
 #include <haproxy/task.h>
 

diff --git a/src/mworker.c b/src/mworker.c
index e2b154e5d37d16699df7e2fc2c4155b0d1a08b9c..14c0e5717113d5e3362d00ed942efdefcd1b0ded 100644 (file)
--- a/src/mworker.c
+++ b/src/mworker.c
@@ -20,11 +20,11 @@
 #include <haproxy/api.h>
 #include <haproxy/cfgparse.h>
 #include <haproxy/cli.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/mworker.h>
 #include <haproxy/peers.h>
 #include <haproxy/proxy-t.h>

diff --git a/src/namespace.c b/src/namespace.c
index 59d03c2b4da9bd370b61aad026c625d8e95a65d2..1fc843906b827aad31b47c00649180c847b93636 100644 (file)
--- a/src/namespace.c
+++ b/src/namespace.c
@@ -11,10 +11,10 @@
 #include <string.h>
 
 #include <haproxy/api.h>
+#include <haproxy/chunk.h>
 #include <haproxy/errors.h>
 #include <haproxy/global.h>
 #include <haproxy/hash.h>
-#include <haproxy/log.h>
 #include <haproxy/namespace.h>
 #include <haproxy/signal.h>
 

diff --git a/src/peers.c b/src/peers.c
index dca5619a60bf8aa14e256ce4ad7dc3acd16810f6..fa444a901b92e710cf7c8544e19f6e378d53d6e8 100644 (file)
--- a/src/peers.c
+++ b/src/peers.c
@@ -25,9 +25,9 @@
 #include <haproxy/channel.h>
 #include <haproxy/cli.h>
 #include <haproxy/dict.h>
+#include <haproxy/errors.h>
 #include <haproxy/fd.h>
 #include <haproxy/frontend.h>
-#include <haproxy/log.h>
 #include <haproxy/net_helper.h>
 #include <haproxy/obj_type-t.h>
 #include <haproxy/peers.h>

diff --git a/src/pool.c b/src/pool.c
index 82ca79a743cc364d62410f840a179db097b449e3..c1850697b626969e28c88e7f48326c0bf670c011 100644 (file)
--- a/src/pool.c
+++ b/src/pool.c
@@ -16,12 +16,12 @@
 #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/log.h>
 #include <haproxy/stats-t.h>
 #include <haproxy/stream_interface.h>
 #include <haproxy/tools.h>

diff --git a/src/proto_sockpair.c b/src/proto_sockpair.c
index c72c6ac20cb4b7a56f319c8fd1c3c84ed45c00aa..7d5a5078e2d8b94334d5e331736325cace0f5cb9 100644 (file)
--- a/src/proto_sockpair.c
+++ b/src/proto_sockpair.c
@@ -32,7 +32,6 @@
 #include <haproxy/global.h>
 #include <haproxy/list.h>
 #include <haproxy/listener.h>
-#include <haproxy/log.h>
 #include <haproxy/tools.h>
 #include <haproxy/time.h>
 #include <haproxy/version.h>

diff --git a/src/raw_sock.c b/src/raw_sock.c
index 099f50341e76fbe73641801ae4e0b9837b544c9b..9e7f0c523a97e06d3b4360dd72f3d33cedb60ba8 100644 (file)
--- a/src/raw_sock.c
+++ b/src/raw_sock.c
@@ -25,8 +25,8 @@
 #include <haproxy/api.h>
 #include <haproxy/buf.h>
 #include <haproxy/connection.h>
+#include <haproxy/errors.h>
 #include <haproxy/global.h>
-#include <haproxy/log.h>
 #include <haproxy/stream_interface.h>
 #include <haproxy/tools.h>
 #include <haproxy/ticks.h>

diff --git a/src/regex.c b/src/regex.c
index 1c3c55f404334a31fcaea9d1b17ee6fa8d53b51b..e23e311521cc38ec47b51f455157bb67114be226 100644 (file)
--- a/src/regex.c
+++ b/src/regex.c
@@ -15,8 +15,8 @@
 #include <string.h>
 
 #include <haproxy/api.h>
+#include <haproxy/errors.h>
 #include <haproxy/global.h>
-#include <haproxy/log.h>
 #include <haproxy/regex.h>
 #include <haproxy/tools.h>
 

diff --git a/src/sample.c b/src/sample.c
index f7ecb656462334e7304c5e95e5279aff83f6ffeb..4ee44cf493799ca624fd3f9ba231627897119d02 100644 (file)
--- a/src/sample.c
+++ b/src/sample.c
@@ -21,10 +21,10 @@
 #include <haproxy/auth.h>
 #include <haproxy/buf.h>
 #include <haproxy/chunk.h>
+#include <haproxy/errors.h>
 #include <haproxy/global.h>
 #include <haproxy/hash.h>
 #include <haproxy/http.h>
-#include <haproxy/log.h>
 #include <haproxy/net_helper.h>
 #include <haproxy/protobuf.h>
 #include <haproxy/proxy.h>

diff --git a/src/server.c b/src/server.c
index 3c83b638babe2e0de785c851901be4b5a62e0001..a0fd10f7df6de63587f65b1eab91e2fac17ae797 100644 (file)
--- a/src/server.c
+++ b/src/server.c
@@ -27,6 +27,7 @@
 #include <haproxy/dns.h>
 #include <haproxy/errors.h>
 #include <haproxy/global.h>
+#include <haproxy/log.h>
 #include <haproxy/mailers.h>
 #include <haproxy/namespace.h>
 #include <haproxy/queue.h>

diff --git a/src/signal.c b/src/signal.c
index 1f8ec834c1b7b9266f141e03286df97105b60375..946157e01f6472d4524484918943cbebfb02dbda 100644 (file)
--- a/src/signal.c
+++ b/src/signal.c
@@ -13,9 +13,9 @@
 #include <signal.h>
 #include <string.h>
 
-#include <haproxy/log.h>
-#include <haproxy/task.h>
+#include <haproxy/errors.h>
 #include <haproxy/signal.h>
+#include <haproxy/task.h>
 
 /* Principle : we keep an in-order list of the first occurrence of all received
  * signals. All occurrences of a same signal are grouped though. The signal

diff --git a/src/sink.c b/src/sink.c
index 5a4980b61a6766b1e250a658dd1f422260ecb422..8128775da2b977811a1daf3f4ad70f51b15cbf52 100644 (file)
--- a/src/sink.c
+++ b/src/sink.c
@@ -18,10 +18,11 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
+#include <import/ist.h>
 #include <haproxy/api.h>
 #include <haproxy/cfgparse.h>
 #include <haproxy/cli.h>
-#include <import/ist.h>
+#include <haproxy/errors.h>
 #include <haproxy/list.h>
 #include <haproxy/log.h>
 #include <haproxy/time.h>

diff --git a/src/stats.c b/src/stats.c
index b42ae7adf75d59ee74cdbefe157336f94d6baed7..bb70884c4e043c92ab710dd10ac606158f569bee 100644 (file)
--- a/src/stats.c
+++ b/src/stats.c
@@ -34,6 +34,7 @@
 #include <haproxy/compression.h>
 #include <haproxy/debug.h>
 #include <haproxy/dns.h>
+#include <haproxy/errors.h>
 #include <haproxy/frontend.h>
 #include <haproxy/global.h>
 #include <haproxy/http.h>
@@ -41,8 +42,8 @@
 #include <haproxy/htx.h>
 #include <haproxy/pool.h>
 #include <haproxy/list.h>
-#include <haproxy/listener.h>
 #include <haproxy/log.h>
+#include <haproxy/listener.h>
 #include <haproxy/map-t.h>
 #include <haproxy/pattern-t.h>
 #include <haproxy/proxy.h>

diff --git a/src/stick_table.c b/src/stick_table.c
index 0bdc62dbcf5239fe3d0cb1cfb15bf0f834d715b5..c5ddd0beb25b43f76d0add24143194712df896ff 100644 (file)
--- a/src/stick_table.c
+++ b/src/stick_table.c
@@ -17,6 +17,7 @@
 #include <haproxy/api.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>

diff --git a/src/tcpcheck.c b/src/tcpcheck.c
index ec1feded21718d294b635c9863f3e4abf51ddf09..8808a0cd66c1c7e4f0a9b676de970cd867de990b 100644 (file)
--- a/src/tcpcheck.c
+++ b/src/tcpcheck.c
@@ -39,6 +39,7 @@
 #include <haproxy/check.h>
 #include <haproxy/chunk.h>
 #include <haproxy/connection.h>
+#include <haproxy/errors.h>
 #include <haproxy/global.h>
 #include <haproxy/h1.h>
 #include <haproxy/http.h>

diff --git a/src/trace.c b/src/trace.c
index 997a994fd4df9e21f68c1d8b57c32ec40733a375..b4bd90babcc75bd613941bb7aa6debdac93489b6 100644 (file)
--- a/src/trace.c
+++ b/src/trace.c
@@ -22,6 +22,7 @@
 #include <haproxy/api.h>
 #include <haproxy/buf.h>
 #include <haproxy/cli.h>
+#include <haproxy/errors.h>
 #include <haproxy/istbuf.h>
 #include <haproxy/list.h>
 #include <haproxy/log.h>

diff --git a/src/uri_auth.c b/src/uri_auth.c
index 248431cd7b9a2b4a821b9c033c6cda36e93544eb..57dbadbf64173647e86e2baed91da7c14046c258 100644 (file)
--- a/src/uri_auth.c
+++ b/src/uri_auth.c
@@ -15,7 +15,8 @@
 
 #include <haproxy/api.h>
 #include <haproxy/base64.h>
-#include <haproxy/log.h>
+#include <haproxy/errors.h>
+#include <haproxy/list.h>
 #include <haproxy/stats-t.h>
 #include <haproxy/uri_auth.h>
 

diff --git a/src/vars.c b/src/vars.c
index 2e3258300ecae0a2819f1cb479cecddae9b2cd38..9ba1720e46f1433661eefab40bd32ef4fe07ae51 100644 (file)
--- a/src/vars.c
+++ b/src/vars.c
@@ -8,6 +8,7 @@
 #include <haproxy/http.h>
 #include <haproxy/http_rules.h>
 #include <haproxy/list.h>
+#include <haproxy/log.h>
 #include <haproxy/sample.h>
 #include <haproxy/stream-t.h>
 #include <haproxy/tcpcheck.h>

diff --git a/src/wdt.c b/src/wdt.c
index c17d67c3cf4da263e502e047a6135a7ef832addb..d6a3e56a93d926552af55c944d700937b3480751 100644 (file)
--- a/src/wdt.c
+++ b/src/wdt.c
@@ -14,8 +14,8 @@
 
 #include <haproxy/api.h>
 #include <haproxy/debug.h>
+#include <haproxy/errors.h>
 #include <haproxy/global.h>
-#include <haproxy/log.h>
 #include <haproxy/thread.h>
 #include <haproxy/tools.h>