From b1437234112799630048a3d76e2327072771b7a5 Mon Sep 17 00:00:00 2001 From: Amaury Denoyelle Date: Fri, 8 Jul 2022 11:53:22 +0200 Subject: [PATCH] REORG: mux-quic: rename stream initialization function Rename both qcc_open_stream_local/remote() functions to qcc_init_stream_local/remote(). This change is purely cosmetic. It will reduces the ambiguity with the soon to be implemented OPEN states for QCS instances. --- include/haproxy/mux_quic.h | 2 +- src/h3.c | 2 +- src/mux_quic.c | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/include/haproxy/mux_quic.h b/include/haproxy/mux_quic.h index 75e39a769..fbfa58c24 100644 --- a/include/haproxy/mux_quic.h +++ b/include/haproxy/mux_quic.h @@ -14,7 +14,7 @@ #include #include -struct qcs *qcc_open_stream_local(struct qcc *qcc, int bidi); +struct qcs *qcc_init_stream_local(struct qcc *qcc, int bidi); struct buffer *qc_get_buf(struct qcs *qcs, struct buffer *bptr); int qcs_subscribe(struct qcs *qcs, int event_type, struct wait_event *es); diff --git a/src/h3.c b/src/h3.c index eb930af14..074016699 100644 --- a/src/h3.c +++ b/src/h3.c @@ -1081,7 +1081,7 @@ static int h3_finalize(void *ctx) struct h3c *h3c = ctx; struct qcs *qcs; - qcs = qcc_open_stream_local(h3c->qcc, 0); + qcs = qcc_init_stream_local(h3c->qcc, 0); if (!qcs) return 0; diff --git a/src/mux_quic.c b/src/mux_quic.c index 77bce8a6e..c6652e409 100644 --- a/src/mux_quic.c +++ b/src/mux_quic.c @@ -297,7 +297,7 @@ void qcs_notify_send(struct qcs *qcs) * * Returns the allocated stream instance or NULL on error. */ -struct qcs *qcc_open_stream_local(struct qcc *qcc, int bidi) +struct qcs *qcc_init_stream_local(struct qcc *qcc, int bidi) { struct qcs *qcs; enum qcs_type type; @@ -336,7 +336,7 @@ struct qcs *qcc_open_stream_local(struct qcc *qcc, int bidi) * * Returns the allocated stream instance or NULL on error. */ -static struct qcs *qcc_open_stream_remote(struct qcc *qcc, uint64_t id) +static struct qcs *qcc_init_stream_remote(struct qcc *qcc, uint64_t id) { struct qcs *qcs = NULL; enum qcs_type type; @@ -459,7 +459,7 @@ static struct qcs *qcc_get_qcs(struct qcc *qcc, uint64_t id) } else { /* Remote stream not found - try to open it. */ - qcs = qcc_open_stream_remote(qcc, id); + qcs = qcc_init_stream_remote(qcc, id); } out: