gamzinav/haproxy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CLEANUP: stconn: rename __cs_endp_target() to __sc_endp()

Browse Source 
The function returns the real stream endpoint so since there's no more
confusion around the terminology, let's drop "target".
This commit is contained in:
Willy Tarreau 2022-05-18 17:56:13 +02:00
parent 8e7c6e6907
commit fa57cc7b20
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/haproxy/conn_stream.h
View File

@ -124,8 +124,8 @@ static forceinline uint sc_ep_get(const struct stconn *sc)
} }
/* Returns the endpoint target without any control */ /* Returns the stream endpoint from an connector, without any control */
static inline void *__cs_endp_target(const struct stconn *cs) static inline void *__sc_endp(const struct stconn *cs)
{ {
return cs->sedesc->se; return cs->sedesc->se;
} }
@ -161,7 +161,7 @@ static inline const struct mux_ops *sc_mux_ops(const struct stconn *cs)
*/ */
static inline void *__sc_mux_strm(const struct stconn *cs) static inline void *__sc_mux_strm(const struct stconn *cs)
{ {
return __cs_endp_target(cs); return __sc_endp(cs);
} }
static inline struct appctx *sc_mux_strm(const struct stconn *cs) static inline struct appctx *sc_mux_strm(const struct stconn *cs)
{ {
@ -176,7 +176,7 @@ static inline struct appctx *sc_mux_strm(const struct stconn *cs)
*/ */
static inline struct appctx *__sc_appctx(const struct stconn *cs) static inline struct appctx *__sc_appctx(const struct stconn *cs)
{ {
return __cs_endp_target(cs); return __sc_endp(cs);
} }
static inline struct appctx *sc_appctx(const struct stconn *cs) static inline struct appctx *sc_appctx(const struct stconn *cs)
{ {

2
src/conn_stream.c
View File

@ -443,7 +443,7 @@ int cs_reset_endp(struct stconn *cs)
BUG_ON(!cs->app); BUG_ON(!cs->app);
sc_ep_clr(cs, SE_FL_ERROR); sc_ep_clr(cs, SE_FL_ERROR);
if (!__cs_endp_target(cs)) { if (!__sc_endp(cs)) {
/* endpoint not attached or attached to a mux with no /* endpoint not attached or attached to a mux with no
* target. Thus the endpoint will not be release but just * target. Thus the endpoint will not be release but just
* reset. The app is still attached, the cs will not be * reset. The app is still attached, the cs will not be