REORG: include: move base64.h, errors.h and hash.h from common to to haproxy/

These ones do not depend on any other file. One used to include
haproxy/api.h but that was solely for stddef.h.

diff --git a/include/common/base64.h b/include/haproxy/base64.h
similarity index 75%
rename from include/common/base64.h
rename to include/haproxy/base64.h
index e53a3528be07cd7894b1200502ae551f61e68edf..d7dec58cde50550bd8f2c11f4fca9d76a7ce4649 100644 (file)
--- a/include/common/base64.h
+++ b/include/haproxy/base64.h
@@ -1,8 +1,8 @@
 /*
- * include/common/base64.h
+ * include/haproxy/base64.h
  * Ascii to Base64 conversion as described in RFC1421.
  *
- * Copyright 2006-2010 Willy Tarreau <w@1wt.eu>
+ * Copyright 2006-2020 Willy Tarreau <w@1wt.eu>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -11,10 +11,10 @@
  *
  */
 
-#ifndef _COMMON_BASE64_H
-#define _COMMON_BASE64_H
+#ifndef _HAPROXY_BASE64_H
+#define _HAPROXY_BASE64_H
 
-#include <haproxy/api.h>
+#include <stddef.h>
 
 int a2base64(char *in, int ilen, char *out, int olen);
 int base64dec(const char *in, size_t ilen, char *out, size_t olen);
@@ -23,4 +23,4 @@ int b64tos30(const char *in);
 
 extern const char base64tab[];
 
-#endif /* _COMMON_BASE64_H */
+#endif /* _HAPROXY_BASE64_H */

diff --git a/include/common/errors.h b/include/haproxy/errors.h
similarity index 94%
rename from include/common/errors.h
rename to include/haproxy/errors.h
index e6b658b1f627f99c5af03f0b37c6c355cdc97628..6277701deca6c90b0f694ca83727c5bed4f86923 100644 (file)
--- a/include/common/errors.h
+++ b/include/haproxy/errors.h
@@ -1,8 +1,8 @@
 /*
- * include/common/errors.h
+ * include/haproxy/errors.h
  * Global error macros and constants
  *
- * Copyright (C) 2000-2010 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_ERRORS_H
-#define _COMMON_ERRORS_H
+#ifndef _HAPROXY_ERRORS_H
+#define _HAPROXY_ERRORS_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
@@ -56,7 +56,7 @@ enum {
        PE_ARG_NOT_FOUND, /* argument references something not found */
 };
 
-#endif /* _COMMON_ERRORS_H */
+#endif /* _HAPROXY_ERRORS_H */
 
 /*
  * Local variables:

diff --git a/include/common/hash.h b/include/haproxy/hash.h
similarity index 86%
rename from include/common/hash.h
rename to include/haproxy/hash.h
index c17f8c9ff42a4cc80e84a30176d2be730d62c3fe..cb506c7cf0ef17a37bd750d014c299864204efe0 100644 (file)
--- a/include/common/hash.h
+++ b/include/haproxy/hash.h
@@ -1,8 +1,8 @@
 /*
- * include/common/hash.h
+ * include/haproxy/hash.h
  * Macros for different hashing function.
  *
- * Copyright (C) 2000-2011 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_HASH_H_
-#define _COMMON_HASH_H_
+#ifndef _HAPROXY_HASH_H_
+#define _HAPROXY_HASH_H_
 
 #include <inttypes.h>
 
@@ -30,4 +30,4 @@ unsigned int hash_sdbm(const void *input, int len);
 unsigned int hash_crc32(const void *input, int len);
 uint32_t hash_crc32c(const void *input, int len);
 
-#endif /* _COMMON_HASH_H_ */
+#endif /* _HAPROXY_HASH_H_ */

