From: Willy Tarreau <w@1wt.eu>
Date: Tue, 25 Jan 2022 14:56:50 +0000 (+0100)
Subject: BUILD: pools: fix build error on DEBUG_POOL_TRACING
X-Git-Tag: v2.6-dev1~81
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f70fdde591a4ada9e8207783afc13d612fbd0ff4;p=thirdparty%2Fhaproxy.git

BUILD: pools: fix build error on DEBUG_POOL_TRACING

When squashing commit add43fa43 ("DEBUG: pools: add new build option
DEBUG_POOL_TRACING") I managed to break the build and to fail to detect
it even after the rebase and a full rebuild :-(
---

diff --git a/src/pool.c b/src/pool.c
index a20880b944..3fda2fbd8c 100644
--- a/src/pool.c
+++ b/src/pool.c
@@ -284,7 +284,7 @@ void *pool_alloc_nocache(struct pool_head *pool)
 
 	/* keep track of where the element was allocated from */
 	POOL_DEBUG_SET_MARK(pool, ptr);
-	POOL_DEBUG_TRACE_CALLER(pool, item, NULL);
+	POOL_DEBUG_TRACE_CALLER(pool, (struct pool_cache_item *)ptr, NULL);
 	return ptr;
 }
 
@@ -470,9 +470,9 @@ void pool_refill_local_from_shared(struct pool_head *pool, struct pool_cache_hea
 		down = ret->down;
 		/* keep track of where the element was allocated from */
 		POOL_DEBUG_SET_MARK(pool, ret);
-		POOL_DEBUG_TRACE_CALLER(pool, item, NULL);
 
 		item = (struct pool_cache_item *)ret;
+		POOL_DEBUG_TRACE_CALLER(pool, item, NULL);
 		LIST_INSERT(&pch->list, &item->by_pool);
 		LIST_INSERT(&th_ctx->pool_lru_head, &item->by_lru);
 		count++;