From: Willy Tarreau <w@1wt.eu>
Date: Tue, 17 Dec 2024 13:31:08 +0000 (+0100)
Subject: CLEANUP: stats: use ASSUME_NONNULL() to indicate that the first block exists
X-Git-Tag: v3.2-dev2~51
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1f93622779c8d2cc094134989b53431c874e1f0d;p=thirdparty%2Fhaproxy.git

CLEANUP: stats: use ASSUME_NONNULL() to indicate that the first block exists

In stats_scope_ptr(), the validity of blk() was assumed using
ALREADY_CHECKED(blk), but we can now use the cleaner ASSUME_NONNULL().
In addition this simplifies the BUG_ON() check that follows.
---

diff --git a/src/stats.c b/src/stats.c
index 970895c4ff..e1f33bd373 100644
--- a/src/stats.c
+++ b/src/stats.c
@@ -293,9 +293,8 @@ const char *stats_scope_ptr(struct appctx *appctx)
 	struct htx_blk *blk;
 	struct ist uri;
 
-	blk = htx_get_head_blk(htx);
-	BUG_ON(!blk || htx_get_blk_type(blk) != HTX_BLK_REQ_SL);
-	ALREADY_CHECKED(blk);
+	blk = ASSUME_NONNULL(htx_get_head_blk(htx));
+	BUG_ON(htx_get_blk_type(blk) != HTX_BLK_REQ_SL);
 	uri = htx_sl_req_uri(htx_get_blk_ptr(htx, blk));
 	return uri.ptr + ctx->scope_str;
 }