diff --git a/include/proto/stick_table.h b/include/proto/stick_table.h
index 2243d3d1bd4d6e95d3ff637fe5a79916a7d64c4e..986c7755f7e6ca1161bd066caa1d01f2a1b0b44f 100644 (file)
--- a/include/proto/stick_table.h
+++ b/include/proto/stick_table.h
@@ -23,7 +23,7 @@
 #ifndef _PROTO_STICK_TABLE_H
 #define _PROTO_STICK_TABLE_H
 
-#include <common/errors.h>
+#include <haproxy/errors.h>
 #include <common/ticks.h>
 #include <common/time.h>
 #include <types/stick_table.h>

diff --git a/src/51d.c b/src/51d.c
index 13997e348b8589caa7867ad812a73c508cb329e9..ceef3559a29b4a226263292d101857222c8e551f 100644 (file)
--- a/src/51d.c
+++ b/src/51d.c
@@ -4,7 +4,7 @@
 #include <common/cfgparse.h>
 #include <common/chunk.h>
 #include <common/buffer.h>
-#include <common/errors.h>
+#include <haproxy/errors.h>
 #include <common/hathreads.h>
 #include <types/global.h>
 #include <proto/arg.h>

diff --git a/src/auth.c b/src/auth.c
index 2d9804433defe5edcaf103c4dc5cc2f4819058c9..6570ecafe21419fbd5140f75510556ad8fd83706 100644 (file)
--- a/src/auth.c
+++ b/src/auth.c
@@ -27,7 +27,7 @@
 
 #include <haproxy/api.h>
 #include <types/global.h>
-#include <common/errors.h>
+#include <haproxy/errors.h>
 #include <common/hathreads.h>
 
 #include <proto/acl.h>

diff --git a/src/backend.c b/src/backend.c
index f259b391752812bdf943375bd78bac189f7860b5..ece412c7c5d2d5482e1066ce317b8bed9cd63304 100644 (file)
--- a/src/backend.c
+++ b/src/backend.c
@@ -22,7 +22,7 @@
 #include <haproxy/api.h>
 #include <common/buffer.h>
 #include <common/debug.h>
-#include <common/hash.h>
+#include <haproxy/hash.h>
 #include <common/htx.h>
 #include <common/ticks.h>
 #include <common/time.h>

diff --git a/src/base64.c b/src/base64.c
index 90e4fb85d7d06e34829aa6b360caacfcf241fad0..53e4d65b296da7968d6d9a13e207d6fcd80515fc 100644 (file)
--- a/src/base64.c
+++ b/src/base64.c
@@ -15,7 +15,7 @@
 #include <string.h>
 
 #include <haproxy/api.h>
-#include <common/base64.h>
+#include <haproxy/base64.h>
 
 #define B64BASE        '#'             /* arbitrary chosen base value */
 #define B64CMIN        '+'

diff --git a/src/cache.c b/src/cache.c
index fac9b7d76caa134307774867cd23d46f4f1f1a2d..c4177f74fe2c18858d376b04707281c6e9cccba1 100644 (file)
--- a/src/cache.c
+++ b/src/cache.c
@@ -34,7 +34,7 @@
 
 
 #include <common/cfgparse.h>
-#include <common/hash.h>
+#include <haproxy/hash.h>
 #include <common/htx.h>
 #include <common/net_helper.h>
 

diff --git a/src/cfgparse-ssl.c b/src/cfgparse-ssl.c
index e6372fb1037f5873cf1c5cee4fc0e155683f8c83..3d1f676d11d308ad68b84133575b56475f891a25 100644 (file)
--- a/src/cfgparse-ssl.c
+++ b/src/cfgparse-ssl.c
@@ -32,7 +32,7 @@
 #include <sys/types.h>
 
 #include <haproxy/api.h>
-#include <common/base64.h>
+#include <haproxy/base64.h>
 #include <common/cfgparse.h>
 #include <common/openssl-compat.h>
 

