From 50595a58898474acf12e33137a83d4201b4b2d29 Mon Sep 17 00:00:00 2001 From: antirez Date: Fri, 29 Sep 2017 18:00:40 +0200 Subject: [PATCH] Streams: fix XADD + MAXLEN propagation due to var shadowing. Clang should be more prone to return warnings by default when there is same-var-name shadowing. GCC does this and can avoid bugs like that. --- src/t_stream.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/t_stream.c b/src/t_stream.c index 03fa5300b..55d06dd75 100644 --- a/src/t_stream.c +++ b/src/t_stream.c @@ -352,8 +352,8 @@ int64_t streamTrimByLength(stream *s, size_t maxlen, int approx) { serverAssert(to_delete < entries); lp = lpReplaceInteger(lp,&p,entries-to_delete); p = lpNext(lp,p); /* Seek deleted field. */ - int64_t deleted = lpGetInteger(p); - lp = lpReplaceInteger(lp,&p,deleted+to_delete); + int64_t marked_deleted = lpGetInteger(p); + lp = lpReplaceInteger(lp,&p,marked_deleted+to_delete); p = lpNext(lp,p); /* Seek num-of-fields in the master entry. */ /* Skip all the master fields. */ @@ -394,8 +394,8 @@ int64_t streamTrimByLength(stream *s, size_t maxlen, int approx) { /* Here we should perform garbage collection in case at this point * there are too many entries deleted inside the listpack. */ entries -= to_delete; - deleted += to_delete; - if (entries + deleted > 10 && deleted > entries/2) { + marked_deleted += to_delete; + if (entries + marked_deleted > 10 && marked_deleted > entries/2) { /* TODO: perform a garbage collection. */ }