diff options
| author | Willy Tarreau <w@1wt.eu> | 2020-06-05 00:00:29 +0200 |
|---|---|---|
| committer | Willy Tarreau <w@1wt.eu> | 2020-06-05 00:02:50 +0200 |
| commit | 83c928c35d854aca13bb4756b2ec402c6ee55536 (patch) | |
| tree | 698ba9aa334023cb312ee89020031e80b658c1d3 | |
| parent | b1bc53f7711639e319b91e4c7188b58b5c022786 (diff) | |
| download | haproxy-20200604-rework-includes-9f.tar.gz | |
REORG: includes: move cfgparse.c to haproxy/cfgparse.h20200604-rework-includes-9f
There's no point splitting the file in two since only cfgparse uses the
types defined there. A few call places were updated and cleaned up. All
of them were in C files which register keywords.
There is nothing left in common/ now so this directory must not be used
anymore.
42 files changed, 48 insertions, 48 deletions
diff --git a/contrib/prometheus-exporter/service-prometheus.c b/contrib/prometheus-exporter/service-prometheus.c index 9e0832a43..3849af31a 100644 --- a/contrib/prometheus-exporter/service-prometheus.c +++ b/contrib/prometheus-exporter/service-prometheus.c @@ -17,7 +17,7 @@ #include <haproxy/applet.h> #include <haproxy/backend.h> #include <haproxy/base.h> -#include <common/cfgparse.h> +#include <haproxy/cfgparse.h> #include <haproxy/frontend.h> #include <haproxy/global.h> #include <haproxy/http_htx.h> diff --git a/include/common/cfgparse.h b/include/haproxy/cfgparse.h index 0f6098710..bec2d462b 100644 --- a/include/common/cfgparse.h +++ b/include/haproxy/cfgparse.h @@ -1,8 +1,8 @@ /* - * include/common/cfgparse.h + * include/haproxy/cfgparse.h * Configuration parsing functions. * - * Copyright (C) 2000-2012 Willy Tarreau - w@1wt.eu + * Copyright (C) 2000-2020 Willy Tarreau - w@1wt.eu * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -19,8 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef _COMMON_CFGPARSE_H -#define _COMMON_CFGPARSE_H +#ifndef _HAPROXY_CFGPARSE_H +#define _HAPROXY_CFGPARSE_H #include <haproxy/base.h> #include <haproxy/list-t.h> @@ -148,7 +148,7 @@ static inline int warnifnotcap(struct proxy *proxy, int cap, const char *file, i #define REGISTER_CONFIG_POSTPARSER(name, parser) \ INITCALL2(STG_REGISTER, cfg_register_postparser, (name), (parser)) -#endif /* _COMMON_CFGPARSE_H */ +#endif /* _HAPROXY_CFGPARSE_H */ /* * Local variables: @@ -1,7 +1,7 @@ #include <stdio.h> #include <haproxy/base.h> -#include <common/cfgparse.h> +#include <haproxy/cfgparse.h> #include <haproxy/chunk.h> #include <haproxy/buf-t.h> #include <haproxy/errors.h> diff --git a/src/activity.c b/src/activity.c index d1ad06b1c..f5a88b72e 100644 --- a/src/activity.c +++ b/src/activity.c @@ -11,7 +11,7 @@ */ #include <haproxy/base.h> -#include <common/cfgparse.h> +#include <haproxy/cfgparse.h> #include <haproxy/channel.h> #include <haproxy/cli.h> #include <haproxy/stream_interface.h> diff --git a/src/cache.c b/src/cache.c index 070086992..ab224fec8 100644 --- a/src/cache.c +++ b/src/cache.c @@ -12,6 +12,7 @@ #include <haproxy/action-t.h> #include <haproxy/base.h> +#include <haproxy/cfgparse.h> #include <haproxy/channel.h> #include <haproxy/cli.h> #include <haproxy/filters.h> @@ -27,7 +28,6 @@ #include <import/sha1.h> -#include <common/cfgparse.h> #include <haproxy/hash.h> #include <haproxy/htx.h> #include <haproxy/net_helper.h> diff --git a/src/cfgparse-global.c b/src/cfgparse-global.c index 81261722a..d6d724308 100644 --- a/src/cfgparse-global.c +++ b/src/cfgparse-global.c @@ -11,7 +11,7 @@ #include <fcntl.h> #include <unistd.h> -#include <common/cfgparse.h> +#include <haproxy/cfgparse.h> #include <haproxy/compression.h> #include <haproxy/global.h> diff --git a/src/cfgparse-listen.c b/src/cfgparse-listen.c index ff6bd7936..1536f244c 100644 --- a/src/cfgparse-listen.c +++ b/src/cfgparse-listen.c @@ -11,11 +11,11 @@ #include <fcntl.h> #include <unistd.h> -#include <common/cfgparse.h> #include <haproxy/uri_auth.h> #include <haproxy/acl.h> #include <haproxy/capture-t.h> +#include <haproxy/cfgparse.h> #include <haproxy/checks.h> #include <haproxy/compression-t.h> #include <haproxy/connection.h> diff --git a/src/cfgparse-ssl.c b/src/cfgparse-ssl.c index d0b7e8bf0..5bcfc039c 100644 --- a/src/cfgparse-ssl.c +++ b/src/cfgparse-ssl.c @@ -33,7 +33,7 @@ #include <haproxy/base.h> #include <haproxy/base64.h> -#include <common/cfgparse.h> +#include <haproxy/cfgparse.h> #include <haproxy/listener.h> #include <haproxy/openssl-compat.h> #include <haproxy/ssl_sock.h> diff --git a/src/cfgparse.c b/src/cfgparse.c index a9b84606d..2cab97a1d 100644 --- a/src/cfgparse.c +++ b/src/cfgparse.c @@ -39,7 +39,7 @@ #include <haproxy/backend.h> #include <haproxy/base.h> #include <haproxy/capture.h> -#include <common/cfgparse.h> +#include <haproxy/cfgparse.h> #include <haproxy/channel.h> #include <haproxy/checks.h> #include <haproxy/chunk.h> diff --git a/src/checks.c b/src/checks.c index 0d7b6fb99..7d146a5b3 100644 --- a/src/checks.c +++ b/src/checks.c @@ -32,7 +32,7 @@ #include <haproxy/action.h> #include <haproxy/base.h> -#include <common/cfgparse.h> +#include <haproxy/cfgparse.h> #include <haproxy/checks.h> #include <haproxy/chunk.h> #include <haproxy/dns.h> @@ -28,7 +28,7 @@ #include <haproxy/applet-t.h> #include <haproxy/base.h> -#include <common/cfgparse.h> +#include <haproxy/cfgparse.h> #include <haproxy/channel.h> #include <haproxy/checks.h> #include <haproxy/cli.h> diff --git a/src/compression.c b/src/compression.c index d99141a02..571ecc7b9 100644 --- a/src/compression.c +++ b/src/compression.c @@ -27,8 +27,8 @@ #endif /* USE_ZLIB */ #include <haproxy/base.h> +#include <haproxy/cfgparse.h> #include <haproxy/dynbuf.h> -#include <common/cfgparse.h> #include <haproxy/stream.h> #include <haproxy/thread.h> #include <haproxy/pool.h> diff --git a/src/connection.c b/src/connection.c index 0fe32ecd6..80dc299f0 100644 --- a/src/connection.c +++ b/src/connection.c @@ -13,7 +13,7 @@ #include <errno.h> #include <haproxy/base.h> -#include <common/cfgparse.h> +#include <haproxy/cfgparse.h> #include <haproxy/connection.h> #include <haproxy/frontend.h> #include <haproxy/namespace.h> @@ -1,7 +1,7 @@ #include <stdio.h> #include <haproxy/base.h> -#include <common/cfgparse.h> +#include <haproxy/cfgparse.h> #include <haproxy/errors.h> #include <haproxy/http.h> #include <haproxy/http_ana.h> @@ -21,7 +21,7 @@ #include <haproxy/action.h> #include <haproxy/base.h> -#include <common/cfgparse.h> +#include <haproxy/cfgparse.h> #include <haproxy/checks.h> #include <haproxy/channel.h> #include <haproxy/cli.h> diff --git a/src/fcgi-app.c b/src/fcgi-app.c index 54ca02825..3a5fb5042 100644 --- a/src/fcgi-app.c +++ b/src/fcgi-app.c @@ -12,8 +12,8 @@ #include <haproxy/acl.h> #include <haproxy/base.h> +#include <haproxy/cfgparse.h> #include <haproxy/chunk.h> -#include <common/cfgparse.h> #include <haproxy/errors.h> #include <haproxy/fcgi-app.h> #include <haproxy/filters.h> diff --git a/src/filters.c b/src/filters.c index 3ec5df9c9..c7bddf61e 100644 --- a/src/filters.c +++ b/src/filters.c @@ -12,7 +12,7 @@ #include <haproxy/base.h> #include <haproxy/buf-t.h> -#include <common/cfgparse.h> +#include <haproxy/cfgparse.h> #include <haproxy/compression.h> #include <haproxy/errors.h> #include <haproxy/filters.h> diff --git a/src/flt_http_comp.c b/src/flt_http_comp.c index 19f55745e..648e631b2 100644 --- a/src/flt_http_comp.c +++ b/src/flt_http_comp.c @@ -11,13 +11,13 @@ */ #include <haproxy/base.h> +#include <haproxy/cfgparse.h> #include <haproxy/compression.h> #include <haproxy/dynbuf.h> #include <haproxy/filters.h> #include <haproxy/http.h> #include <haproxy/http_ana-t.h> #include <haproxy/http_htx.h> -#include <common/cfgparse.h> #include <haproxy/htx.h> #include <haproxy/list.h> #include <haproxy/proxy-t.h> diff --git a/src/flt_spoe.c b/src/flt_spoe.c index 193ed776f..2631161de 100644 --- a/src/flt_spoe.c +++ b/src/flt_spoe.c @@ -16,7 +16,7 @@ #include <haproxy/action-t.h> #include <haproxy/arg.h> #include <haproxy/base.h> -#include <common/cfgparse.h> +#include <haproxy/cfgparse.h> #include <haproxy/filters.h> #include <haproxy/freq_ctr.h> #include <haproxy/frontend.h> diff --git a/src/h1_htx.c b/src/h1_htx.c index 0d3cbcbfa..70d8ca1da 100644 --- a/src/h1_htx.c +++ b/src/h1_htx.c @@ -11,7 +11,7 @@ */ #include <haproxy/base.h> -#include <common/cfgparse.h> +#include <haproxy/cfgparse.h> #include <haproxy/global.h> #include <haproxy/h1.h> #include <haproxy/h1_htx.h> diff --git a/src/haproxy.c b/src/haproxy.c index b55e30290..cc8982773 100644 --- a/src/haproxy.c +++ b/src/haproxy.c @@ -84,7 +84,7 @@ #include <import/sha1.h> #include <haproxy/base64.h> -#include <common/cfgparse.h> +#include <haproxy/cfgparse.h> #include <haproxy/chunk.h> #include <haproxy/cli.h> #include <haproxy/connection.h> diff --git a/src/hathreads.c b/src/hathreads.c index a36ae1d9a..a29697035 100644 --- a/src/hathreads.c +++ b/src/hathreads.c @@ -23,7 +23,7 @@ #include <sys/cpuset.h> #endif -#include <common/cfgparse.h> +#include <haproxy/cfgparse.h> #include <haproxy/thread.h> #include <haproxy/tools.h> #include <haproxy/global.h> diff --git a/src/hlua.c b/src/hlua.c index b36b1e942..71e1fa14a 100644 --- a/src/hlua.c +++ b/src/hlua.c @@ -26,7 +26,7 @@ #include <import/ebpttree.h> #include <haproxy/arg.h> -#include <common/cfgparse.h> +#include <haproxy/cfgparse.h> #include <haproxy/channel.h> #include <haproxy/cli.h> #include <haproxy/connection.h> diff --git a/src/http_act.c b/src/http_act.c index 9fbf28723..1a8f2b080 100644 --- a/src/http_act.c +++ b/src/http_act.c @@ -19,7 +19,7 @@ #include <haproxy/acl.h> #include <haproxy/action.h> #include <haproxy/base.h> -#include <common/cfgparse.h> +#include <haproxy/cfgparse.h> #include <haproxy/chunk.h> #include <haproxy/global.h> #include <haproxy/http.h> diff --git a/src/http_htx.c b/src/http_htx.c index c9eedbffc..9eb9672c8 100644 --- a/src/http_htx.c +++ b/src/http_htx.c @@ -20,7 +20,7 @@ #include <haproxy/regex.h> #include <haproxy/sample.h> -#include <common/cfgparse.h> +#include <haproxy/cfgparse.h> #include <haproxy/h1.h> #include <haproxy/http.h> #include <haproxy/http_htx.h> diff --git a/src/http_rules.c b/src/http_rules.c index d6c6dbda1..997b22ce6 100644 --- a/src/http_rules.c +++ b/src/http_rules.c @@ -19,7 +19,7 @@ #include <haproxy/acl.h> #include <haproxy/action.h> #include <haproxy/base.h> -#include <common/cfgparse.h> +#include <haproxy/cfgparse.h> #include <haproxy/chunk.h> #include <haproxy/global.h> #include <haproxy/http.h> diff --git a/src/listener.c b/src/listener.c index fd8a89e5c..d792d59e1 100644 --- a/src/listener.c +++ b/src/listener.c @@ -20,7 +20,7 @@ #include <haproxy/acl.h> #include <haproxy/base.h> -#include <common/cfgparse.h> +#include <haproxy/cfgparse.h> #include <haproxy/connection.h> #include <haproxy/errors.h> #include <haproxy/global.h> diff --git a/src/memory.c b/src/memory.c index 5c0abc0f1..a53369ec3 100644 --- a/src/memory.c +++ b/src/memory.c @@ -13,11 +13,11 @@ #include <haproxy/applet-t.h> #include <haproxy/base.h> +#include <haproxy/cfgparse.h> #include <haproxy/channel.h> #include <haproxy/cli.h> #include <haproxy/global.h> -#include <common/cfgparse.h> #include <haproxy/thread.h> #include <haproxy/pool.h> #include <haproxy/list.h> diff --git a/src/mux_fcgi.c b/src/mux_fcgi.c index e3ab849c6..1a9493fd1 100644 --- a/src/mux_fcgi.c +++ b/src/mux_fcgi.c @@ -11,7 +11,7 @@ */ #include <haproxy/base.h> -#include <common/cfgparse.h> +#include <haproxy/cfgparse.h> #include <haproxy/connection.h> #include <haproxy/fcgi.h> #include <haproxy/fcgi-app.h> diff --git a/src/mux_h1.c b/src/mux_h1.c index bffacf9de..7fa8e664d 100644 --- a/src/mux_h1.c +++ b/src/mux_h1.c @@ -11,7 +11,7 @@ */ #include <haproxy/base.h> #include <haproxy/istbuf.h> -#include <common/cfgparse.h> +#include <haproxy/cfgparse.h> #include <haproxy/connection.h> #include <haproxy/h1.h> #include <haproxy/h1_htx.h> diff --git a/src/mux_h2.c b/src/mux_h2.c index 933f95f20..6b58b0bae 100644 --- a/src/mux_h2.c +++ b/src/mux_h2.c @@ -13,7 +13,7 @@ #include <import/eb32tree.h> #include <haproxy/base.h> #include <haproxy/istbuf.h> -#include <common/cfgparse.h> +#include <haproxy/cfgparse.h> #include <haproxy/connection.h> #include <haproxy/h1.h> #include <haproxy/h2.h> diff --git a/src/mworker-prog.c b/src/mworker-prog.c index 345eea533..eff556c21 100644 --- a/src/mworker-prog.c +++ b/src/mworker-prog.c @@ -21,7 +21,7 @@ #include <unistd.h> #include <haproxy/base.h> -#include <common/cfgparse.h> +#include <haproxy/cfgparse.h> #include <haproxy/errors.h> #include <haproxy/global.h> #include <haproxy/log.h> diff --git a/src/mworker.c b/src/mworker.c index 7b4c83d65..0284bb08e 100644 --- a/src/mworker.c +++ b/src/mworker.c @@ -18,7 +18,7 @@ #include <sys/wait.h> #include <haproxy/base.h> -#include <common/cfgparse.h> +#include <haproxy/cfgparse.h> #include <haproxy/cli.h> #include <haproxy/fd.h> #include <haproxy/global.h> diff --git a/src/proxy.c b/src/proxy.c index ce2be033c..37f500c2c 100644 --- a/src/proxy.c +++ b/src/proxy.c @@ -19,7 +19,7 @@ #include <haproxy/applet-t.h> #include <haproxy/base.h> -#include <common/cfgparse.h> +#include <haproxy/cfgparse.h> #include <haproxy/cli.h> #include <haproxy/errors.h> #include <haproxy/filters.h> diff --git a/src/server.c b/src/server.c index ffe5a9c6e..007b90600 100644 --- a/src/server.c +++ b/src/server.c @@ -14,12 +14,12 @@ #include <ctype.h> #include <errno.h> +#include <import/xxhash.h> + #include <haproxy/applet-t.h> #include <haproxy/backend.h> #include <haproxy/base.h> -#include <import/xxhash.h> - -#include <common/cfgparse.h> +#include <haproxy/cfgparse.h> #include <haproxy/checks.h> #include <haproxy/cli.h> #include <haproxy/connection.h> diff --git a/src/sink.c b/src/sink.c index bfedbc85f..2fefa76b7 100644 --- a/src/sink.c +++ b/src/sink.c @@ -19,7 +19,7 @@ */ #include <haproxy/base.h> -#include <common/cfgparse.h> +#include <haproxy/cfgparse.h> #include <haproxy/cli.h> #include <import/ist.h> #include <haproxy/list.h> diff --git a/src/stats.c b/src/stats.c index 8575bf4a1..40f096519 100644 --- a/src/stats.c +++ b/src/stats.c @@ -27,7 +27,7 @@ #include <haproxy/applet-t.h> #include <haproxy/backend.h> #include <haproxy/base.h> -#include <common/cfgparse.h> +#include <haproxy/cfgparse.h> #include <haproxy/channel.h> #include <haproxy/checks.h> #include <haproxy/cli.h> diff --git a/src/stick_table.c b/src/stick_table.c index 684226991..6e0a91262 100644 --- a/src/stick_table.c +++ b/src/stick_table.c @@ -15,7 +15,7 @@ #include <errno.h> #include <haproxy/base.h> -#include <common/cfgparse.h> +#include <haproxy/cfgparse.h> #include <haproxy/cli.h> #include <haproxy/global.h> #include <haproxy/http_rules.h> diff --git a/src/stream.c b/src/stream.c index f0e2c6a3e..dcd7985b9 100644 --- a/src/stream.c +++ b/src/stream.c @@ -22,7 +22,7 @@ #include <haproxy/backend.h> #include <haproxy/base.h> #include <haproxy/capture.h> -#include <common/cfgparse.h> +#include <haproxy/cfgparse.h> #include <haproxy/channel.h> #include <haproxy/checks.h> #include <haproxy/cli.h> diff --git a/src/tcp_rules.c b/src/tcp_rules.c index 81a462b68..5d20f66f2 100644 --- a/src/tcp_rules.c +++ b/src/tcp_rules.c @@ -14,7 +14,7 @@ #include <haproxy/arg-t.h> #include <haproxy/base.h> #include <haproxy/capture-t.h> -#include <common/cfgparse.h> +#include <haproxy/cfgparse.h> #include <haproxy/channel.h> #include <haproxy/connection.h> #include <haproxy/global.h> diff --git a/src/vars.c b/src/vars.c index 6d4d9803b..d5e7dc8ea 100644 --- a/src/vars.c +++ b/src/vars.c @@ -2,7 +2,7 @@ #include <haproxy/arg.h> #include <haproxy/base.h> -#include <common/cfgparse.h> +#include <haproxy/cfgparse.h> #include <haproxy/checks.h> #include <haproxy/global.h> #include <haproxy/http.h> diff --git a/src/wurfl.c b/src/wurfl.c index 6f0d42e3b..b925f189a 100644 --- a/src/wurfl.c +++ b/src/wurfl.c @@ -3,7 +3,7 @@ #include <haproxy/base.h> #include <haproxy/buf-t.h> -#include <common/cfgparse.h> +#include <haproxy/cfgparse.h> #include <haproxy/chunk.h> #include <haproxy/errors.h> #include <haproxy/global.h> |