From: Tim Duesterhus <tim@bastelstu.be>
Date: Sat, 2 Jan 2021 21:47:16 +0000 (+0100)
Subject: CLEANUP: Reduce scope of `header_name` in http_action_store_cache()
X-Git-Tag: v2.4-dev5~17
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e2fff10a1902a4aaf09259c1247b744168c9da79;p=thirdparty%2Fhaproxy.git

CLEANUP: Reduce scope of `header_name` in http_action_store_cache()

This variable is only needed deeply nested in a single location and clang's
static analyzer complains about a dead initialization. Reduce the scope to
satisfy clang and the human that reads the function.
---

diff --git a/src/cache.c b/src/cache.c
index a0b417e2ea..b7ea562a7d 100644
--- a/src/cache.c
+++ b/src/cache.c
@@ -994,7 +994,6 @@ enum act_return http_action_store_cache(struct act_rule *rule, struct proxy *px,
 	struct http_hdr_ctx ctx;
 	size_t hdrs_len = 0;
 	int32_t pos;
-	struct ist header_name = IST_NULL;
 	unsigned int vary_signature = 0;
 
 	/* Don't cache if the response came from a cache */
@@ -1181,7 +1180,7 @@ enum act_return http_action_store_cache(struct act_rule *rule, struct proxy *px,
 		 * future conditional requests to be able to perform ETag
 		 * comparisons. */
 		if (type == HTX_BLK_HDR) {
-			header_name = htx_get_blk_name(htx, blk);
+			struct ist header_name = htx_get_blk_name(htx, blk);
 			if (isteq(header_name, ist("etag"))) {
 				object->etag_length = sz - istlen(header_name);
 				object->etag_offset = sizeof(struct cache_entry) + b_data(&trash) - sz + istlen(header_name);