upstream/haproxy
1
0
Fork 0
mirror of https://github.com/haproxy/haproxy.git synced 2026-04-13 21:06:13 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

CLEANUP: stream: Reduce duplication in stream_generate_unique_id()

Browse source 
The return value of the `if()` and `else` branch is identical. We can just move
it out of conditional paths.

Reviewed-by: Volker Dusch <github@wallbash.com>
This commit is contained in:
Tim Duesterhus 2026-04-03 23:28:59 +02:00 committed by Willy Tarreau
parent f778e6feb0
commit 44a461a19f
1 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/stream.c
View file

@ -3093,10 +3093,7 @@ INITCALL0(STG_INIT, init_stream);
*/
struct ist stream_generate_unique_id(struct stream *strm, struct lf_expr *format)
{
if (isttest(strm->unique_id)) {
return strm->unique_id;
}
else {
if (!isttest(strm->unique_id)) {
char *unique_id;
if ((unique_id = pool_alloc(pool_head_uniqueid)) == NULL)
@ -3107,9 +3104,9 @@ struct ist stream_generate_unique_id(struct stream *strm, struct lf_expr *format
*/
strm->unique_id = ist2(unique_id, 0);
strm->unique_id.len = build_logline(strm, unique_id, UNIQUEID_LEN, format);
return strm->unique_id;
}
return strm->unique_id;
}
/************************************************************************/