]> git.ipfire.org Git - thirdparty/haproxy.git/commitdiff
BUILD: stick-tables: silence an uninitialized variable warning
authorWilly Tarreau <w@1wt.eu>
Tue, 31 Oct 2017 14:45:42 +0000 (15:45 +0100)
committerWilly Tarreau <w@1wt.eu>
Tue, 31 Oct 2017 14:45:42 +0000 (15:45 +0100)
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.

include/proto/stick_table.h

index 8c9f834526664d72d3ca33fffa86c1e6061b8478..4e9253858cff2ed3d31b45a6c5f2a07ef9069fd5 100644 (file)
@@ -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 */