RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2025-03-04 18:39:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

BUILD: stick-tables: silence an uninitialized variable warning

Browse Source 
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.
This commit is contained in:
Willy Tarreau 2017-10-31 15:45:42 +01:00
parent 99aad9295b
commit a5e0590b80
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/proto/stick_table.h
View File

@ -139,21 +139,17 @@ static inline int __stksess_kill_if_expired(struct stktable *t, struct stksess *
return 0; 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); SPIN_LOCK(STK_TABLE_LOCK, &t->lock);
if (decrefcnt) if (decrefcnt)
ts->ref_cnt--; ts->ref_cnt--;
if (t->expire != TICK_ETERNITY && tick_is_expired(ts->expire, now_ms)) 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); SPIN_UNLOCK(STK_TABLE_LOCK, &t->lock);
return ret;
} }
/* sets the stick counter's entry pointer */ /* sets the stick counter's entry pointer */