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

@@ -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>

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:

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>

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>

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>

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>
 

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>