RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2024-12-27 15:12:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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.
This commit is contained in:
Christopher Faulet 2022-03-22 15:28:36 +01:00
parent 9388204db1
commit bb772d09f5
2 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
include/haproxy/conn_stream.h
View File

@ -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.

10
src/conn_stream.c
View File

@ -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;
}