From: Christopher Faulet <cfaulet@haproxy.com>
Date: Tue, 22 Mar 2022 14:28:36 +0000 (+0100)
Subject: REORG: Initialize the conn-stream by hand in cs_init()
X-Git-Tag: v2.6-dev6~105
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bb772d09f579cc366c0aadf832ad3f9efffee983;p=thirdparty%2Fhaproxy.git

REORG: Initialize the conn-stream by hand in cs_init()

The function cs_init() is only called by cs_new(). The conn-stream
initialization will be reviewed. It is easier to do it in cs_new() instead
of using a dedicated function. cs_new() is pretty simple, there is no reason
to split the code in this case.
---

diff --git a/include/haproxy/conn_stream.h b/include/haproxy/conn_stream.h
index c03362d642..d7d9fe1631 100644
--- a/include/haproxy/conn_stream.h
+++ b/include/haproxy/conn_stream.h
@@ -42,20 +42,6 @@ int cs_attach_app(struct conn_stream *cs, enum obj_type *app);
 void cs_detach_endp(struct conn_stream *cs);
 void cs_detach_app(struct conn_stream *cs);
 
-/*
- * Initializes all required fields for a new conn_strema.
- */
-static inline void cs_init(struct conn_stream *cs)
-{
-	cs->obj_type = OBJ_TYPE_CS;
-	cs->flags = CS_FL_NONE;
-	cs->end = NULL;
-	cs->app = NULL;
-	cs->ctx = NULL;
-	cs->si = NULL;
-	cs->data_cb = NULL;
-}
-
 /* Returns the connection from a cs if the endpoint is a mux stream. Otherwise
  * NULL is returned. __cs_conn() returns the connection without any control
  * while cs_conn() check the endpoint type.
diff --git a/src/conn_stream.c b/src/conn_stream.c
index 01541a598b..53b2992df7 100644
--- a/src/conn_stream.c
+++ b/src/conn_stream.c
@@ -29,7 +29,15 @@ struct conn_stream *cs_new()
 	cs = pool_alloc(pool_head_connstream);
 	if (unlikely(!cs))
 		return NULL;
-	cs_init(cs);
+
+	cs->obj_type = OBJ_TYPE_CS;
+	cs->flags = CS_FL_NONE;
+	cs->end = NULL;
+	cs->app = NULL;
+	cs->ctx = NULL;
+	cs->si = NULL;
+	cs->data_cb = NULL;
+
 	return cs;
 }