diff --git a/src/cfgparse.c b/src/cfgparse.c
index 5fd288068c74de008717b5e980343ae1163e7c1d..da76aa99e52d2bef818860bab15a4730d2fb25b7 100644 (file)
--- a/src/cfgparse.c
+++ b/src/cfgparse.c
@@ -36,7 +36,7 @@
 #include <haproxy/api.h>
 #include <common/cfgparse.h>
 #include <common/chunk.h>
-#include <common/errors.h>
+#include <haproxy/errors.h>
 #include <common/memory.h>
 #include <common/standard.h>
 #include <common/time.h>

diff --git a/src/cli.c b/src/cli.c
index 9212651d97009227f7f4fc1a496f5406b939dc61..13fc2049c4d06c8a7f9f038d16104f3b355ac0bf 100644 (file)
--- a/src/cli.c
+++ b/src/cli.c
@@ -36,7 +36,7 @@
 #include <common/time.h>
 #include <common/uri_auth.h>
 #include <haproxy/version.h>
-#include <common/base64.h>
+#include <haproxy/base64.h>
 
 #include <types/applet.h>
 #include <types/global.h>

diff --git a/src/connection.c b/src/connection.c
index fd6a27498e3474bae0631800173613a25326dc0b..a30a2dd97360a9f0062e00705409011dd132801e 100644 (file)
--- a/src/connection.c
+++ b/src/connection.c
@@ -15,7 +15,7 @@
 #include <haproxy/api.h>
 #include <common/cfgparse.h>
 #include <common/namespace.h>
-#include <common/hash.h>
+#include <haproxy/hash.h>
 #include <common/net_helper.h>
 
 #include <proto/connection.h>

diff --git a/src/da.c b/src/da.c
index 73e59db390f30fd754b734aa2b8ba1d0ca204b8a..c783fb15229e3bbeb38ae4a34fd2947a6f2d1b9a 100644 (file)
--- a/src/da.c
+++ b/src/da.c
@@ -2,7 +2,7 @@
 
 #include <haproxy/api.h>
 #include <common/cfgparse.h>
-#include <common/errors.h>
+#include <haproxy/errors.h>
 #include <common/http.h>
 #include <types/global.h>
 #include <proto/arg.h>

diff --git a/src/dns.c b/src/dns.c
index 92c6dda63c6d313bd59caf7671a72d2716a12af8..b11622c263fef7a4e04bf06b2a88ac8868c4685e 100644 (file)
--- a/src/dns.c
+++ b/src/dns.c
@@ -21,7 +21,7 @@
 
 #include <haproxy/api.h>
 #include <common/cfgparse.h>
-#include <common/errors.h>
+#include <haproxy/errors.h>
 #include <common/time.h>
 #include <common/ticks.h>
 #include <common/net_helper.h>

diff --git a/src/fcgi-app.c b/src/fcgi-app.c
index d0992283ae047ac7752d517aa28bdfcea906bb0a..5b116803d5deaf5c7b0e300cbf7de7af8317e68b 100644 (file)
--- a/src/fcgi-app.c
+++ b/src/fcgi-app.c
@@ -13,7 +13,7 @@
 #include <haproxy/api.h>
 #include <common/chunk.h>
 #include <common/cfgparse.h>
-#include <common/errors.h>
+#include <haproxy/errors.h>
 #include <common/standard.h>
 
 #include <types/global.h>

diff --git a/src/filters.c b/src/filters.c
index 9b6bd5b3e698fd8fa6a450142e56d294fdf984a8..3d7bb456207fea27342a51b457178760d08c836d 100644 (file)
--- a/src/filters.c
+++ b/src/filters.c
@@ -14,7 +14,7 @@
 #include <common/buffer.h>
 #include <common/debug.h>
 #include <common/cfgparse.h>
-#include <common/errors.h>
+#include <haproxy/errors.h>
 #include <common/htx.h>
 #include <common/namespace.h>
 #include <common/standard.h>

