diff --git a/src/t_list.c b/src/t_list.c index d14de708f..7f12e4ac0 100644 --- a/src/t_list.c +++ b/src/t_list.c @@ -818,6 +818,24 @@ int handleClientsWaitingListPush(redisClient *c, robj *key, robj *ele) { return 1; } +int checkTimeout(redisClient *c, robj *object, time_t *timeout) { + long long lltimeout; + + if (getLongLongFromObject(object, &lltimeout) != REDIS_OK) { + addReplyError(c, "timeout is not an integer"); + return REDIS_ERR; + } + + if (lltimeout < 0) { + addReplyError(c, "timeout is negative"); + return REDIS_ERR; + } + + *timeout = lltimeout; + + return REDIS_OK; +} + /* Blocking RPOP/LPOP */ void blockingPopGenericCommand(redisClient *c, int where) { robj *o; @@ -881,24 +899,6 @@ void blockingPopGenericCommand(redisClient *c, int where) { blockForKeys(c, c->argv + 1, c->argc - 2, timeout, NULL); } -int checkTimeout(redisClient *c, robj *object, time_t *timeout) { - long long lltimeout; - - if (getLongLongFromObject(object, &lltimeout) != REDIS_OK) { - addReplyError(c, "timeout is not an integer"); - return REDIS_ERR; - } - - if (lltimeout < 0) { - addReplyError(c, "timeout is negative"); - return REDIS_ERR; - } - - *timeout = lltimeout; - - return REDIS_OK; -} - void blpopCommand(redisClient *c) { blockingPopGenericCommand(c,REDIS_HEAD); }