From: Willy Tarreau <w@1wt.eu>
Date: Tue, 31 Oct 2017 14:45:42 +0000 (+0100)
Subject: BUILD: stick-tables: silence an uninitialized variable warning
X-Git-Tag: v1.8-rc1~107
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a5e0590b80502b29d38ce2b704231bdcd103cda5;p=thirdparty%2Fhaproxy.git

BUILD: stick-tables: silence an uninitialized variable warning

Commit 819fc6f ("MEDIUM: threads/stick-tables: handle multithreads on
stick tables") introduced a valid warning about an uninitialized return
value in stksess_kill_if_expired(). It just happens that this result is
never used, so let's turn the function back to void as previously.
---

diff --git a/include/proto/stick_table.h b/include/proto/stick_table.h
index 8c9f834526..4e9253858c 100644
--- a/include/proto/stick_table.h
+++ b/include/proto/stick_table.h
@@ -139,21 +139,17 @@ static inline int __stksess_kill_if_expired(struct stktable *t, struct stksess *
 	return 0;
 }
 
-static inline int stksess_kill_if_expired(struct stktable *t, struct stksess *ts, int decrefcnt)
+static inline void stksess_kill_if_expired(struct stktable *t, struct stksess *ts, int decrefcnt)
 {
-	int ret;
-
 	SPIN_LOCK(STK_TABLE_LOCK, &t->lock);
 
 	if (decrefcnt)
 		ts->ref_cnt--;
 
 	if (t->expire != TICK_ETERNITY && tick_is_expired(ts->expire, now_ms))
-		ret = __stksess_kill_if_expired(t, ts);
+		__stksess_kill_if_expired(t, ts);
 
 	SPIN_UNLOCK(STK_TABLE_LOCK, &t->lock);
-
-	return ret;
 }
 
 /* sets the stick counter's entry pointer */