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.
This commit is contained in:
Amaury Denoyelle 2022-11-24 10:51:19 +01:00
parent 7c9fdd9c3a
commit b7ce79c814

View File

@ -2097,7 +2097,7 @@ static void qc_detach(struct sedesc *sd)
} }
/* Called from the upper layer, to receive data */ /* Called from the upper layer, to receive data */
static size_t qc_rcv_buf(struct stconn *sc, struct buffer *buf, static size_t qc_recv_buf(struct stconn *sc, struct buffer *buf,
size_t count, int flags) size_t count, int flags)
{ {
struct qcs *qcs = __sc_mux_strm(sc); struct qcs *qcs = __sc_mux_strm(sc);
@ -2136,7 +2136,7 @@ static size_t qc_rcv_buf(struct stconn *sc, struct buffer *buf,
return ret; return ret;
} }
static size_t qc_snd_buf(struct stconn *sc, struct buffer *buf, static size_t qc_send_buf(struct stconn *sc, struct buffer *buf,
size_t count, int flags) size_t count, int flags)
{ {
struct qcs *qcs = __sc_mux_strm(sc); struct qcs *qcs = __sc_mux_strm(sc);
@ -2297,8 +2297,8 @@ static const struct mux_ops qc_ops = {
.init = qc_init, .init = qc_init,
.destroy = qc_destroy, .destroy = qc_destroy,
.detach = qc_detach, .detach = qc_detach,
.rcv_buf = qc_rcv_buf, .rcv_buf = qc_recv_buf,
.snd_buf = qc_snd_buf, .snd_buf = qc_send_buf,
.subscribe = qc_subscribe, .subscribe = qc_subscribe,
.unsubscribe = qc_unsubscribe, .unsubscribe = qc_unsubscribe,
.wake = qc_wake, .wake = qc_wake,