jrtkcoder
diff --git a/‎redis_array_impl.c
Lines changed: 8 additions & 26 deletions b/‎redis_array_impl.c
Lines changed: 8 additions & 26 deletions
diff --git a/‎redis_commands.c
Lines changed: 1 addition & 1 deletion b/‎redis_commands.c
Lines changed: 1 addition & 1 deletion
diff --git a/‎redis_session.c
Lines changed: 0 additions & 2 deletions b/‎redis_session.c
Lines changed: 0 additions & 2 deletions
@@ -411,16 +411,11 @@ ra_extract_key(RedisArray *ra, const char *key, int key_len, int *out_len TSRMLS
     char *start, *end;
     *out_len = key_len;
 
-    if(Z_TYPE(ra->z_fun) != IS_UNDEF)
+    if (Z_TYPE(ra->z_fun) != IS_UNDEF) {
         return ra_call_extractor(ra, key, key_len, out_len TSRMLS_CC);
-
-    /* look for '{' */
-    start = strchr(key, '{');
-    if(!start) return estrndup(key, key_len);
-
-    /* look for '}' */
-    end = strchr(start + 1, '}');
-    if(!end) return estrndup(key, key_len);
+    } else if ((start = strchr(key, '{')) == NULL || (end = strchr(start + 1, '}')) == NULL) {
+        return estrndup(key, key_len);
+    }
 
     /* found substring */
     *out_len = end - start - 1;
@@ -743,17 +738,6 @@ ra_rehash_scan(zval *z_redis, char ***keys, int **key_lens, const char *cmd, con
     return count;
 }
 
-static long
-ra_rehash_scan_index(zval *z_redis, char ***keys, int **key_lens TSRMLS_DC) {
-    return ra_rehash_scan(z_redis, keys, key_lens, "SMEMBERS", PHPREDIS_INDEX_NAME TSRMLS_CC);
-}
-
-/* list keys using KEYS command */
-static long
-ra_rehash_scan_keys(zval *z_redis, char ***keys, int **key_lens TSRMLS_DC) {
-    return ra_rehash_scan(z_redis, keys, key_lens, "KEYS", "*" TSRMLS_CC);
-}
-
 /* run TYPE to find the type */
 static zend_bool
 ra_get_key_type(zval *z_redis, const char *key, int key_len, zval *z_from, long *res TSRMLS_DC) {
@@ -1212,9 +1196,9 @@ ra_rehash_server(RedisArray *ra, zval *z_redis, const char *hostname, zend_bool
 
     /* list all keys */
     if(b_index) {
-        count = ra_rehash_scan_index(z_redis, &keys, &key_lens TSRMLS_CC);
+        count = ra_rehash_scan(z_redis, &keys, &key_lens, "SMEMBERS", PHPREDIS_INDEX_NAME TSRMLS_CC);
     } else {
-        count = ra_rehash_scan_keys(z_redis, &keys, &key_lens TSRMLS_CC);
+        count = ra_rehash_scan(z_redis, &keys, &key_lens, "KEYS", "*" TSRMLS_CC);
     }
 
     /* callback */
@@ -1231,12 +1215,10 @@ ra_rehash_server(RedisArray *ra, zval *z_redis, const char *hostname, zend_bool
         if(strcmp(hostname, ra->hosts[target_pos]
8000
)) { /* different host */
             ra_move_key(keys[i], key_lens[i], z_redis, z_target TSRMLS_CC);
         }
-    }
-
-    /* cleanup */
-    for(i = 0; i < count; ++i) {
+        /* cleanup */
         efree(keys[i]);
     }
+
     efree(keys);
     efree(key_lens);
 }
 
@@ -3250,4 +3250,4 @@ void redis_unserialize_handler(INTERNAL_FUNCTION_PARAMETERS,
     }
 }
 
-/* vim: set tabstop=4 softtabstop=4 noexpandtab shiftwidth=4: */
+/* vim: set tabstop=4 softtabstop=4 expandtab shiftwidth=4: */
@@ -20,8 +20,6 @@
   +----------------------------------------------------------------------+
 */
 
-#include "common.h"
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
Original file line number	Diff line number	Diff line change
`@@ -3250,4 +3250,4 @@ void redis_unserialize_handler(INTERNAL_FUNCTION_PARAMETERS,`
`3250`	`3250`	`}`
`3251`	`3251`	`}`
`3252`	`3252`
`3253`		`-/* vim: set tabstop=4 softtabstop=4 noexpandtab shiftwidth=4: */`
	`3253`	`+/* vim: set tabstop=4 softtabstop=4 expandtab shiftwidth=4: */`