RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2025-03-08 04:18:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

CLEANUP: muxes: Remove useless if condition in show_fd function

Browse Source 
In H1, H2 and FCGI muxes, in the show_fd function, there is duplicated test on
the stream's subs field.

This patch fixes the issue #1142. It may be backported as far as 2.2.
This commit is contained in:
Christopher Faulet 2021-02-25 10:06:29 +01:00
parent 456f45f301
commit 6c93c4ef08
3 changed files with 22 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/mux_fcgi.c
View File

@ -4125,7 +4125,6 @@ static int fcgi_show_fd(struct buffer *msg, struct connection *conn)
chunk_appendf(msg, " .cs.flg=0x%08x .cs.data=%p",
fstrm->cs->flags, fstrm->cs->data);
chunk_appendf(&trash, " .subs=%p", fstrm->subs);
if (fstrm->subs) {
if (fstrm->subs) {
chunk_appendf(&trash, "(ev=%d tl=%p", fstrm->subs->events, fstrm->subs->tasklet);
chunk_appendf(&trash, " tl.calls=%d tl.ctx=%p tl.fct=",
@ -4135,7 +4134,6 @@ static int fcgi_show_fd(struct buffer *msg, struct connection *conn)
chunk_appendf(&trash, ")");
}
}
}
return 0;
}

2
src/mux_h1.c
View File

@ -3539,7 +3539,6 @@ static int h1_show_fd(struct buffer *msg, struct connection *conn)
h1s->cs->flags, h1s->cs->data);
chunk_appendf(&trash, " .subs=%p", h1s->subs);
if (h1s->subs) {
if (h1s->subs) {
chunk_appendf(&trash, "(ev=%d tl=%p", h1s->subs->events, h1s->subs->tasklet);
chunk_appendf(&trash, " tl.calls=%d tl.ctx=%p tl.fct=",
@ -3551,7 +3550,6 @@ static int h1_show_fd(struct buffer *msg, struct connection *conn)
chunk_appendf(&trash, ")");
}
}
}
return ret;
}

2
src/mux_h2.c
View File

@ -6494,7 +6494,6 @@ static int h2_show_fd(struct buffer *msg, struct connection *conn)
h2s->cs->flags, h2s->cs->data);
chunk_appendf(&trash, " .subs=%p", h2s->subs);
if (h2s->subs) {
if (h2s->subs) {
chunk_appendf(&trash, "(ev=%d tl=%p", h2s->subs->events, h2s->subs->tasklet);
chunk_appendf(&trash, " tl.calls=%d tl.ctx=%p tl.fct=",
@ -6506,7 +6505,6 @@ static int h2_show_fd(struct buffer *msg, struct connection *conn)
chunk_appendf(&trash, ")");
}
}
}
return ret;
}