diff --git a/src/haproxy.c b/src/haproxy.c
index 2351aed33502e875329c495eec0db7aa60b1864b..d2bb0de64d7c2b17583865594a0b9bf73393178d 100644 (file)
--- a/src/haproxy.c
+++ b/src/haproxy.c
@@ -81,10 +81,10 @@
 #include <haproxy/api.h>
 #include <import/sha1.h>
 
-#include <common/base64.h>
+#include <haproxy/base64.h>
 #include <common/cfgparse.h>
 #include <common/chunk.h>
-#include <common/errors.h>
+#include <haproxy/errors.h>
 #include <common/memory.h>
 #include <common/mini-clist.h>
 #include <common/namespace.h>

diff --git a/src/hash.c b/src/hash.c
index 8984ef36d09d860c4352943dbcebb7b04e1e202d..a20b90cc04c690bad57520b0f2d5baef61b5649a 100644 (file)
--- a/src/hash.c
+++ b/src/hash.c
@@ -14,7 +14,7 @@
  */
 
 
-#include <common/hash.h>
+#include <haproxy/hash.h>
 
 
 unsigned int hash_wt6(const void *input, int len)

diff --git a/src/http_ana.c b/src/http_ana.c
index bd2db1fe743dd0c3d1ed1a3286dac7170cf1d13f..4635c38e1daf7c94f0ba28d4360f66ed88085d6c 100644 (file)
--- a/src/http_ana.c
+++ b/src/http_ana.c
@@ -11,7 +11,7 @@
  */
 
 #include <haproxy/api.h>
-#include <common/base64.h>
+#include <haproxy/base64.h>
 #include <common/debug.h>
 #include <common/htx.h>
 #include <common/net_helper.h>

diff --git a/src/http_fetch.c b/src/http_fetch.c
index 0ea509c41ed9279742145c56e14b4575aa7bdec8..5d7ae8828e3a388800cef478a8e72e88c2d6b0ed 100644 (file)
--- a/src/http_fetch.c
+++ b/src/http_fetch.c
@@ -17,7 +17,7 @@
 #include <time.h>
 
 #include <haproxy/api.h>
-#include <common/base64.h>
+#include <haproxy/base64.h>
 #include <common/chunk.h>
 #include <common/debug.h>
 #include <common/h1.h>

diff --git a/src/listener.c b/src/listener.c
index ab9f84b567dfba290f0fdb4da7030108499e6ecf..a1b6ae455d724d77d6b2da1c2a4ca585c315a5c3 100644 (file)
--- a/src/listener.c
+++ b/src/listener.c
@@ -20,7 +20,7 @@
 
 #include <haproxy/api.h>
 #include <common/cfgparse.h>
-#include <common/errors.h>
+#include <haproxy/errors.h>
 #include <common/mini-clist.h>
 #include <common/standard.h>
 #include <common/time.h>

diff --git a/src/mworker-prog.c b/src/mworker-prog.c
index f445c7fa69c64d2248005e901d930ca27221a91c..4951063d51ec3c0e3a39da710654d304a3690f05 100644 (file)
--- a/src/mworker-prog.c
+++ b/src/mworker-prog.c
@@ -22,7 +22,7 @@
 
 #include <haproxy/api.h>
 #include <common/cfgparse.h>
-#include <common/errors.h>
+#include <haproxy/errors.h>
 
 #include <proto/log.h>
 #include <proto/mworker.h>

diff --git a/src/namespace.c b/src/namespace.c
index a6d208082d2c255378075c284ec715aa8235cc27..6165994ec9c010c96d2ad1ae5df3f164cc07da5b 100644 (file)
--- a/src/namespace.c
+++ b/src/namespace.c
@@ -12,8 +12,8 @@
 
 #include <haproxy/api.h>
 #include <common/namespace.h>
-#include <common/hash.h>
-#include <common/errors.h>
+#include <haproxy/hash.h>
+#include <haproxy/errors.h>
 #include <proto/log.h>
 #include <proto/signal.h>
 #include <types/global.h>

