From: Tim Duesterhus <tim@bastelstu.be>
Date: Fri, 3 Apr 2026 21:28:59 +0000 (+0200)
Subject: CLEANUP: stream: Reduce duplication in `stream_generate_unique_id()`
X-Git-Tag: v3.4-dev9~54
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=44a461a19f55fc94952db8ad64e4a611cf09eb65;p=thirdparty%2Fhaproxy.git

CLEANUP: stream: Reduce duplication in `stream_generate_unique_id()`

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

diff --git a/src/stream.c b/src/stream.c
index 0afa3059f..eb13cf277 100644
--- a/src/stream.c
+++ b/src/stream.c
@@ -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;
 }
 
 /************************************************************************/