]> git.ipfire.org Git - thirdparty/haproxy.git/commitdiff
CLEANUP: stats: use ASSUME_NONNULL() to indicate that the first block exists
authorWilly Tarreau <w@1wt.eu>
Tue, 17 Dec 2024 13:31:08 +0000 (14:31 +0100)
committerWilly Tarreau <w@1wt.eu>
Tue, 17 Dec 2024 16:47:57 +0000 (17:47 +0100)
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.

src/stats.c

index 970895c4ff3698a757034227571df3fd9b084fd8..e1f33bd373d31984d79d56e49b39ddedc22d1e9e 100644 (file)
@@ -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;
 }