From 70789cf4bb15c7d1552c2eff32edfe7b608589ee Mon Sep 17 00:00:00 2001 From: Vladimir Maksimovski Date: Tue, 26 Jan 2021 05:58:03 +0100 Subject: [PATCH] Remove check leading to duplicate branches (#8398) Remove check leading to duplicate branches and unused withscores parameter --- src/t_zset.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/t_zset.c b/src/t_zset.c index eb4f274a3..bacac1c8d 100644 --- a/src/t_zset.c +++ b/src/t_zset.c @@ -3073,8 +3073,8 @@ void zrevrangeCommand(client *c) { /* This command implements ZRANGEBYSCORE, ZREVRANGEBYSCORE. */ void genericZrangebyscoreCommand(zrange_result_handler *handler, - zrangespec *range, robj *zobj, int withscores, long offset, - long limit, int reverse) { + zrangespec *range, robj *zobj, long offset, long limit, + int reverse) { client *c = handler->client; unsigned long rangelen = 0; @@ -3174,8 +3174,7 @@ void genericZrangebyscoreCommand(zrange_result_handler *handler, } rangelen++; - handler->emitResultFromCBuffer(handler, ln->ele, sdslen(ln->ele), - ((withscores) ? ln->score : ln->score)); + handler->emitResultFromCBuffer(handler, ln->ele, sdslen(ln->ele), ln->score); /* Move to next node */ if (reverse) { @@ -3626,8 +3625,8 @@ void zrangeGenericCommand(zrange_result_handler *handler, int argc_start, int st break; case ZRANGE_SCORE: - genericZrangebyscoreCommand(handler, &range, zobj, opt_withscores || store, - opt_offset, opt_limit, direction == ZRANGE_DIRECTION_REVERSE); + genericZrangebyscoreCommand(handler, &range, zobj, opt_offset, + opt_limit, direction == ZRANGE_DIRECTION_REVERSE); break; case ZRANGE_LEX: