From f8d0ab54ec0db98c10853cf580e36d09a469c346 Mon Sep 17 00:00:00 2001 From: Willy Tarreau Date: Wed, 18 May 2022 18:00:31 +0200 Subject: [PATCH] CLEANUP: stconn: rename cs_get_data_name() to sc_get_data_name() Only used twice to dump stream debug info. --- include/haproxy/conn_stream.h | 6 +++++- src/stream.c | 4 ++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/include/haproxy/conn_stream.h b/include/haproxy/conn_stream.h index ce0e673ba8..5e22fe7d03 100644 --- a/include/haproxy/conn_stream.h +++ b/include/haproxy/conn_stream.h @@ -215,7 +215,11 @@ static inline struct check *sc_check(const struct stconn *cs) return __objt_check(cs->app); return NULL; } -static inline const char *cs_get_data_name(const struct stconn *cs) + +/* Returns the name of the application layer's name for the stconn, + * or "NONE" when none is attached. + */ +static inline const char *sc_get_data_name(const struct stconn *cs) { if (!cs->app_ops) return "NONE"; diff --git a/src/stream.c b/src/stream.c index 9c10db9698..a615c74781 100644 --- a/src/stream.c +++ b/src/stream.c @@ -3317,7 +3317,7 @@ static int stats_dump_full_strm_to_buffer(struct stconn *cs, struct stream *strm conn_get_ctrl_name(conn), conn_get_xprt_name(conn), conn_get_mux_name(conn), - cs_get_data_name(scf), + sc_get_data_name(scf), obj_type_name(conn->target), obj_base_ptr(conn->target)); @@ -3356,7 +3356,7 @@ static int stats_dump_full_strm_to_buffer(struct stconn *cs, struct stream *strm conn_get_ctrl_name(conn), conn_get_xprt_name(conn), conn_get_mux_name(conn), - cs_get_data_name(scb), + sc_get_data_name(scb), obj_type_name(conn->target), obj_base_ptr(conn->target)); -- 2.47.3