[PATCH 4/9] CLEANUP: stream: Reduce duplication in `stream_generate_unique_id()`

[Tim Duesterhus]

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

Reviewed-by: Volker Dusch <git...@wallbash.com>
---
 src/stream.c | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/stream.c b/src/stream.c
index ca12f14e8..a3520b750 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;
                size_t len;
 
@@ -3105,9 +3102,9 @@ struct ist stream_generate_unique_id(struct stream *strm, 
struct lf_expr *format
 
                len = build_logline(strm, unique_id, UNIQUEID_LEN, format);
                strm->unique_id = ist2(unique_id, len);
-
-               return strm->unique_id;
        }
+
+       return strm->unique_id;
 }
 
 /************************************************************************/
-- 
2.53.0