From b7ce79c814aff94912d3750a137877fc45da230c Mon Sep 17 00:00:00 2001 From: Amaury Denoyelle Date: Thu, 24 Nov 2022 10:51:19 +0100 Subject: [PATCH] MINOR: mux-quic: rename duplicate function names qc_rcv_buf and qc_snd_buf are names used for static functions in both quic-sock and quic-mux. To remove this ambiguity, slightly modify names used in MUX code. In the future, we should properly define a unique prefix for all QUIC MUX functions to avoid such problem in the future. This change is part of quic-conn owned socket implementation. It may be backported to 2.7 after a period of observation. --- src/mux_quic.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/mux_quic.c b/src/mux_quic.c index e97621caa..89da1e697 100644 --- a/src/mux_quic.c +++ b/src/mux_quic.c @@ -2097,8 +2097,8 @@ static void qc_detach(struct sedesc *sd) } /* Called from the upper layer, to receive data */ -static size_t qc_rcv_buf(struct stconn *sc, struct buffer *buf, - size_t count, int flags) +static size_t qc_recv_buf(struct stconn *sc, struct buffer *buf, + size_t count, int flags) { struct qcs *qcs = __sc_mux_strm(sc); size_t ret = 0; @@ -2136,8 +2136,8 @@ static size_t qc_rcv_buf(struct stconn *sc, struct buffer *buf, return ret; } -static size_t qc_snd_buf(struct stconn *sc, struct buffer *buf, - size_t count, int flags) +static size_t qc_send_buf(struct stconn *sc, struct buffer *buf, + size_t count, int flags) { struct qcs *qcs = __sc_mux_strm(sc); size_t ret; @@ -2297,8 +2297,8 @@ static const struct mux_ops qc_ops = { .init = qc_init, .destroy = qc_destroy, .detach = qc_detach, - .rcv_buf = qc_rcv_buf, - .snd_buf = qc_snd_buf, + .rcv_buf = qc_recv_buf, + .snd_buf = qc_send_buf, .subscribe = qc_subscribe, .unsubscribe = qc_unsubscribe, .wake = qc_wake,