From: Willy Tarreau <w@1wt.eu>
Date: Wed, 3 Jun 2020 16:23:19 +0000 (+0200)
Subject: REORG: include: move dict.h to hparoxy/dict{,-t}.h
X-Git-Tag: v2.2-dev9~91
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3afc4c4bb09313c37a3e30899dbf916c1c220326;p=thirdparty%2Fhaproxy.git

REORG: include: move dict.h to hparoxy/dict{,-t}.h

This was entirely free-standing. haproxy/api-t.h was added for size_t.
---

diff --git a/include/haproxy/dict-t.h b/include/haproxy/dict-t.h
new file mode 100644
index 0000000000..b026d305ed
--- /dev/null
+++ b/include/haproxy/dict-t.h
@@ -0,0 +1,46 @@
+/*
+ * include/haproxy/dict-t.h
+ * Dictionaries - types definitions
+ *
+ * Copyright 2019 Frédéric Lécaille <flecaille@haproxy.com>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ */
+#ifndef _HAPROXY_DICT_T_H
+#define _HAPROXY_DICT_T_H
+
+#include <import/ebpttree.h>
+#include <haproxy/api-t.h>
+#include <haproxy/thread.h>
+
+struct dict_entry {
+	struct ebpt_node value;
+	unsigned int refcount;
+	size_t len;
+};
+
+struct dict {
+	const char *name;
+	struct eb_root values;
+	__decl_thread(HA_RWLOCK_T rwlock);
+};
+
+#endif /* _HAPROXY_DICT_T_H */
diff --git a/include/haproxy/dict.h b/include/haproxy/dict.h
new file mode 100644
index 0000000000..59e81352c6
--- /dev/null
+++ b/include/haproxy/dict.h
@@ -0,0 +1,35 @@
+/*
+ * include/haproxy/dict.h
+ * Dictionaries - functions prototypes
+ *
+ * Copyright 2019 Frédéric Lécaille <flecaille@haproxy.com>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ */
+#ifndef _HAPROXY_DICT_H
+#define _HAPROXY_DICT_H
+
+#include <haproxy/dict-t.h>
+
+struct dict *new_dict(const char *name);
+struct dict_entry *dict_insert(struct dict *d, char *str);
+
+#endif  /* _HAPROXY_DICT_H */
diff --git a/include/proto/dict.h b/include/proto/dict.h
deleted file mode 100644
index 26f48decb4..0000000000
--- a/include/proto/dict.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#ifndef _PROTO_DICT_H
-#define _PROTO_DICT_H
-
-#include <types/dict.h>
-
-struct dict *new_dict(const char *name);
-struct dict_entry *dict_insert(struct dict *d, char *str);
-
-#endif  /* _PROTO_DICT_H */
diff --git a/include/proto/stick_table.h b/include/proto/stick_table.h
index 7f35cfa1c7..ebc4d67544 100644
--- a/include/proto/stick_table.h
+++ b/include/proto/stick_table.h
@@ -23,12 +23,12 @@
 #ifndef _PROTO_STICK_TABLE_H
 #define _PROTO_STICK_TABLE_H
 
+#include <haproxy/dict-t.h>
 #include <haproxy/errors.h>
 #include <haproxy/tools.h>
 #include <haproxy/ticks.h>
 #include <haproxy/time.h>
 #include <types/stick_table.h>
-#include <types/dict.h>
 
 extern struct stktable *stktables_list;
 
diff --git a/include/types/dict.h b/include/types/dict.h
deleted file mode 100644
index def6355233..0000000000
--- a/include/types/dict.h
+++ /dev/null
@@ -1,19 +0,0 @@
-#ifndef _TYPES_DICT_H
-#define _TYPES_DICT_H
-
-#include <haproxy/thread.h>
-#include <import/ebpttree.h>
-
-struct dict_entry {
-	struct ebpt_node value;
-	unsigned int refcount;
-	size_t len;
-};
-
-struct dict {
-	const char *name;
-	struct eb_root values;
-	__decl_thread(HA_RWLOCK_T rwlock);
-};
-
-#endif /* _TYPES_DICT_H */
diff --git a/include/types/peers.h b/include/types/peers.h
index 8961d7e97d..33d40ec28b 100644
--- a/include/types/peers.h
+++ b/include/types/peers.h
@@ -27,11 +27,11 @@
 #include <netinet/in.h>
 #include <arpa/inet.h>
 
+#include <haproxy/dict-t.h>
 #include <haproxy/api-t.h>
 #include <haproxy/list-t.h>
 #include <import/eb32tree.h>
 
-#include <types/dict.h>
 
 struct shared_table {
 	struct stktable *table;       /* stick table to sync */
diff --git a/include/types/stick_table.h b/include/types/stick_table.h
index ccd1dcb656..e34504800a 100644
--- a/include/types/stick_table.h
+++ b/include/types/stick_table.h
@@ -29,8 +29,8 @@
 #include <import/ebtree.h>
 #include <import/ebmbtree.h>
 #include <import/eb32tree.h>
+#include <haproxy/dict-t.h>
 #include <haproxy/pool-t.h>
-#include <types/dict.h>
 #include <haproxy/freq_ctr-t.h>
 #include <types/peers.h>
 #include <types/sample.h>
diff --git a/src/dict.c b/src/dict.c
index 7a9e25fa7e..50fe1eb825 100644
--- a/src/dict.c
+++ b/src/dict.c
@@ -1,9 +1,8 @@
 #include <string.h>
 
-#include <proto/dict.h>
-
 #include <import/eb32tree.h>
 #include <import/ebistree.h>
+#include <haproxy/dict.h>
 
 struct dict *new_dict(const char *name)
 {
diff --git a/src/peers.c b/src/peers.c
index ef09468244..d4011d3eec 100644
--- a/src/peers.c
+++ b/src/peers.c
@@ -21,6 +21,7 @@
 #include <sys/types.h>
 
 #include <haproxy/api.h>
+#include <haproxy/dict.h>
 #include <haproxy/net_helper.h>
 #include <haproxy/time.h>
 #include <haproxy/tools.h>
@@ -36,7 +37,6 @@
 #include <proto/applet.h>
 #include <proto/channel.h>
 #include <proto/cli.h>
-#include <proto/dict.h>
 #include <proto/fd.h>
 #include <proto/frontend.h>
 #include <proto/log.h>
diff --git a/src/server.c b/src/server.c
index 6f14e5af6e..324dc97dda 100644
--- a/src/server.c
+++ b/src/server.c
@@ -18,13 +18,13 @@
 #include <import/xxhash.h>
 
 #include <common/cfgparse.h>
+#include <haproxy/dict-t.h>
 #include <haproxy/errors.h>
 #include <haproxy/namespace.h>
 #include <haproxy/time.h>
 
 #include <types/applet.h>
 #include <types/cli.h>
-#include <types/dict.h>
 #include <types/global.h>
 #include <types/cli.h>
 #include <types/dns.h>
diff --git a/src/stream.c b/src/stream.c
index 27030eaef6..f0e2c88427 100644
--- a/src/stream.c
+++ b/src/stream.c
@@ -16,6 +16,7 @@
 
 #include <haproxy/api.h>
 #include <common/cfgparse.h>
+#include <haproxy/dict.h>
 #include <haproxy/dynbuf.h>
 #include <haproxy/istbuf.h>
 #include <haproxy/thread.h>
@@ -38,7 +39,6 @@
 #include <proto/checks.h>
 #include <proto/cli.h>
 #include <proto/connection.h>
-#include <proto/dict.h>
 #include <proto/dns.h>
 #include <proto/stats.h>
 #include <proto/fd.h>