diff --git a/src/proto_sockpair.c b/src/proto_sockpair.c
index 8a0773c5b42a96223050431a707e898f95479d71..ff642f26d49cd4a556a27a5feeaaf3c4c4cd70f5 100644 (file)
--- a/src/proto_sockpair.c
+++ b/src/proto_sockpair.c
@@ -28,7 +28,7 @@
 
 #include <haproxy/api.h>
 #include <common/debug.h>
-#include <common/errors.h>
+#include <haproxy/errors.h>
 #include <common/mini-clist.h>
 #include <common/standard.h>
 #include <common/time.h>

diff --git a/src/proto_tcp.c b/src/proto_tcp.c
index f1e65c5f6c019fdf63d5a07a0e12725cda7ffdbc..063f4b363819ce1a7550df34e86c1385eb3aaa44 100644 (file)
--- a/src/proto_tcp.c
+++ b/src/proto_tcp.c
@@ -32,7 +32,7 @@
 
 #include <haproxy/api.h>
 #include <common/debug.h>
-#include <common/errors.h>
+#include <haproxy/errors.h>
 #include <common/mini-clist.h>
 #include <common/standard.h>
 #include <common/namespace.h>

diff --git a/src/proto_uxst.c b/src/proto_uxst.c
index e9b85dd88b70a5d7c9290e771b4ac2c23dfac98c..5fc976a63aa528604d03a9b3e6fd3a19d831515e 100644 (file)
--- a/src/proto_uxst.c
+++ b/src/proto_uxst.c
@@ -28,7 +28,7 @@
 
 #include <haproxy/api.h>
 #include <common/debug.h>
-#include <common/errors.h>
+#include <haproxy/errors.h>
 #include <common/mini-clist.h>
 #include <common/standard.h>
 #include <common/time.h>

diff --git a/src/protocol.c b/src/protocol.c
index 6c4341e34c4df791efcf27e41e7b6efc229ba768..3a11bddf6c897bf7cfd945fe5502bd08faf7a739 100644 (file)
--- a/src/protocol.c
+++ b/src/protocol.c
@@ -14,7 +14,7 @@
 #include <sys/socket.h>
 
 #include <haproxy/api.h>
-#include <common/errors.h>
+#include <haproxy/errors.h>
 #include <common/mini-clist.h>
 #include <common/standard.h>
 

diff --git a/src/proxy.c b/src/proxy.c
index a62df4d0fd09bd572a4bbe9ea3fdcadd226ebb60..b5bc5ae9dacd2e0d46bf320b68e907baf6ba6533 100644 (file)
--- a/src/proxy.c
+++ b/src/proxy.c
@@ -19,7 +19,7 @@
 
 #include <haproxy/api.h>
 #include <common/cfgparse.h>
-#include <common/errors.h>
+#include <haproxy/errors.h>
 #include <common/memory.h>
 #include <common/time.h>
 

diff --git a/src/sample.c b/src/sample.c
index e4841fd9ce24dc0833c8a9df3fdfe8ef02099b7e..0715e146898c103111f963df7a994a7d6ef667c9 100644 (file)
--- a/src/sample.c
+++ b/src/sample.c
@@ -20,12 +20,12 @@
 #include <types/global.h>
 
 #include <common/chunk.h>
-#include <common/hash.h>
+#include <haproxy/hash.h>
 #include <common/http.h>
 #include <common/net_helper.h>
 #include <common/standard.h>
 #include <common/uri_auth.h>
-#include <common/base64.h>
+#include <haproxy/base64.h>
 
 #include <proto/arg.h>
 #include <proto/auth.h>

diff --git a/src/server.c b/src/server.c
index 9d6e7a6a09a95077ebe4c740fa2b288ac1b29012..791747c3128c478f4be922b2d5d9ea9e888f8c2f 100644 (file)
--- a/src/server.c
+++ b/src/server.c
@@ -18,7 +18,7 @@
 #include <import/xxhash.h>
 
 #include <common/cfgparse.h>
