From 6be7849f39b33d71e12d334cb2c7b3de4830a27f Mon Sep 17 00:00:00 2001
From: Willy Tarreau <w@1wt.eu>
Date: Fri, 5 Jun 2020 00:00:29 +0200
Subject: [PATCH] REORG: include: move cfgparse.h to haproxy/cfgparse.h

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.
---
 contrib/prometheus-exporter/service-prometheus.c |  2 +-
 include/{common => haproxy}/cfgparse.h           | 10 +++++-----
 src/51d.c                                        |  2 +-
 src/activity.c                                   |  2 +-
 src/cache.c                                      |  2 +-
 src/cfgparse-global.c                            |  2 +-
 src/cfgparse-listen.c                            |  2 +-
 src/cfgparse-ssl.c                               |  2 +-
 src/cfgparse.c                                   |  2 +-
 src/check.c                                      |  2 +-
 src/cli.c                                        |  2 +-
 src/compression.c                                |  2 +-
 src/connection.c                                 |  2 +-
 src/da.c                                         |  2 +-
 src/dns.c                                        |  2 +-
 src/fcgi-app.c                                   |  2 +-
 src/filters.c                                    |  2 +-
 src/flt_http_comp.c                              |  2 +-
 src/flt_spoe.c                                   |  2 +-
 src/h1_htx.c                                     |  2 +-
 src/haproxy.c                                    |  2 +-
 src/hlua.c                                       |  2 +-
 src/http_act.c                                   |  2 +-
 src/http_htx.c                                   |  2 +-
 src/http_rules.c                                 |  2 +-
 src/listener.c                                   |  2 +-
 src/mux_fcgi.c                                   |  2 +-
 src/mux_h1.c                                     |  2 +-
 src/mux_h2.c                                     |  2 +-
 src/mworker-prog.c                               |  2 +-
 src/mworker.c                                    |  2 +-
 src/pool.c                                       |  2 +-
 src/proxy.c                                      |  2 +-
 src/server.c                                     |  6 +++---
 src/sink.c                                       |  2 +-
 src/stats.c                                      |  2 +-
 src/stick_table.c                                |  2 +-
 src/stream.c                                     |  2 +-
 src/tcp_rules.c                                  |  2 +-
 src/thread.c                                     |  2 +-
 src/vars.c                                       |  2 +-
 src/wurfl.c                                      |  2 +-
 42 files changed, 48 insertions(+), 48 deletions(-)
 rename include/{common => haproxy}/cfgparse.h (97%)

diff --git a/contrib/prometheus-exporter/service-prometheus.c b/contrib/prometheus-exporter/service-prometheus.c
index bc968d98e..9375f0a31 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/api.h>
-#include <common/cfgparse.h>
+#include <haproxy/cfgparse.h>
 #include <haproxy/frontend.h>
 #include <haproxy/global.h>
 #include <haproxy/http.h>
diff --git a/include/common/cfgparse.h b/include/haproxy/cfgparse.h
similarity index 97%
rename from include/common/cfgparse.h
rename to include/haproxy/cfgparse.h
index 86bceb629..447c057b9 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/api.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:
diff --git a/src/51d.c b/src/51d.c
index 12f40ea09..68195cd29 100644
--- a/src/51d.c
+++ b/src/51d.c
@@ -1,7 +1,7 @@
 #include <stdio.h>
 
 #include <haproxy/api.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 92bce339c..17eb13c1a 100644
--- a/src/activity.c
+++ b/src/activity.c
@@ -11,7 +11,7 @@
  */
 
 #include <haproxy/api.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 ba96ede65..56368f3cc 100644
--- a/src/cache.c
+++ b/src/cache.c
@@ -12,6 +12,7 @@
 
 #include <haproxy/action-t.h>
 #include <haproxy/api.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 cdb68401a..0544df448 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/check.h>
 #include <haproxy/compression-t.h>
 #include <haproxy/connection.h>
diff --git a/src/cfgparse-ssl.c b/src/cfgparse-ssl.c
index 831bdb41f..144cef882 100644
--- a/src/cfgparse-ssl.c
+++ b/src/cfgparse-ssl.c
@@ -33,7 +33,7 @@
 
 #include <haproxy/api.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 a983e5ad2..0bb4f2bbc 100644
--- a/src/cfgparse.c
+++ b/src/cfgparse.c
@@ -39,7 +39,7 @@
 #include <haproxy/backend.h>
 #include <haproxy/api.h>
 #include <haproxy/capture.h>
