BUG/MINOR: xprt_qstrm: fix conflicting prototype

This patch adds the missing include of xprt_qstrm header into its
companion source file. This helped to detect an incoherence in the
xprt_qstrm_xfer_rxbuf() prototype which is now fixed.

Header files is also updated with mandatory include statements and
forward declaration.

No backport needed.

diff --git a/include/haproxy/xprt_qstrm.h b/include/haproxy/xprt_qstrm.h
index f8af655b874b645faf40c1a0fee71dd12ac0811d..96618f6359bf43b24251fa3609bd7ea6718c9b78 100644 (file)
--- a/include/haproxy/xprt_qstrm.h
+++ b/include/haproxy/xprt_qstrm.h
@@ -1,9 +1,14 @@
 #ifndef _HAPROXY_XPRT_QSTRM_H
 #define _HAPROXY_XPRT_QSTRM_H
 
+#include <stddef.h>
+
+struct buffer;
+struct quic_transport_params;
+
 const struct quic_transport_params *xprt_qstrm_lparams(const void *context);
 const struct quic_transport_params *xprt_qstrm_rparams(const void *context);
 
-size_t xprt_qstrm_xfer_rxbuf(const void *context, struct buffer *out);
+size_t xprt_qstrm_xfer_rxbuf(void *context, struct buffer *out);
 
 #endif /* _HAPROXY_XPRT_QSTRM_H */

diff --git a/src/xprt_qstrm.c b/src/xprt_qstrm.c
index e37de2322ff6142ff0ee4fdba40e4b18b63f7465..829ddf393484e42335a6eab50817144aa6061930 100644 (file)
--- a/src/xprt_qstrm.c
+++ b/src/xprt_qstrm.c
@@ -1,3 +1,5 @@
+#include <haproxy/xprt_qstrm.h>
+
 #include <haproxy/api.h>
 #include <haproxy/buf.h>
 #include <haproxy/connection.h>