Remove dead code, fix min_argc for blocking commands

4 files changed, 13 insertions, 21 deletions

diff --git a/redis.c b/redis.c
index 52924b1b..6265ac80 100644
--- a/redis.c
+++ b/redis.c
@@ -1378,14 +1378,14 @@ PHP_METHOD(Redis, rPop)
 /* {{{ proto string Redis::blPop(string key1, string key2, ..., int timeout) */
 PHP_METHOD(Redis, blPop)
 {
-    REDIS_PROCESS_KW_CMD("BLPOP", redis_varkey_timeout_cmd, redis_sock_read_multibulk_reply);
+    REDIS_PROCESS_KW_CMD("BLPOP", redis_blocking_pop_cmd, redis_sock_read_multibulk_reply);
 }
 /* }}} */
 
 /* {{{ proto string Redis::brPop(string key1, string key2, ..., int timeout) */
 PHP_METHOD(Redis, brPop)
 {
-    REDIS_PROCESS_KW_CMD("BRPOP", redis_varkey_timeout_cmd, redis_sock_read_multibulk_reply);
+    REDIS_PROCESS_KW_CMD("BRPOP", redis_blocking_pop_cmd, redis_sock_read_multibulk_reply);
 }
 /* }}} */
 
@@ -2170,13 +2170,13 @@ PHP_METHOD(Redis, zPopMin)
 
 /* {{{ proto Redis::bzPopMax(Array(keys) [, timeout]): Array */
 PHP_METHOD(Redis, bzPopMax) {
-    REDIS_PROCESS_KW_CMD("BZPOPMAX", redis_varkey_timeout_cmd, redis_sock_read_multibulk_reply);
+    REDIS_PROCESS_KW_CMD("BZPOPMAX", redis_blocking_pop_cmd, redis_sock_read_multibulk_reply);
 }
 /* }}} */
 
 /* {{{ proto Redis::bzPopMin(Array(keys) [, timeout]): Array */
 PHP_METHOD(Redis, bzPopMin) {
-    REDIS_PROCESS_KW_CMD("BZPOPMIN", redis_varkey_timeout_cmd, redis_sock_read_multibulk_reply);
+    REDIS_PROCESS_KW_CMD("BZPOPMIN", redis_blocking_pop_cmd, redis_sock_read_multibulk_reply);
 }
 /* }}} */
 
diff --git a/redis_cluster.c b/redis_cluster.c
index f9da1cc0..3eb267c4 100644
--- a/redis_cluster.c
+++ b/redis_cluster.c
@@ -1259,13 +1259,13 @@ PHP_METHOD(RedisCluster, rpush) {
 
 /* {{{ proto array RedisCluster::blpop(string key1, ... keyN, long timeout) */
 PHP_METHOD(RedisCluster, blpop) {
-    CLUSTER_PROCESS_KW_CMD("BLPOP", redis_varkey_timeout_cmd, cluster_mbulk_resp, 0);
+    CLUSTER_PROCESS_KW_CMD("BLPOP", redis_blocking_pop_cmd, cluster_mbulk_resp, 0);
 }
 /* }}} */
 
 /* {{{ proto array RedisCluster::brpop(string key1, ... keyN, long timeout */
 PHP_METHOD(RedisCluster, brpop) {
-    CLUSTER_PROCESS_KW_CMD("BRPOP", redis_varkey_timeout_cmd, cluster_mbulk_resp, 0);
+    CLUSTER_PROCESS_KW_CMD("BRPOP", redis_blocking_pop_cmd, cluster_mbulk_resp, 0);
 }
 /* }}} */
 
@@ -1874,12 +1874,12 @@ PHP_METHOD(RedisCluster, zpopmin) {
 
 /* {{{ proto array RedisCluster::bzPopMin(Array keys [, timeout]) }}} */
 PHP_METHOD(RedisCluster, bzpopmax) {
-    CLUSTER_PROCESS_KW_CMD("BZPOPMAX", redis_varkey_timeout_cmd, cluster_mbulk_resp, 0);
+    CLUSTER_PROCESS_KW_CMD("BZPOPMAX", redis_blocking_pop_cmd, cluster_mbulk_resp, 0);
 }
 
 /* {{{ proto array RedisCluster::bzPopMax(Array keys [, timeout]) }}} */
 PHP_METHOD(RedisCluster, bzpopmin) {
-    CLUSTER_PROCESS_KW_CMD("BZPOPMIN", redis_varkey_timeout_cmd, cluster_mbulk_resp, 0);
+    CLUSTER_PROCESS_KW_CMD("BZPOPMIN", redis_blocking_pop_cmd, cluster_mbulk_resp, 0);
 }
 
 /* {{{ proto RedisCluster::sort(string key, array options) */
diff --git a/redis_commands.c b/redis_commands.c
index c77ff31e..26df9b59 100644
--- a/redis_commands.c
+++ b/redis_commands.c
@@ -1252,12 +1252,12 @@ static int gen_varkey_cmd(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock,
 }
 
 /* Generic handling of every blocking pop command (BLPOP, BZPOP[MIN/MAX], etc */
-int redis_varkey_timeout_cmd(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock,
-                             char *kw, char **cmd, int *cmd_len, short *slot,
-                             void **ctx)
+int redis_blocking_pop_cmd(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock,
+                           char *kw, char **cmd, int *cmd_len, short *slot,
+                           void **ctx)
 {
     return gen_varkey_cmd(INTERNAL_FUNCTION_PARAM_PASSTHRU, redis_sock, kw,
-        strlen(kw), 2, 1, cmd, cmd_len, slot);
+        strlen(kw), 2, 2, cmd, cmd_len, slot);
 }
 
 /*
@@ -3053,14 +3053,6 @@ int redis_watch_cmd(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock,
         "WATCH", sizeof("WATCH")-1, 1, 0, cmd, cmd_len, slot);
 }
 
-/* BLPOP */
-int redis_blpop_cmd(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock,
-                    char **cmd, int *cmd_len, short *slot, void **ctx)
-{
-    return gen_varkey_cmd(INTERNAL_FUNCTION_PARAM_PASSTHRU, redis_sock,
-        "BLPOP", sizeof("BLPOP")-1, 2, 1, cmd, cmd_len, slot);
-}
-
 /* SINTER */
 int redis_sinter_cmd(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock,
                      char **cmd, int *cmd_len, short *slot, void **ctx)
diff --git a/redis_commands.h b/redis_commands.h
index 11fbd695..9a9c777d 100644
--- a/redis_commands.h
+++ b/redis_commands.h
@@ -78,7 +78,7 @@ int redis_key_val_arr_cmd(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock,
 int redis_key_str_arr_cmd(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock,
     char *kw, char **cmd, int *cmd_len, short *slot, void **ctx);
 
-int redis_varkey_timeout_cmd(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock,
+int redis_blocking_pop_cmd(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock,
     char *kw, char **cmd, int *cmd_len, short *slot, void **ctx);
 
 /* Construct SCAN and similar commands, as well as check iterator  */