-#include <common/cfgparse.h>
+#include <haproxy/cfgparse.h>
 #include <haproxy/channel.h>
 #include <haproxy/check.h>
 #include <haproxy/chunk.h>
diff --git a/src/check.c b/src/check.c
index 308a86ec3..f8df0e9f0 100644
--- a/src/check.c
+++ b/src/check.c
@@ -32,7 +32,7 @@
 
 #include <haproxy/action.h>
 #include <haproxy/api.h>
-#include <common/cfgparse.h>
+#include <haproxy/cfgparse.h>
 #include <haproxy/check.h>
 #include <haproxy/chunk.h>
 #include <haproxy/dns.h>
diff --git a/src/cli.c b/src/cli.c
index c39cbb6fb..b6249ddee 100644
--- a/src/cli.c
+++ b/src/cli.c
@@ -28,7 +28,7 @@
 
 #include <haproxy/applet-t.h>
 #include <haproxy/api.h>
-#include <common/cfgparse.h>
+#include <haproxy/cfgparse.h>
 #include <haproxy/channel.h>
 #include <haproxy/check.h>
 #include <haproxy/cli.h>
diff --git a/src/compression.c b/src/compression.c
index cd548fc45..7d4720eeb 100644
--- a/src/compression.c
+++ b/src/compression.c
@@ -27,8 +27,8 @@
 #endif /* USE_ZLIB */
 
 #include <haproxy/api.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 3c9b21e7c..e27ba7438 100644
--- a/src/connection.c
+++ b/src/connection.c
@@ -13,7 +13,7 @@
 #include <errno.h>
 
 #include <haproxy/api.h>
-#include <common/cfgparse.h>
+#include <haproxy/cfgparse.h>
 #include <haproxy/connection.h>
 #include <haproxy/frontend.h>
 #include <haproxy/namespace.h>
diff --git a/src/da.c b/src/da.c
index 6090851ab..a47fc300e 100644
--- a/src/da.c
+++ b/src/da.c
@@ -1,7 +1,7 @@
 #include <stdio.h>
 
 #include <haproxy/api.h>
-#include <common/cfgparse.h>
+#include <haproxy/cfgparse.h>
 #include <haproxy/errors.h>
 #include <haproxy/http.h>
 #include <haproxy/http_ana.h>
diff --git a/src/dns.c b/src/dns.c
index 8eddde947..9ba1873fe 100644
--- a/src/dns.c
+++ b/src/dns.c
@@ -21,7 +21,7 @@
 
 #include <haproxy/action.h>
 #include <haproxy/api.h>
-#include <common/cfgparse.h>
+#include <haproxy/cfgparse.h>
 #include <haproxy/check.h>
 #include <haproxy/channel.h>
 #include <haproxy/cli.h>
diff --git a/src/fcgi-app.c b/src/fcgi-app.c
index 434fc02f0..183355756 100644
--- a/src/fcgi-app.c
+++ b/src/fcgi-app.c
@@ -12,8 +12,8 @@
 
 #include <haproxy/acl.h>
 #include <haproxy/api.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 f0bfcf52e..1d4119b6c 100644
--- a/src/filters.c
+++ b/src/filters.c
@@ -12,7 +12,7 @@
 
 #include <haproxy/api.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 30b5aad2b..664124980 100644
--- a/src/flt_http_comp.c
+++ b/src/flt_http_comp.c
@@ -11,13 +11,13 @@
  */
 
 #include <haproxy/api.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 25c075be7..a53bcd9dd 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/api.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 f6f21f2b3..e32d84529 100644
--- a/src/h1_htx.c
+++ b/src/h1_htx.c
@@ -11,7 +11,7 @@
  */
 
 #include <haproxy/api.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 043625f91..f066f5f13 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/hlua.c b/src/hlua.c
index ef41e7d91..fd5ba062e 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 a688acbaa..f83b32bfe 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/api.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 d5d8747ff..e3e21d772 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 e4506f93c..d2bb4f29d 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/api.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 a7ff80374..82eb2e7ad 100644
--- a/src/listener.c
+++ b/src/listener.c
@@ -20,7 +20,7 @@
 
 #include <haproxy/acl.h>
 #include <haproxy/api.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/mux_fcgi.c b/src/mux_fcgi.c