-#include <common/errors.h>
+#include <haproxy/errors.h>
 #include <common/namespace.h>
 #include <common/time.h>
 

diff --git a/src/ssl_ckch.c b/src/ssl_ckch.c
index 4a5f1c1150cb93d2c9e51cfb3dcd6df520ec8f91..9011df9bcb79c3eee5e3d4607d4f947f2f0a497a 100644 (file)
--- a/src/ssl_ckch.c
+++ b/src/ssl_ckch.c
@@ -21,8 +21,8 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 
-#include <common/base64.h>
-#include <common/errors.h>
+#include <haproxy/base64.h>
+#include <haproxy/errors.h>
 #include <common/standard.h>
 
 #include <import/ebsttree.h>

diff --git a/src/ssl_crtlist.c b/src/ssl_crtlist.c
index 38cffc8053dcd59a37ce8e5c3d350b192fcf46ac..1d77362f47f0703a1d0f3bc5dad98e3b86d6e416 100644 (file)
--- a/src/ssl_crtlist.c
+++ b/src/ssl_crtlist.c
@@ -15,7 +15,7 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 
-#include <common/errors.h>
+#include <haproxy/errors.h>
 #include <common/standard.h>
 
 #include <dirent.h>

diff --git a/src/ssl_sock.c b/src/ssl_sock.c
index 79e81d7ba8c0c575e58603e59ca047a09b14197d..39e4f22d2d2169dbcd30fd68e209eab42bf9bbfe 100644 (file)
--- a/src/ssl_sock.c
+++ b/src/ssl_sock.c
@@ -47,12 +47,12 @@
 #include <common/buffer.h>
 #include <common/chunk.h>
 #include <common/debug.h>
-#include <common/errors.h>
+#include <haproxy/errors.h>
 #include <common/openssl-compat.h>
 #include <common/standard.h>
 #include <common/ticks.h>
 #include <common/time.h>
-#include <common/base64.h>
+#include <haproxy/base64.h>
 
 #include <import/ebpttree.h>
 #include <import/ebsttree.h>

diff --git a/src/stats.c b/src/stats.c
index 8cb1840eaae5082a338e586259a7a1e53374ca83..08879256cb5c27b49bbca9d3b665d690973374c8 100644 (file)
--- a/src/stats.c
+++ b/src/stats.c
@@ -36,7 +36,7 @@
 #include <common/time.h>
 #include <common/uri_auth.h>
 #include <haproxy/version.h>
-#include <common/base64.h>
+#include <haproxy/base64.h>
 
 #include <types/applet.h>
 #include <types/cli.h>

diff --git a/src/uri_auth.c b/src/uri_auth.c
index 06266f338b4e08a6ecf1c10bad8fa2441849c6b5..a2c14261596c10e0a093533b6e0a844ca3e2141f 100644 (file)
--- a/src/uri_auth.c
+++ b/src/uri_auth.c
@@ -14,7 +14,7 @@
 #include <string.h>
 
 #include <haproxy/api.h>
-#include <common/base64.h>
+#include <haproxy/base64.h>
 #include <common/uri_auth.h>
 
 #include <types/stats.h>

diff --git a/src/wurfl.c b/src/wurfl.c
index f5de52af55d14d2c57db1484520cc7df79e4047a..8869461f49284c87b361c80bfe31a677852143a6 100644 (file)
--- a/src/wurfl.c
+++ b/src/wurfl.c
@@ -5,7 +5,7 @@
 #include <common/cfgparse.h>
 #include <common/chunk.h>
 #include <common/buffer.h>
-#include <common/errors.h>
+#include <haproxy/errors.h>
 #include <types/global.h>
 #include <proto/arg.h>
 #include <proto/log.h>