ZRANGE now takes integers + fix for INCR changes.

1 files changed, 8 insertions, 14 deletions

diff --git a/redis.c b/redis.c
index d725bf45..26829550 100755
--- a/redis.c
+++ b/redis.c
@@ -922,18 +922,12 @@ PHP_METHOD(Redis, randomKey)
         RETURN_FALSE;
     }
     efree(cmd);
+
     if ((response = redis_sock_read(redis_sock, &response_len TSRMLS_CC)) == NULL) {
         RETURN_FALSE;
     }
 
-    if(response[0] == '+') {
-        ret = estrndup(response+1, response_len-1);
-        efree(response);
-        RETURN_STRINGL(ret, response_len-1, 0);  // need to remove the '+'
-    } else {
-        efree(response);
-        RETURN_FALSE;
-    }
+    RETURN_STRINGL(response, response_len, 0);
 
 }
 /* }}} */
@@ -2762,9 +2756,9 @@ PHP_METHOD(Redis, zRange)
     RedisSock *redis_sock;
     char *key = NULL, *cmd;
     int key_len, cmd_len, response_len;
-    double start, end;
+    long start, end;
 
-    if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Osdd",
+    if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Osll",
                                      &object, redis_ce,
                                      &key, &key_len, &start, &end) == FAILURE) {
         RETURN_FALSE;
@@ -2774,7 +2768,7 @@ PHP_METHOD(Redis, zRange)
         RETURN_FALSE;
     }
 
-    cmd_len = spprintf(&cmd, 0, "ZRANGE %s %f %f\r\n\r\n", key, start, end);
+    cmd_len = redis_cmd_format(&cmd, "ZRANGE %s %d %d\r\n\r\n", key, key_len, start, end);
 
     if (redis_sock_write(redis_sock, cmd, cmd_len) < 0) {
         efree(cmd);
@@ -2855,9 +2849,9 @@ PHP_METHOD(Redis, zReverseRange)
     RedisSock *redis_sock;
     char *key = NULL, *cmd;
     int key_len, cmd_len, response_len;
-    double start, end;
+    long start, end;
 
-    if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Osdd",
+    if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Osll",
                                      &object, redis_ce,
                                      &key, &key_len, &start, &end) == FAILURE) {
         RETURN_FALSE;
@@ -2867,7 +2861,7 @@ PHP_METHOD(Redis, zReverseRange)
         RETURN_FALSE;
     }
 
-    cmd_len = spprintf(&cmd, 0, "ZREVRANGE %s %f %f\r\n\r\n", key, start, end);
+    cmd_len = redis_cmd_format(&cmd, "ZREVRANGE %s %d %d\r\n\r\n", key, key_len, start, end);
 
     if (redis_sock_write(redis_sock, cmd, cmd_len) < 0) {
         efree(cmd);