REORG: include: move channel.h to haproxy/channel{,-t}.h
The files were moved with no change. The callers were cleaned up a bit
and a few of them had channel.h removed since not needed.
diff --git a/include/types/channel.h b/include/haproxy/channel-t.h
similarity index 98%
rename from include/types/channel.h
rename to include/haproxy/channel-t.h
index d3823f2..affa942 100644
--- a/include/types/channel.h
+++ b/include/haproxy/channel-t.h
@@ -1,5 +1,5 @@
/*
- * include/types/channel.h
+ * include/haproxy/channel-t.h
* Channel management definitions, macros and inline functions.
*
* Copyright (C) 2000-2014 Willy Tarreau - w@1wt.eu
@@ -19,11 +19,11 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef _TYPES_CHANNEL_H
-#define _TYPES_CHANNEL_H
+#ifndef _HAPROXY_CHANNEL_T_H
+#define _HAPROXY_CHANNEL_T_H
-#include <haproxy/api-t.h>
#include <haproxy/buf-t.h>
+#include <haproxy/api-t.h>
/* The CF_* macros designate Channel Flags, which may be ORed in the bit field
* member 'flags' in struct channel. Here we have several types of flags :
@@ -301,7 +301,7 @@
long.
*/
-#endif /* _TYPES_CHANNEL_H */
+#endif /* _HAPROXY_CHANNEL_T_H */
/*
* Local variables:
diff --git a/include/proto/channel.h b/include/haproxy/channel.h
similarity index 98%
rename from include/proto/channel.h
rename to include/haproxy/channel.h
index 3ff81ad..96f076e 100644
--- a/include/proto/channel.h
+++ b/include/haproxy/channel.h
@@ -1,8 +1,8 @@
/*
- * include/proto/channel.h
+ * include/haproxy/channel.h
* Channel management definitions, macros and inline functions.
*
- * Copyright (C) 2000-2014 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,28 +19,21 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef _PROTO_CHANNEL_H
-#define _PROTO_CHANNEL_H
-
-#include <inttypes.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#ifndef _HAPROXY_CHANNEL_H
+#define _HAPROXY_CHANNEL_H
#include <haproxy/api.h>
-#include <haproxy/chunk.h>
+#include <haproxy/channel-t.h>
#include <haproxy/dynbuf.h>
#include <haproxy/global.h>
#include <haproxy/htx.h>
#include <haproxy/stream_interface-t.h>
+#include <haproxy/task.h>
#include <haproxy/ticks.h>
#include <haproxy/time.h>
-#include <types/channel.h>
-#include <types/stream.h>
-
#include <proto/stream.h>
-#include <haproxy/task.h>
+#include <types/stream.h>
/* perform minimal intializations, report 0 in case of error, 1 if OK. */
int init_channel();
@@ -1020,7 +1013,7 @@
}
-#endif /* _PROTO_CHANNEL_H */
+#endif /* _HAPROXY_CHANNEL_H */
/*
* Local variables:
diff --git a/include/haproxy/cli.h b/include/haproxy/cli.h
index 36bcb2b..6257c24 100644
--- a/include/haproxy/cli.h
+++ b/include/haproxy/cli.h
@@ -24,9 +24,9 @@
#define _HAPROXY_CLI_H
#include <haproxy/applet-t.h>
+#include <haproxy/channel-t.h>
#include <haproxy/cli-t.h>
#include <haproxy/global.h>
-#include <types/channel.h>
#include <types/stream.h>
diff --git a/include/haproxy/http_fetch.h b/include/haproxy/http_fetch.h
index 549d773..c409b16 100644
--- a/include/haproxy/http_fetch.h
+++ b/include/haproxy/http_fetch.h
@@ -24,9 +24,9 @@
#include <haproxy/arg-t.h>
#include <haproxy/api.h>
+#include <haproxy/channel-t.h>
#include <haproxy/check-t.h>
#include <haproxy/sample-t.h>
-#include <types/channel.h>
struct htx *smp_prefetch_htx(struct sample *smp, struct channel *chn, struct check *check, int vol);
int val_hdr(struct arg *arg, char **err_msg);
diff --git a/include/haproxy/stream_interface.h b/include/haproxy/stream_interface.h
index 7322dd1..653ae39 100644
--- a/include/haproxy/stream_interface.h
+++ b/include/haproxy/stream_interface.h
@@ -24,9 +24,9 @@
#include <haproxy/applet.h>
#include <haproxy/api.h>
+#include <haproxy/channel.h>
#include <haproxy/connection.h>
#include <haproxy/stream_interface-t.h>
-#include <proto/channel.h>
#include <types/stream.h>
diff --git a/include/proto/filters.h b/include/proto/filters.h
index 2ece189..9e8cc74 100644
--- a/include/proto/filters.h
+++ b/include/proto/filters.h
@@ -21,14 +21,12 @@
#ifndef _PROTO_FILTERS_H
#define _PROTO_FILTERS_H
-#include <types/channel.h>
+#include <haproxy/channel.h>
#include <types/filters.h>
#include <types/http_ana.h>
#include <types/proxy.h>
#include <types/stream.h>
-#include <proto/channel.h>
-
extern const char *trace_flt_id;
extern const char *http_comp_flt_id;
extern const char *cache_store_flt_id;
diff --git a/include/proto/http_ana.h b/include/proto/http_ana.h
index 00a3812..8648865 100644
--- a/include/proto/http_ana.h
+++ b/include/proto/http_ana.h
@@ -23,8 +23,8 @@
#define _PROTO_PROTO_HTTP_H
#include <haproxy/api.h>
+#include <haproxy/channel-t.h>
#include <haproxy/htx.h>
-#include <types/channel.h>
#include <types/http_ana.h>
#include <types/stream.h>
diff --git a/include/types/http_ana.h b/include/types/http_ana.h
index 4dd8e33..6ebe772 100644
--- a/include/types/http_ana.h
+++ b/include/types/http_ana.h
@@ -22,10 +22,9 @@
#ifndef _TYPES_PROTO_HTTP_H
#define _TYPES_PROTO_HTTP_H
+#include <haproxy/channel-t.h>
#include <haproxy/api-t.h>
#include <haproxy/http-t.h>
-
-#include <types/channel.h>
#include <haproxy/http_htx-t.h>
/* These are the flags that are found in txn->flags */
diff --git a/include/types/stream.h b/include/types/stream.h
index a67d192..2a5fb77 100644
--- a/include/types/stream.h
+++ b/include/types/stream.h
@@ -29,6 +29,7 @@
#include <arpa/inet.h>
#include <haproxy/api-t.h>
+#include <haproxy/channel-t.h>
#include <haproxy/dynbuf-t.h>
#include <haproxy/hlua-t.h>
#include <haproxy/list-t.h>
@@ -37,7 +38,6 @@
#include <haproxy/stream_interface-t.h>
#include <haproxy/vars-t.h>
-#include <types/channel.h>
#include <types/filters.h>
#include <types/http_ana.h>
#include <types/proxy.h>