index dc4bab1d1..b03210f7a 100644
--- a/src/mux_fcgi.c
+++ b/src/mux_fcgi.c
@@ -11,7 +11,7 @@
  */
 
 #include <haproxy/api.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 cffdd60be..5a66f7d41 100644
--- a/src/mux_h1.c
+++ b/src/mux_h1.c
@@ -11,7 +11,7 @@
  */
 #include <haproxy/api.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 44a433215..102e74ee7 100644
--- a/src/mux_h2.c
+++ b/src/mux_h2.c
@@ -13,7 +13,7 @@
 #include <import/eb32tree.h>
 #include <haproxy/api.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 f6e61ed35..d0b9446e6 100644
--- a/src/mworker-prog.c
+++ b/src/mworker-prog.c
@@ -21,7 +21,7 @@
 #include <unistd.h>
 
 #include <haproxy/api.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 9dd9f33d6..e2b154e5d 100644
--- a/src/mworker.c
+++ b/src/mworker.c
@@ -18,7 +18,7 @@
 #include <sys/wait.h>
 
 #include <haproxy/api.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/pool.c b/src/pool.c
index 78809bb7a..82ca79a74 100644
--- a/src/pool.c
+++ b/src/pool.c
@@ -13,11 +13,11 @@
 
 #include <haproxy/applet-t.h>
 #include <haproxy/api.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/proxy.c b/src/proxy.c
index e13c4edc9..ba8a07d0f 100644
--- a/src/proxy.c
+++ b/src/proxy.c
@@ -19,7 +19,7 @@
 
 #include <haproxy/applet-t.h>
 #include <haproxy/api.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 32aa72ee7..0d9b53303 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/api.h>
-#include <import/xxhash.h>
-
-#include <common/cfgparse.h>
+#include <haproxy/cfgparse.h>
 #include <haproxy/check.h>
 #include <haproxy/cli.h>
 #include <haproxy/connection.h>
diff --git a/src/sink.c b/src/sink.c
index b6e1b857e..5a4980b61 100644
--- a/src/sink.c
+++ b/src/sink.c
@@ -19,7 +19,7 @@
  */
 
 #include <haproxy/api.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 558e48f92..b42ae7adf 100644
--- a/src/stats.c
+++ b/src/stats.c
@@ -27,7 +27,7 @@
 #include <haproxy/applet-t.h>
 #include <haproxy/backend.h>
 #include <haproxy/api.h>
-#include <common/cfgparse.h>
+#include <haproxy/cfgparse.h>
 #include <haproxy/channel.h>
 #include <haproxy/check.h>
 #include <haproxy/cli.h>
diff --git a/src/stick_table.c b/src/stick_table.c
index 821ab984b..0bdc62dbc 100644
--- a/src/stick_table.c
+++ b/src/stick_table.c
@@ -15,7 +15,7 @@
 #include <errno.h>
 
 #include <haproxy/api.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 ecc65acaf..09f6f192a 100644
--- a/src/stream.c
+++ b/src/stream.c
@@ -22,7 +22,7 @@
 #include <haproxy/backend.h>
 #include <haproxy/api.h>
 #include <haproxy/capture.h>
-#include <common/cfgparse.h>
+#include <haproxy/cfgparse.h>
 #include <haproxy/channel.h>
 #include <haproxy/check.h>
 #include <haproxy/cli.h>
diff --git a/src/tcp_rules.c b/src/tcp_rules.c
index 5966fce73..5f8c74dd5 100644
--- a/src/tcp_rules.c
+++ b/src/tcp_rules.c
@@ -14,7 +14,7 @@
 #include <haproxy/arg-t.h>
 #include <haproxy/api.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/thread.c b/src/thread.c
index b0cbd3487..c58669f4a 100644
--- a/src/thread.c
+++ b/src/thread.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/vars.c b/src/vars.c
index 53afe1a41..d58e1a325 100644
--- a/src/vars.c
+++ b/src/vars.c
@@ -2,7 +2,7 @@
 
 #include <haproxy/arg.h>
 #include <haproxy/api.h>
-#include <common/cfgparse.h>
+#include <haproxy/cfgparse.h>
 #include <haproxy/check.h>
 #include <haproxy/global.h>
 #include <haproxy/http.h>
diff --git a/src/wurfl.c b/src/wurfl.c
index 57e794e16..9a1d858b2 100644
--- a/src/wurfl.c
+++ b/src/wurfl.c
@@ -3,7 +3,7 @@
 
 #include <haproxy/api.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>