Destroy all tabs :-)

1 files changed, 406 insertions, 406 deletions

diff --git a/redis_array_impl.c b/redis_array_impl.c
index 0d740a0f..ebbaef5b 100644
--- a/redis_array_impl.c
+++ b/redis_array_impl.c
@@ -25,43 +25,43 @@
 #include "ext/standard/url.h"
 #include "ext/standard/crc32.h"
 
-#define PHPREDIS_INDEX_NAME	"__phpredis_array_index__"
+#define PHPREDIS_INDEX_NAME "__phpredis_array_index__"
 
 extern zend_class_entry *redis_ce;
 
 RedisArray*
 ra_load_hosts(RedisArray *ra, HashTable *hosts, long retry_interval, zend_bool b_lazy_connect TSRMLS_DC)
 {
-	int i = 0, host_len;
-	char *host, *p;
-	short port;
-	zval *zpData, z_cons, z_ret;
+    int i = 0, host_len;
+    char *host, *p;
+    short port;
+    zval *zpData, z_cons, z_ret;
     redis_object *redis;
 
-	/* function calls on the Redis object */
-	ZVAL_STRINGL(&z_cons, "__construct", 11);
+    /* function calls on the Redis object */
+    ZVAL_STRINGL(&z_cons, "__construct", 11);
 
-	/* init connections */
+    /* init connections */
     ZEND_HASH_FOREACH_VAL(hosts, zpData) {
         if (Z_TYPE_P(zpData) != IS_STRING) {
             zval_dtor(&z_cons);
             return NULL;
         }
 
-		/* default values */
-		host = Z_STRVAL_P(zpData);
-		host_len = Z_STRLEN_P(zpData);
-		ra->hosts[i] = estrndup(host, host_len);
-		port = 6379;
+        /* default values */
+        host = Z_STRVAL_P(zpData);
+        host_len = Z_STRLEN_P(zpData);
+        ra->hosts[i] = estrndup(host, host_len);
+        port = 6379;
 
-		if((p = strrchr(host, ':'))) { /* found port */
-			host_len = p - host;
-			port = (short)atoi(p+1);
-		} else if(strchr(host,'/') != NULL) { /* unix socket */
+        if((p = strrchr(host, ':'))) { /* found port */
+            host_len = p - host;
+            port = (short)atoi(p+1);
+        } else if(strchr(host,'/') != NULL) { /* unix socket */
             port = -1;
         }
 
-		/* create Redis object */
+        /* create Redis object */
 #if (PHP_MAJOR_VERSION < 7)
         INIT_PZVAL(&ra->redis[i]);
 #endif
@@ -75,21 +75,21 @@ ra_load_hosts(RedisArray *ra, HashTable *hosts, long retry_interval, zend_bool b
         redis = (redis_object *)((char *)Z_OBJ_P(&ra->redis[i]) - XtOffsetOf(redis_object, std));
 #endif
 
-		/* create socket */
-		redis->sock = redis_sock_create(host, host_len, port, ra->connect_timeout, ra->read_timeout, ra->pconnect, NULL, retry_interval, b_lazy_connect);
+        /* create socket */
+        redis->sock = redis_sock_create(host, host_len, port, ra->connect_timeout, ra->read_timeout, ra->pconnect, NULL, retry_interval, b_lazy_connect);
 
-	    if (!b_lazy_connect)
-    	{
-			/* connect */
-			redis_sock_server_open(redis->sock TSRMLS_CC);
-		}
+        if (!b_lazy_connect)
+        {
+            /* connect */
+            redis_sock_server_open(redis->sock TSRMLS_CC);
+        }
 
-		ra->count = ++i;
-	} ZEND_HASH_FOREACH_END();
+        ra->count = ++i;
+    } ZEND_HASH_FOREACH_END();
 
     zval_dtor(&z_cons);
 
-	return ra;
+    return ra;
 }
 
 /* List pure functions */
@@ -136,26 +136,26 @@ ra_init_function_table(RedisArray *ra)
 static int
 ra_find_name(const char *name) {
 
-	const char *ini_names, *p, *next;
-	/* php_printf("Loading redis array with name=[%s]\n", name); */
-
-	ini_names = INI_STR("redis.arrays.names");
-	for(p = ini_names; p;) {
-		next = strchr(p, ',');
-		if(next) {
-			if(strncmp(p, name, next - p) == 0) {
-				return 1;
-			}
-		} else {
-			if(strcmp(p, name) == 0) {
-				return 1;
-			}
-			break;
-		}
-		p = next + 1;
-	}
-
-	return 0;
+    const char *ini_names, *p, *next;
+    /* php_printf("Loading redis array with name=[%s]\n", name); */
+
+    ini_names = INI_STR("redis.arrays.names");
+    for(p = ini_names; p;) {
+        next = strchr(p, ',');
+        if(next) {
+            if(strncmp(p, name, next - p) == 0) {
+                return 1;
+            }
+        } else {
+            if(strcmp(p, name) == 0) {
+                return 1;
+            }
+            break;
+        }
+        p = next + 1;
+    }
+
+    return 0;
 }
 
 /* laod array from INI settings */
@@ -173,86 +173,86 @@ RedisArray *ra_load_array(const char *name TSRMLS_DC) {
     zval z_params_connect_timeout;
     zval z_params_read_timeout;
     zval z_params_lazy_connect;
-	RedisArray *ra = NULL;
+    RedisArray *ra = NULL;
 
-	zend_bool b_index = 0, b_autorehash = 0, b_pconnect = 0;
-	long l_retry_interval = 0;
-	zend_bool b_lazy_connect = 0;
-	double d_connect_timeout = 0, read_timeout = 0.0;
-	HashTable *hHosts = NULL, *hPrev = NULL;
+    zend_bool b_index = 0, b_autorehash = 0, b_pconnect = 0;
+    long l_retry_interval = 0;
+    zend_bool b_lazy_connect = 0;
+    double d_connect_timeout = 0, read_timeout = 0.0;
+    HashTable *hHosts = NULL, *hPrev = NULL;
     size_t name_len = strlen(name);
     char *iptr;
 
-	/* find entry */
-	if(!ra_find_name(name))
-		return ra;
+    /* find entry */
+    if(!ra_find_name(name))
+        return ra;
 
-	/* find hosts */
-	array_init(&z_params_hosts);
+    /* find hosts */
+    array_init(&z_params_hosts);
     if ((iptr = INI_STR("redis.arrays.hosts")) != NULL) {
         sapi_module.treat_data(PARSE_STRING, estrdup(iptr), &z_params_hosts TSRMLS_CC);
     }
-	if ((z_data = zend_hash_str_find(Z_ARRVAL(z_params_hosts), name, name_len)) != NULL) {
-		hHosts = Z_ARRVAL_P(z_data);
-	}
+    if ((z_data = zend_hash_str_find(Z_ARRVAL(z_params_hosts), name, name_len)) != NULL) {
+        hHosts = Z_ARRVAL_P(z_data);
+    }
 
-	/* find previous hosts */
-	array_init(&z_params_prev);
+    /* find previous hosts */
+    array_init(&z_params_prev);
     if ((iptr = INI_STR("redis.arrays.previous")) != NULL) {
         sapi_module.treat_data(PARSE_STRING, estrdup(iptr), &z_params_prev TSRMLS_CC);
     }
-	if ((z_data = zend_hash_str_find(Z_ARRVAL(z_params_prev), name, name_len)) != NULL) {
-		hPrev = Z_ARRVAL_P(z_data);
-	}
+    if ((z_data = zend_hash_str_find(Z_ARRVAL(z_params_prev), name, name_len)) != NULL) {
+        hPrev = Z_ARRVAL_P(z_data);
+    }
 
-	/* find function */
-	array_init(&z_params_funs);
+    /* find function */
+    array_init(&z_params_funs);
     if ((iptr = INI_STR("redis.arrays.functions")) != NULL) {
         sapi_module.treat_data(PARSE_STRING, estrdup(iptr), &z_params_funs TSRMLS_CC);
     }
     ZVAL_NULL(&z_fun);
-	if ((z_data = zend_hash_str_find(Z_ARRVAL(z_params_funs), name, name_len)) != NULL) {
+    if ((z_data = zend_hash_str_find(Z_ARRVAL(z_params_funs), name, name_len)) != NULL) {
         ZVAL_ZVAL(&z_fun, z_data, 1, 0);
-	}
+    }
 
-	/* find distributor */
-	array_init(&z_params_dist);
+    /* find distributor */
+    array_init(&z_params_dist);
     if ((iptr = INI_STR("redis.arrays.distributor")) != NULL) {
         sapi_module.treat_data(PARSE_STRING, estrdup(iptr), &z_params_dist TSRMLS_CC);
     }
     ZVAL_NULL(&z_dist);
-	if ((z_data = zend_hash_str_find(Z_ARRVAL(z_params_dist), name, name_len)) != NULL) {
+    if ((z_data = zend_hash_str_find(Z_ARRVAL(z_params_dist), name, name_len)) != NULL) {
         ZVAL_ZVAL(&z_dist, z_data, 1, 0);
-	}
+    }
 
-	/* find index option */
-	array_init(&z_params_index);
+    /* find index option */
+    array_init(&z_params_index);
     if ((iptr = INI_STR("redis.arrays.index")) != NULL) {
         sapi_module.treat_data(PARSE_STRING, estrdup(iptr), &z_params_index TSRMLS_CC);
     }
-	if ((z_data = zend_hash_str_find(Z_ARRVAL(z_params_index), name, name_len)) != NULL) {
-		if (Z_TYPE_P(z_data) == IS_STRING && strncmp(Z_STRVAL_P(z_data), "1", 1) == 0) {
-			b_index = 1;
-		}
-	}
-
-	/* find autorehash option */
-	array_init(&z_params_autorehash);
+    if ((z_data = zend_hash_str_find(Z_ARRVAL(z_params_index), name, name_len)) != NULL) {
+        if (Z_TYPE_P(z_data) == IS_STRING && strncmp(Z_STRVAL_P(z_data), "1", 1) == 0) {
+            b_index = 1;
+        }
+    }
+
+    /* find autorehash option */
+    array_init(&z_params_autorehash);
     if ((iptr = INI_STR("redis.arrays.autorehash")) != NULL) {
         sapi_module.treat_data(PARSE_STRING, estrdup(iptr), &z_params_autorehash TSRMLS_CC);
     }
-	if ((z_data = zend_hash_str_find(Z_ARRVAL(z_params_autorehash), name, name_len)) != NULL) {
-		if(Z_TYPE_P(z_data) == IS_STRING && strncmp(Z_STRVAL_P(z_data), "1", 1) == 0) {
-			b_autorehash = 1;
-		}
-	}
-
-	/* find retry interval option */
-	array_init(&z_params_retry_interval);
+    if ((z_data = zend_hash_str_find(Z_ARRVAL(z_params_autorehash), name, name_len)) != NULL) {
+        if(Z_TYPE_P(z_data) == IS_STRING && strncmp(Z_STRVAL_P(z_data), "1", 1) == 0) {
+            b_autorehash = 1;
+        }
+    }
+
+    /* find retry interval option */
+    array_init(&z_params_retry_interval);
     if ((iptr = INI_STR("redis.arrays.retryinterval")) != NULL) {
         sapi_module.treat_data(PARSE_STRING, estrdup(iptr), &z_params_retry_interval TSRMLS_CC);
     }
-	if ((z_data = zend_hash_str_find(Z_ARRVAL(z_params_retry_interval), name, name_len)) != NULL) {
+    if ((z_data = zend_hash_str_find(Z_ARRVAL(z_params_retry_interval), name, name_len)) != NULL) {
         if (Z_TYPE_P(z_data) == IS_LONG) {
             l_retry_interval = Z_LVAL_P(z_data);
         } else if (Z_TYPE_P(z_data) == IS_STRING) {
@@ -260,7 +260,7 @@ RedisArray *ra_load_array(const char *name TSRMLS_DC) {
         }
     }
 
-	/* find pconnect option */
+    /* find pconnect option */
     array_init(&z_params_pconnect);
     if ((iptr = INI_STR("redis.arrays.pconnect")) != NULL) {
         sapi_module.treat_data(PARSE_STRING, estrdup(iptr), &z_params_pconnect TSRMLS_CC);
@@ -270,20 +270,20 @@ RedisArray *ra_load_array(const char *name TSRMLS_DC) {
             b_pconnect = 1;
         }
     }
-	
+
     /* find lazy connect option */
-	array_init(&z_params_lazy_connect);
+    array_init(&z_params_lazy_connect);
     if ((iptr = INI_STR("redis.arrays.lazyconnect")) != NULL) {
         sapi_module.treat_data(PARSE_STRING, estrdup(iptr), &z_params_lazy_connect TSRMLS_CC);
     }
-	if ((z_data = zend_hash_str_find(Z_ARRVAL(z_params_lazy_connect), name, name_len)) != NULL) {
-		if (Z_TYPE_P(z_data) == IS_STRING && strncmp(Z_STRVAL_P(z_data), "1", 1) == 0) {
+    if ((z_data = zend_hash_str_find(Z_ARRVAL(z_params_lazy_connect), name, name_len)) != NULL) {
+        if (Z_TYPE_P(z_data) == IS_STRING && strncmp(Z_STRVAL_P(z_data), "1", 1) == 0) {
             b_lazy_connect = 1;
         }
     }
-        
+
     /* find connect timeout option */
-	array_init(&z_params_connect_timeout);
+    array_init(&z_params_connect_timeout);
     if ((iptr = INI_STR("redis.arrays.connecttimeout")) != NULL) {
         sapi_module.treat_data(PARSE_STRING, estrdup(iptr), &z_params_connect_timeout TSRMLS_CC);
     }
@@ -298,7 +298,7 @@ RedisArray *ra_load_array(const char *name TSRMLS_DC) {
     }
 
     /* find read timeout option */
-	array_init(&z_params_read_timeout);
+    array_init(&z_params_read_timeout);
     if ((iptr = INI_STR("redis.arrays.readtimeout")) != NULL) {
         sapi_module.treat_data(PARSE_STRING, estrdup(iptr), &z_params_read_timeout TSRMLS_CC);
     }
@@ -312,15 +312,15 @@ RedisArray *ra_load_array(const char *name TSRMLS_DC) {
         }
     }
 
-	
-	/* create RedisArray object */
-	ra = ra_make_array(hHosts, &z_fun, &z_dist, hPrev, b_index, b_pconnect, l_retry_interval, b_lazy_connect, d_connect_timeout, read_timeout TSRMLS_CC);
+
+    /* create RedisArray object */
+    ra = ra_make_array(hHosts, &z_fun, &z_dist, hPrev, b_index, b_pconnect, l_retry_interval, b_lazy_connect, d_connect_timeout, read_timeout TSRMLS_CC);
     if (ra) {
         ra->auto_rehash = b_autorehash;
         if(ra->prev) ra->prev->auto_rehash = b_autorehash;
     }
 
-	/* cleanup */
+    /* cleanup */
     zval_dtor(&z_params_hosts);
     zval_dtor(&z_params_prev);
     zval_dtor(&z_params_funs);
@@ -335,7 +335,7 @@ RedisArray *ra_load_array(const char *name TSRMLS_DC) {
     zval_dtor(&z_dist);
     zval_dtor(&z_fun);
 
-	return ra;
+    return ra;
 }
 
 RedisArray *
@@ -346,17 +346,17 @@ ra_make_array(HashTable *hosts, zval *z_fun, zval *z_dist, HashTable *hosts_prev
 
     if (!hosts || (count = zend_hash_num_elements(hosts)) == 0) return NULL;
 
-	/* create object */
-	ra = emalloc(sizeof(RedisArray));
-	ra->hosts = ecalloc(count, sizeof(char *));
-	ra->redis = ecalloc(count, sizeof(zval));
-	ra->count = 0;
-	ra->z_multi_exec = NULL;
-	ra->index = b_index;
-	ra->auto_rehash = 0;
-	ra->pconnect = b_pconnect;
-	ra->connect_timeout = connect_timeout;
-	ra->read_timeout = read_timeout;
+    /* create object */
+    ra = emalloc(sizeof(RedisArray));
+    ra->hosts = ecalloc(count, sizeof(char *));
+    ra->redis = ecalloc(count, sizeof(zval));
+    ra->count = 0;
+    ra->z_multi_exec = NULL;
+    ra->index = b_index;
+    ra->auto_rehash = 0;
+    ra->pconnect = b_pconnect;
+    ra->connect_timeout = connect_timeout;
+    ra->read_timeout = read_timeout;
 
     if (ra_load_hosts(ra, hosts, retry_interval, b_lazy_connect TSRMLS_CC) == NULL || !ra->count) {
         for (i = 0; i < ra->count; ++i) {
@@ -373,10 +373,10 @@ ra_make_array(HashTable *hosts, zval *z_fun, zval *z_dist, HashTable *hosts_prev
     /* init array data structures */
     ra_init_function_table(ra);
 
-	/* Set hash function and distribtor if provided */
+    /* Set hash function and distribtor if provided */
     ZVAL_ZVAL(&ra->z_fun, z_fun, 1, 0);
     ZVAL_ZVAL(&ra->z_dist, z_dist, 1, 0);
-    
+
     return ra;
 }
 
@@ -388,18 +388,18 @@ ra_call_extractor(RedisArray *ra, const char *key, int key_len, int *out_len TSR
     char *out = NULL;
     zval z_ret, z_argv;
 
-	/* check that we can call the extractor function */
+    /* check that we can call the extractor function */
 #if (PHP_MAJOR_VERSION < 7)
     if (!zend_is_callable_ex(&ra->z_fun, NULL, 0, NULL, NULL, NULL, NULL TSRMLS_CC)) {
 #else
     if (!zend_is_callable_ex(&ra->z_fun, NULL, 0, NULL, NULL, NULL)) {
 #endif
-		php_error_docref(NULL TSRMLS_CC, E_ERROR, "Could not call extractor function");
-		return NULL;
-	}
+        php_error_docref(NULL TSRMLS_CC, E_ERROR, "Could not call extractor function");
+        return NULL;
+    }
 
     ZVAL_NULL(&z_ret);
-	/* call extraction function */
+    /* call extraction function */
     ZVAL_STRINGL(&z_argv, key, key_len);
     call_user_function(EG(function_table), NULL, &ra->z_fun, &z_ret, 1, &z_argv);
 
@@ -408,24 +408,24 @@ ra_call_extractor(RedisArray *ra, const char *key, int key_len, int *out_len TSR
         out = estrndup(Z_STRVAL(z_ret), *out_len);
     }
 
-	zval_dtor(&z_argv);
-	zval_dtor(&z_ret);
-	return out;
+    zval_dtor(&z_argv);
+    zval_dtor(&z_ret);
+    return out;
 }
 
 static char *
 ra_extract_key(RedisArray *ra, const char *key, int key_len, int *out_len TSRMLS_DC) {
 
-	char *start, *end;
-	*out_len = key_len;
+    char *start, *end;
+    *out_len = key_len;
 
-	if (Z_TYPE(ra->z_fun) != IS_NULL) {
-		return ra_call_extractor(ra, key, key_len, out_len TSRMLS_CC);
+    if (Z_TYPE(ra->z_fun) != IS_NULL) {
+        return ra_call_extractor(ra, key, key_len, out_len TSRMLS_CC);
     } else if ((start = strchr(key, '{')) == NULL || (end = strchr(start + 1, '}')) == NULL) {
         return estrndup(key, key_len);
     }
-	/* found substring */
-	*out_len = end - start - 1;
+    /* found substring */
+    *out_len = end - start - 1;
     return estrndup(start + 1, *out_len);
 }
 
@@ -436,25 +436,25 @@ ra_call_distributor(RedisArray *ra, const char *key, int key_len TSRMLS_DC)
     int ret;
     zval z_ret, z_argv;
 
-	/* check that we can call the extractor function */
+    /* check that we can call the extractor function */
 #if (PHP_MAJOR_VERSION < 7)
     if (!zend_is_callable_ex(&ra->z_dist, NULL, 0, NULL, NULL, NULL, NULL TSRMLS_CC)) {
 #else
     if (!zend_is_callable_ex(&ra->z_dist, NULL, 0, NULL, NULL, NULL)) {
 #endif
-		php_error_docref(NULL TSRMLS_CC, E_ERROR, "Could not call distributor function");
-		return -1;
-	}
+        php_error_docref(NULL TSRMLS_CC, E_ERROR, "Could not call distributor function");
+        return -1;
+    }
 
     ZVAL_NULL(&z_ret);
-	/* call extraction function */
+    /* call extraction function */
     ZVAL_STRINGL(&z_argv, key, key_len);
     call_user_function(EG(function_table), NULL, &ra->z_dist, &z_ret, 1, &z_argv);
 
     ret = (Z_TYPE(z_ret) == IS_LONG) ? Z_LVAL(z_ret) : -1;
 
     zval_dtor(&z_argv);
-	zval_dtor(&z_ret);
+    zval_dtor(&z_ret);
     return ret;
 }
 
@@ -483,7 +483,7 @@ ra_find_node(RedisArray *ra, const char *key, int key_len, int *out_pos TSRMLS_D
             CRC32(ret, (unsigned char)out[i]);
         }
         hash = (ret ^ 0xffffffff);
-        
+
         /* get position on ring */
         pos = (int)(hash * ra->count / 0xffffffff);
     }
@@ -497,23 +497,23 @@ ra_find_node(RedisArray *ra, const char *key, int key_len, int *out_pos TSRMLS_D
 zval *
 ra_find_node_by_name(RedisArray *ra, const char *host, int host_len TSRMLS_DC) {
 
-	int i;
-	for(i = 0; i < ra->count; ++i) {
-		if(strncmp(ra->hosts[i], host, host_len) == 0) {
-			return &ra->redis[i];
-		}
-	}
-	return NULL;
+    int i;
+    for(i = 0; i < ra->count; ++i) {
+        if(strncmp(ra->hosts[i], host, host_len) == 0) {
+            return &ra->redis[i];
+        }
+    }
+    return NULL;
 }
 
 void
 ra_index_multi(zval *z_redis, long multi_value TSRMLS_DC) {
 
-	zval z_fun_multi, z_ret;
-	zval z_args[1];
+    zval z_fun_multi, z_ret;
+    zval z_args[1];
 
-	/* run MULTI */
-	ZVAL_STRINGL(&z_fun_multi, "MULTI", 5);
+    /* run MULTI */
+    ZVAL_STRINGL(&z_fun_multi, "MULTI", 5);
     ZVAL_LONG(&z_args[0], multi_value);
     call_user_function(&redis_ce->function_table, z_redis, &z_fun_multi, &z_ret, 1, z_args);
     zval_dtor(&z_fun_multi);
@@ -523,39 +523,39 @@ ra_index_multi(zval *z_redis, long multi_value TSRMLS_DC) {
 static void
 ra_index_change_keys(const char *cmd, zval *z_keys, zval *z_redis TSRMLS_DC) {
 
-	int i, argc;
+    int i, argc;
     zval z_fun, z_ret, *z_args;
 
-	/* alloc */
-	argc = 1 + zend_hash_num_elements(Z_ARRVAL_P(z_keys));
+    /* alloc */
+    argc = 1 + zend_hash_num_elements(Z_ARRVAL_P(z_keys));
     z_args = ecalloc(argc, sizeof(zval));
 
-	/* prepare first parameters */
-	ZVAL_STRING(&z_fun, cmd);
+    /* prepare first parameters */
+    ZVAL_STRING(&z_fun, cmd);
     ZVAL_STRINGL(&z_args[0], PHPREDIS_INDEX_NAME, sizeof(PHPREDIS_INDEX_NAME) - 1);
 
-	/* prepare keys */
-	for(i = 0; i < argc - 1; ++i) {
+    /* prepare keys */
+    for(i = 0; i < argc - 1; ++i) {
         zval *zv = zend_hash_index_find(Z_ARRVAL_P(z_keys), i);
         if (zv == NULL) {
             ZVAL_NULL(&z_args[i+1]);
         } else {
             z_args[i+1] = *zv;
         }
-	}
+    }
 
-	/* run cmd */
+    /* run cmd */
     call_user_function(&redis_ce->function_table, z_redis, &z_fun, &z_ret, argc, z_args);
 
     zval_dtor(&z_args[0]);
     zval_dtor(&z_fun);
     zval_dtor(&z_ret);
-	efree(z_args);		/* free container */
+    efree(z_args);      /* free container */
 }
 
 void
 ra_index_del(zval *z_keys, zval *z_redis TSRMLS_DC) {
-	ra_index_change_keys("SREM", z_keys, z_redis TSRMLS_CC);
+    ra_index_change_keys("SREM", z_keys, z_redis TSRMLS_CC);
 }
 
 void
@@ -564,14 +564,14 @@ ra_index_keys(zval *z_pairs, zval *z_redis TSRMLS_DC) {
     zval z_keys, *z_val;
     zend_string *zkey;
     ulong idx;
-	/* Initialize key array */
+    /* Initialize key array */
 #if PHP_VERSION_ID > 50300
-	array_init_size(&z_keys, zend_hash_num_elements(Z_ARRVAL_P(z_pairs)));
+    array_init_size(&z_keys, zend_hash_num_elements(Z_ARRVAL_P(z_pairs)));
 #else
-	array_init(&z_keys);
+    array_init(&z_keys);
 #endif
 
-	/* Go through input array and add values to the key array */
+    /* Go through input array and add values to the key array */
     ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(z_pairs), idx, zkey, z_val) {
         zval zv, *z_new = &zv;
 #if (PHP_MAJOR_VERSION < 7)
@@ -587,11 +587,11 @@ ra_index_keys(zval *z_pairs, zval *z_redis TSRMLS_DC) {
         zend_hash_next_index_insert(Z_ARRVAL(z_keys), z_new);
     } ZEND_HASH_FOREACH_END();
 
-	/* add keys to index */
-	ra_index_change_keys("SADD", &z_keys, z_redis TSRMLS_CC);
+    /* add keys to index */
+    ra_index_change_keys("SADD", &z_keys, z_redis TSRMLS_CC);
 
-	/* cleanup */
-	zval_dtor(&z_keys);
+    /* cleanup */
+    zval_dtor(&z_keys);
 }
 
 void
@@ -599,13 +599,13 @@ ra_index_key(const char *key, int key_len, zval *z_redis TSRMLS_DC) {
 
     zval z_fun_sadd, z_ret, z_args[2];
 
-	/* prepare args */
-	ZVAL_STRINGL(&z_fun_sadd, "SADD", 4);
+    /* prepare args */
+    ZVAL_STRINGL(&z_fun_sadd, "SADD", 4);
 
     ZVAL_STRINGL(&z_args[0], PHPREDIS_INDEX_NAME, sizeof(PHPREDIS_INDEX_NAME) - 1);
     ZVAL_STRINGL(&z_args[1], key, key_len);
 
-	/* run SADD */
+    /* run SADD */
     call_user_function(&redis_ce->function_table, z_redis, &z_fun_sadd, &z_ret, 2, z_args);
     zval_dtor(&z_fun_sadd);
     zval_dtor(&z_args[1]);
@@ -616,126 +616,126 @@ ra_index_key(const char *key, int key_len, zval *z_redis TSRMLS_DC) {
 void
 ra_index_exec(zval *z_redis, zval *return_value, int keep_all TSRMLS_DC) {
 
-	zval z_fun_exec, z_ret, *zp_tmp;
+    zval z_fun_exec, z_ret, *zp_tmp;
 
-	/* run EXEC */
-	ZVAL_STRINGL(&z_fun_exec, "EXEC", 4);
-	call_user_function(&redis_ce->function_table, z_redis, &z_fun_exec, &z_ret, 0, NULL);
+    /* run EXEC */
+    ZVAL_STRINGL(&z_fun_exec, "EXEC", 4);
+    call_user_function(&redis_ce->function_table, z_redis, &z_fun_exec, &z_ret, 0, NULL);
     zval_dtor(&z_fun_exec);
 
-	/* extract first element of exec array and put into return_value. */
-	if(Z_TYPE(z_ret) == IS_ARRAY) {
-		if(return_value) {
-				if(keep_all) {
+    /* extract first element of exec array and put into return_value. */
+    if(Z_TYPE(z_ret) == IS_ARRAY) {
+        if(return_value) {
+                if(keep_all) {
                     zp_tmp = &z_ret;
                     RETVAL_ZVAL(zp_tmp, 1, 0);
-				} else if ((zp_tmp = zend_hash_index_find(Z_ARRVAL(z_ret), 0)) != NULL) {
+                } else if ((zp_tmp = zend_hash_index_find(Z_ARRVAL(z_ret), 0)) != NULL) {
                     RETVAL_ZVAL(zp_tmp, 1, 0);
-				}
-		}
-	}
-	zval_dtor(&z_ret);
+                }
+        }
+    }
+    zval_dtor(&z_ret);
 
-	/* zval *zptr = &z_ret; */
-	/* php_var_dump(&zptr, 0 TSRMLS_CC); */
+    /* zval *zptr = &z_ret; */
+    /* php_var_dump(&zptr, 0 TSRMLS_CC); */
 }
 
 void
 ra_index_discard(zval *z_redis, zval *return_value TSRMLS_DC) {
 
-	zval z_fun_discard, z_ret;
+    zval z_fun_discard, z_ret;
 
-	/* run DISCARD */
-	ZVAL_STRINGL(&z_fun_discard, "DISCARD", 7);
-	call_user_function(&redis_ce->function_table, z_redis, &z_fun_discard, &z_ret, 0, NULL);
+    /* run DISCARD */
+    ZVAL_STRINGL(&z_fun_discard, "DISCARD", 7);
+    call_user_function(&redis_ce->function_table, z_redis, &z_fun_discard, &z_ret, 0, NULL);
 
-	zval_dtor(&z_fun_discard);
-	zval_dtor(&z_ret);
+    zval_dtor(&z_fun_discard);
+    zval_dtor(&z_ret);
 }
 
 void
 ra_index_unwatch(zval *z_redis, zval *return_value TSRMLS_DC) {
 
-	zval z_fun_unwatch, z_ret;
+    zval z_fun_unwatch, z_ret;
 
-	/* run UNWATCH */
-	ZVAL_STRINGL(&z_fun_unwatch, "UNWATCH", 7);
-	call_user_function(&redis_ce->function_table, z_redis, &z_fun_unwatch, &z_ret, 0, NULL);
+    /* run UNWATCH */
+    ZVAL_STRINGL(&z_fun_unwatch, "UNWATCH", 7);
+    call_user_function(&redis_ce->function_table, z_redis, &z_fun_unwatch, &z_ret, 0, NULL);
 
-	zval_dtor(&z_fun_unwatch);
-	zval_dtor(&z_ret);
+    zval_dtor(&z_fun_unwatch);
+    zval_dtor(&z_ret);
 }
 
 zend_bool
 ra_is_write_cmd(RedisArray *ra, const char *cmd, int cmd_len) {
 
-	zend_bool ret;
-	int i;
-	char *cmd_up = emalloc(1 + cmd_len);
-	/* convert to uppercase */
-	for(i = 0; i < cmd_len; ++i)
-		cmd_up[i] = toupper(cmd[i]);
-	cmd_up[cmd_len] = 0;
+    zend_bool ret;
+    int i;
+    char *cmd_up = emalloc(1 + cmd_len);
+    /* convert to uppercase */
+    for(i = 0; i < cmd_len; ++i)
+        cmd_up[i] = toupper(cmd[i]);
+    cmd_up[cmd_len] = 0;
 
-	ret = zend_hash_str_exists(ra->pure_cmds, cmd_up, cmd_len);
+    ret = zend_hash_str_exists(ra->pure_cmds, cmd_up, cmd_len);
 
-	efree(cmd_up);
-	return !ret;
+    efree(cmd_up);
+    return !ret;
 }
 
 /* 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) {
 
-	int i = 0;
-	zval z_fun, z_ret, z_arg, *z_data;
-	long success = 1;
+    int i = 0;
+    zval z_fun, z_ret, z_arg, *z_data;
+    long success = 1;
 
-	/* Pipelined */
-	ra_index_multi(z_from, PIPELINE TSRMLS_CC);
+    /* Pipelined */
+    ra_index_multi(z_from, PIPELINE TSRMLS_CC);
 
-	/* prepare args */
-	ZVAL_STRINGL(&z_arg, key, key_len);
+    /* prepare args */
+    ZVAL_STRINGL(&z_arg, key, key_len);
 
-	/* run TYPE */
+    /* run TYPE */
     ZVAL_NULL(&z_ret);
-	ZVAL_STRINGL(&z_fun, "TYPE", 4);
-	call_user_function(&redis_ce->function_table, z_redis, &z_fun, &z_ret, 1, &z_arg);
+    ZVAL_STRINGL(&z_fun, "TYPE", 4);
+    call_user_function(&redis_ce->function_table, z_redis, &z_fun, &z_ret, 1, &z_arg);
     zval_dtor(&z_fun);
-	zval_dtor(&z_ret);
+    zval_dtor(&z_ret);
 
-	/* run TYPE */
+    /* run TYPE */
     ZVAL_NULL(&z_ret);
-	ZVAL_STRINGL(&z_fun, "TTL", 3);
-	call_user_function(&redis_ce->function_table, z_redis, &z_fun, &z_ret, 1, &z_arg);
+    ZVAL_STRINGL(&z_fun, "TTL", 3);
+    call_user_function(&redis_ce->function_table, z_redis, &z_fun, &z_ret, 1, &z_arg);
     zval_dtor(&z_fun);
-	zval_dtor(&z_ret);
+    zval_dtor(&z_ret);
 
-	/* Get the result from the pipeline. */
-	ra_index_exec(z_from, &z_ret, 1 TSRMLS_CC);
+    /* Get the result from the pipeline. */
+    ra_index_exec(z_from, &z_ret, 1 TSRMLS_CC);
     if (Z_TYPE(z_ret) == IS_ARRAY) {
         ZEND_HASH_FOREACH_VAL(Z_ARRVAL(z_ret), z_data) {
             if (z_data == NULL || Z_TYPE_P(z_data) != IS_LONG) {
-				success = 0;
-				break;
-			}
-			/* Get the result - Might change in the future to handle doubles as well */
-			res[i++] = Z_LVAL_P(z_data);
+                success = 0;
+                break;
+            }
+            /* Get the result - Might change in the future to handle doubles as well */
+            res[i++] = Z_LVAL_P(z_data);
         } ZEND_HASH_FOREACH_END();
-	}
-	zval_dtor(&z_arg);
-	zval_dtor(&z_ret);
-	return success;
+    }
+    zval_dtor(&z_arg);
+    zval_dtor(&z_ret);
+    return success;
 }
 
 /* delete key from source server index during rehashing */
 static void
 ra_remove_from_index(zval *z_redis, const char *key, int key_len TSRMLS_DC) {
 
-	zval z_fun_srem, z_ret, z_args[2];
+    zval z_fun_srem, z_ret, z_args[2];
 
-	/* run SREM on source index */
-	ZVAL_STRINGL(&z_fun_srem, "SREM", 4);
+    /* run SREM on source index */
+    ZVAL_STRINGL(&z_fun_srem, "SREM", 4);
     ZVAL_STRINGL(&z_args[0], PHPREDIS_INDEX_NAME, sizeof(PHPREDIS_INDEX_NAME) - 1);
     ZVAL_STRINGL(&z_args[1], key, key_len);
 
@@ -753,26 +753,26 @@ ra_remove_from_index(zval *z_redis, const char *key, int key_len TSRMLS_DC) {
 static zend_bool
 ra_del_key(const char *key, int key_len, zval *z_from TSRMLS_DC) {
 
-	zval z_fun_del, z_ret, z_args[1];
+    zval z_fun_del, z_ret, z_args[1];
 
-	/* in a transaction */
-	ra_index_multi(z_from, MULTI TSRMLS_CC);
+    /* in a transaction */
+    ra_index_multi(z_from, MULTI TSRMLS_CC);
 
-	/* run DEL on source */
-	ZVAL_STRINGL(&z_fun_del, "DEL", 3);
-	ZVAL_STRINGL(&z_args[0], key, key_len);
-	call_user_function(&redis_ce->function_table, z_from, &z_fun_del, &z_ret, 1, z_args);
+    /* run DEL on source */
+    ZVAL_STRINGL(&z_fun_del, "DEL", 3);
+    ZVAL_STRINGL(&z_args[0], key, key_len);
+    call_user_function(&redis_ce->function_table, z_from, &z_fun_del, &z_ret, 1, z_args);
     zval_dtor(&z_fun_del);
     zval_dtor(&z_args[0]);
     zval_dtor(&z_ret);
 
-	/* remove key from index */
-	ra_remove_from_index(z_from, key, key_len TSRMLS_CC);
+    /* remove key from index */
+    ra_remove_from_index(z_from, key, key_len TSRMLS_CC);
 
-	/* close transaction */
-	ra_index_exec(z_from, NULL, 0 TSRMLS_CC);
+    /* close transaction */
+    ra_index_exec(z_from, NULL, 0 TSRMLS_CC);
 
-	return 1;
+    return 1;
 }
 
 static zend_bool
@@ -780,80 +780,80 @@ ra_expire_key(const char *key, int key_len, zval *z_to, long ttl TSRMLS_DC) {
 
     zval z_fun_expire, z_ret, z_args[2];
 
-	if (ttl > 0)
-	{
-		/* run EXPIRE on target */
-		ZVAL_STRINGL(&z_fun_expire, "EXPIRE", 6);
+    if (ttl > 0)
+    {
+        /* run EXPIRE on target */
+        ZVAL_STRINGL(&z_fun_expire, "EXPIRE", 6);
         ZVAL_STRINGL(&z_args[0], key, key_len);
         ZVAL_LONG(&z_args[1], ttl);
         call_user_function(&redis_ce->function_table, z_to, &z_fun_expire, &z_ret, 2, z_args);
         zval_dtor(&z_fun_expire);
         zval_dtor(&z_args[0]);
         zval_dtor(&z_ret);
-	}
+    }
 
-	return 1;
+    return 1;
 }
 
 static zend_bool
 ra_move_zset(const char *key, int key_len, zval *z_from, zval *z_to, long ttl TSRMLS_DC) {
 
     zval z_fun_zrange, z_fun_zadd, z_ret, z_ret_dest, z_args[4], *z_zadd_args, *z_score_p;
-	int i, count;
-	HashTable *h_zset_vals;
+    int i, count;
+    HashTable *h_zset_vals;
     zend_string *zkey;
-	ulong idx;
-
-	/* run ZRANGE key 0 -1 WITHSCORES on source */
-	ZVAL_STRINGL(&z_fun_zrange, "ZRANGE", 6);
-	ZVAL_STRINGL(&z_args[0], key, key_len);
-	ZVAL_STRINGL(&z_args[1], "0", 1);
-	ZVAL_STRINGL(&z_args[2], "-1", 2);
-	ZVAL_BOOL(&z_args[3], 1);
-	call_user_function(&redis_ce->function_table, z_from, &z_fun_zrange, &z_ret, 4, z_args);
+    ulong idx;
+
+    /* run ZRANGE key 0 -1 WITHSCORES on source */
+    ZVAL_STRINGL(&z_fun_zrange, "ZRANGE", 6);
+    ZVAL_STRINGL(&z_args[0], key, key_len);
+    ZVAL_STRINGL(&z_args[1], "0", 1);
+    ZVAL_STRINGL(&z_args[2], "-1", 2);
+    ZVAL_BOOL(&z_args[3], 1);
+    call_user_function(&redis_ce->function_table, z_from, &z_fun_zrange, &z_ret, 4, z_args);
     zval_dtor(&z_fun_zrange);
     zval_dtor(&z_args[2]);
     zval_dtor(&z_args[1]);
     zval_dtor(&z_args[0]);
 
 
-	if(Z_TYPE(z_ret) != IS_ARRAY) { /* key not found or replaced */
-		/* TODO: report? */
+    if(Z_TYPE(z_ret) != IS_ARRAY) { /* key not found or replaced */
+        /* TODO: report? */
         zval_dtor(&z_ret);
-		return 0;
-	}
+        return 0;
+    }
 
-	/* we now have an array of value → score pairs in z_ret. */
-	h_zset_vals = Z_ARRVAL(z_ret);
+    /* we now have an array of value → score pairs in z_ret. */
+    h_zset_vals = Z_ARRVAL(z_ret);
 
-	/* allocate argument array for ZADD */
-	count = zend_hash_num_elements(h_zset_vals);
+    /* allocate argument array for ZADD */
+    count = zend_hash_num_elements(h_zset_vals);
     z_zadd_args = ecalloc((1 + 2*count), sizeof(zval));
 
     ZVAL_STRINGL(&z_zadd_args[0], key, key_len);
 
     i = 1;
     ZEND_HASH_FOREACH_KEY_VAL(h_zset_vals, idx, zkey, z_score_p) {
-		/* add score */
+        /* add score */
         ZVAL_DOUBLE(&z_zadd_args[i], Z_DVAL_P(z_score_p));
 
-		/* add value */
+        /* add value */
         if (zkey) {
             ZVAL_STRINGL(&z_zadd_args[i+1], ZSTR_VAL(zkey), ZSTR_LEN(zkey));
         } else {
             ZVAL_LONG(&z_zadd_args[i+1], (long)idx);
         }
-		i += 2;
-	} ZEND_HASH_FOREACH_END();
+        i += 2;
+    } ZEND_HASH_FOREACH_END();
 
-	/* run ZADD on target */
-	ZVAL_STRINGL(&z_fun_zadd, "ZADD", 4);
+    /* run ZADD on target */
+    ZVAL_STRINGL(&z_fun_zadd, "ZADD", 4);
     call_user_function(&redis_ce->function_table, z_to, &z_fun_zadd, &z_ret_dest, 1 + 2 * count, z_zadd_args);
 
-	/* Expire if needed */
-	ra_expire_key(key, key_len, z_to, ttl TSRMLS_CC);
+    /* Expire if needed */
+    ra_expire_key(key, key_len, z_to, ttl TSRMLS_CC);
 
-	/* cleanup */
+    /* cleanup */
     zval_dtor(&z_fun_zadd);
     zval_dtor(&z_ret_dest);
     zval_dtor(&z_ret);
@@ -864,7 +864,7 @@ ra_move_zset(const char *key, int key_len, zval *z_from, zval *z_to, long ttl TS
     }
     efree(z_zadd_args);
 
-	return 1;
+    return 1;
 }
 
 static zend_bool
@@ -872,116 +872,116 @@ ra_move_string(const char *key, int key_len, zval *z_from, zval *z_to, long ttl
 
     zval z_fun_get, z_fun_set, z_ret, z_args[3];
 
-	/* run GET on source */
-	ZVAL_STRINGL(&z_fun_get, "GET", 3);
+    /* run GET on source */
+    ZVAL_STRINGL(&z_fun_get, "GET", 3);
     ZVAL_STRINGL(&z_args[0], key, key_len);
     call_user_function(&redis_ce->function_table, z_from, &z_fun_get, &z_ret, 1, z_args);
     zval_dtor(&z_fun_get);
 
-	if(Z_TYPE(z_ret) != IS_STRING) { /* key not found or replaced */
-		/* TODO: report? */
+    if(Z_TYPE(z_ret) != IS_STRING) { /* key not found or replaced */
+        /* TODO: report? */
         zval_dtor(&z_args[0]);
         zval_dtor(&z_ret);
-		return 0;
-	}
+        return 0;
+    }
 
-	/* run SET on target */
-	if (ttl > 0) {
+    /* run SET on target */
+    if (ttl > 0) {
         ZVAL_STRINGL(&z_fun_set, "SETEX", 5);
         ZVAL_LONG(&z_args[1], ttl);
         ZVAL_STRINGL(&z_args[2], Z_STRVAL(z_ret), Z_STRLEN(z_ret)); /* copy z_ret to arg 1 */
-		zval_dtor(&z_ret); /* free memory from our previous call */
+        zval_dtor(&z_ret); /* free memory from our previous call */
         call_user_function(&redis_ce->function_table, z_to, &z_fun_set, &z_ret, 3, z_args);
-		/* cleanup */
+        /* cleanup */
         zval_dtor(&z_args[2]);
     } else {
         ZVAL_STRINGL(&z_fun_set, "SET", 3);
         ZVAL_STRINGL(&z_args[1], Z_STRVAL(z_ret), Z_STRLEN(z_ret)); /* copy z_ret to arg 1 */
-		zval_dtor(&z_ret); /* free memory from our previous return value */
+        zval_dtor(&z_ret); /* free memory from our previous return value */
         call_user_function(&redis_ce->function_table, z_to, &z_fun_set, &z_ret, 2, z_args);
-		/* cleanup */
+        /* cleanup */
         zval_dtor(&z_args[1]);
-	}
+    }
     zval_dtor(&z_fun_set);
     zval_dtor(&z_args[0]);
     zval_dtor(&z_ret);
 
-	return 1;
+    return 1;
 }
 
 static zend_bool
 ra_move_hash(const char *key, int key_len, zval *z_from, zval *z_to, long ttl TSRMLS_DC) {
-	zval z_fun_hgetall, z_fun_hmset, z_ret_dest, z_args[2];
+    zval z_fun_hgetall, z_fun_hmset, z_ret_dest, z_args[2];
 
-	/* run HGETALL on source */
+    /* run HGETALL on source */
     ZVAL_STRINGL(&z_args[0], key, key_len);
     ZVAL_STRINGL(&z_fun_hgetall, "HGETALL", 7);
     call_user_function(&redis_ce->function_table, z_from, &z_fun_hgetall, &z_args[1], 1, z_args);
     zval_dtor(&z_fun_hgetall);
 
-	if (Z_TYPE(z_args[1]) != IS_ARRAY) { /* key not found or replaced */
-		/* TODO: report? */
+    if (Z_TYPE(z_args[1]) != IS_ARRAY) { /* key not found or replaced */
+        /* TODO: report? */
         zval_dtor(&z_args[1]);
         zval_dtor(&z_args[0]);
-		return 0;
-	}
+        return 0;
+    }
 
-	/* run HMSET on target */
-	ZVAL_STRINGL(&z_fun_hmset, "HMSET", 5);
-	call_user_function(&redis_ce->function_table, z_to, &z_fun_hmset, &z_ret_dest, 2, z_args);
+    /* run HMSET on target */
+    ZVAL_STRINGL(&z_fun_hmset, "HMSET", 5);
+    call_user_function(&redis_ce->function_table, z_to, &z_fun_hmset, &z_ret_dest, 2, z_args);
     zval_dtor(&z_fun_hmset);
     zval_dtor(&z_ret_dest);
 
-	/* Expire if needed */
-	ra_expire_key(key, key_len, z_to, ttl TSRMLS_CC);
+    /* Expire if needed */
+    ra_expire_key(key, key_len, z_to, ttl TSRMLS_CC);
 
-	/* cleanup */
+    /* cleanup */
     zval_dtor(&z_args[1]);
     zval_dtor(&z_args[0]);
 
-	return 1;
+    return 1;
 }
 
 static zend_bool
 ra_move_collection(const char *key, int key_len, zval *z_from, zval *z_to,
-		int list_count, const char **cmd_list,
-		int add_count, const char **cmd_add, long ttl TSRMLS_DC) {
+        int list_count, const char **cmd_list,
+        int add_count, const char **cmd_add, long ttl TSRMLS_DC) {
 
     zval z_fun_retrieve, z_fun_sadd, z_ret, *z_retrieve_args, *z_sadd_args, *z_data_p;
-	int count, i;
-	HashTable *h_set_vals;
+    int count, i;
+    HashTable *h_set_vals;
 
-	/* run retrieval command on source */
-	ZVAL_STRING(&z_fun_retrieve, cmd_list[0]);	/* set the command */
+    /* run retrieval command on source */
+    ZVAL_STRING(&z_fun_retrieve, cmd_list[0]);  /* set the command */
 
     z_retrieve_args = ecalloc(list_count, sizeof(zval));
-	/* set the key */
+    /* set the key */
     ZVAL_STRINGL(&z_retrieve_args[0], key, key_len);
 
-	/* possibly add some other args if they were provided. */
-	for(i = 1; i < list_count; ++i) {
+    /* possibly add some other args if they were provided. */
+    for(i = 1; i < list_count; ++i) {
         ZVAL_STRING(&z_retrieve_args[i], cmd_list[i]);
-	}
+    }
 
     call_user_function(&redis_ce->function_table, z_from, &z_fun_retrieve, &z_ret, list_count, z_retrieve_args);
 
-	/* cleanup */
+    /* cleanup */
     zval_dtor(&z_fun_retrieve);
-	for(i = 0; i < list_count; ++i) {
+    for(i = 0; i < list_count; ++i) {
         zval_dtor(&z_retrieve_args[i]);
-	}
-	efree(z_retrieve_args);
+    }
+    efree(z_retrieve_args);
 
-	if(Z_TYPE(z_ret) != IS_ARRAY) { /* key not found or replaced */
-		/* TODO: report? */
+    if(Z_TYPE(z_ret) != IS_ARRAY) { /* key not found or replaced */
+        /* TODO: report? */
         zval_dtor(&z_ret);
-		return 0;
-	}
+        return 0;
+    }
 
-	/* run SADD/RPUSH on target */
-	h_set_vals = Z_ARRVAL(z_ret);
-	count = 1 + zend_hash_num_elements(h_set_vals);
-	ZVAL_STRING(&z_fun_sadd, cmd_add[0]);
+    /* run SADD/RPUSH on target */
+    h_set_vals = Z_ARRVAL(z_ret);
+    count = 1 + zend_hash_num_elements(h_set_vals);
+    ZVAL_STRING(&z_fun_sadd, cmd_add[0]);
     z_sadd_args = ecalloc(count, sizeof(zval));
     ZVAL_STRINGL(&z_sadd_args[0], key, key_len);
 
@@ -997,88 +997,88 @@ ra_move_collection(const char *key, int key_len, zval *z_from, zval *z_to,
 
     call_user_function(&redis_ce->function_table, z_to, &z_fun_sadd, &z_ret, count, z_sadd_args);
 
-	/* cleanup */
+    /* cleanup */
     zval_dtor(&z_fun_sadd);
     for (i = 0; i < count; i++) {
         zval_dtor(&z_sadd_args[i]);
     }
-	efree(z_sadd_args);
+    efree(z_sadd_args);
 
     /* Clean up our output return value */
     zval_dtor(&z_ret);
 
-	/* Expire if needed */
-	ra_expire_key(key, key_len, z_to, ttl TSRMLS_CC);
+    /* Expire if needed */
+    ra_expire_key(key, key_len, z_to, ttl TSRMLS_CC);
 
-	return 1;
+    return 1;
 }
 
 static zend_bool
 ra_move_set(const char *key, int key_len, zval *z_from, zval *z_to, long ttl TSRMLS_DC) {
 
-	const char *cmd_list[] = {"SMEMBERS"};
-	const char *cmd_add[] = {"SADD"};
-	return ra_move_collection(key, key_len, z_from, z_to, 1, cmd_list, 1, cmd_add, ttl TSRMLS_CC);
+    const char *cmd_list[] = {"SMEMBERS"};
+    const char *cmd_add[] = {"SADD"};
+    return ra_move_collection(key, key_len, z_from, z_to, 1, cmd_list, 1, cmd_add, ttl TSRMLS_CC);
 }
 
 static zend_bool
 ra_move_list(const char *key, int key_len, zval *z_from, zval *z_to, long ttl TSRMLS_DC) {
 
-	const char *cmd_list[] = {"LRANGE", "0", "-1"};
-	const char *cmd_add[] = {"RPUSH"};
-	return ra_move_collection(key, key_len, z_from, z_to, 3, cmd_list, 1, cmd_add, ttl TSRMLS_CC);
+    const char *cmd_list[] = {"LRANGE", "0", "-1"};
+    const char *cmd_add[] = {"RPUSH"};
+    return ra_move_collection(key, key_len, z_from, z_to, 3, cmd_list, 1, cmd_add, ttl TSRMLS_CC);
 }
 
 void
 ra_move_key(const char *key, int key_len, zval *z_from, zval *z_to TSRMLS_DC) {
 
-	long res[2] = {0}, type, ttl;
-	zend_bool success = 0;
-	if (ra_get_key_type(z_from, key, key_len, z_from, res TSRMLS_CC)) {
-		type = res[0];
-		ttl = res[1];
-		/* open transaction on target server */
-		ra_index_multi(z_to, MULTI TSRMLS_CC);
-		switch(type) {
-			case REDIS_STRING:
-				success = ra_move_string(key, key_len, z_from, z_to, ttl TSRMLS_CC);
-				break;
-
-			case REDIS_SET:
-				success = ra_move_set(key, key_len, z_from, z_to, ttl TSRMLS_CC);
-				break;
-
-			case REDIS_LIST:
-				success = ra_move_list(key, key_len, z_from, z_to, ttl TSRMLS_CC);
-				break;
-
-			case REDIS_ZSET:
-				success = ra_move_zset(key, key_len, z_from, z_to, ttl TSRMLS_CC);
-				break;
-
-			case REDIS_HASH:
-				success = ra_move_hash(key, key_len, z_from, z_to, ttl TSRMLS_CC);
-				break;
-
-			default:
-				/* TODO: report? */
-				break;
-		}
-	}
-
-	if(success) {
-		ra_del_key(key, key_len, z_from TSRMLS_CC);
-		ra_index_key(key, key_len, z_to TSRMLS_CC);
-	}
-
-	/* close transaction */
-	ra_index_exec(z_to, NULL, 0 TSRMLS_CC);
+    long res[2] = {0}, type, ttl;
+    zend_bool success = 0;
+    if (ra_get_key_type(z_from, key, key_len, z_from, res TSRMLS_CC)) {
+        type = res[0];
+        ttl = res[1];
+        /* open transaction on target server */
+        ra_index_multi(z_to, MULTI TSRMLS_CC);
+        switch(type) {
+            case REDIS_STRING:
+                success = ra_move_string(key, key_len, z_from, z_to, ttl TSRMLS_CC);
+                break;
+
+            case REDIS_SET:
+                success = ra_move_set(key, key_len, z_from, z_to, ttl TSRMLS_CC);
+                break;
+
+            case REDIS_LIST:
+                success = ra_move_list(key, key_len, z_from, z_to, ttl TSRMLS_CC);
+                break;
+
+            case REDIS_ZSET:
+                success = ra_move_zset(key, key_len, z_from, z_to, ttl TSRMLS_CC);
+                break;
+
+            case REDIS_HASH:
+                success = ra_move_hash(key, key_len, z_from, z_to, ttl TSRMLS_CC);
+                break;
+
+            default:
+                /* TODO: report? */
+                break;
+        }
+    }
+
+    if(success) {
+        ra_del_key(key, key_len, z_from TSRMLS_CC);
+        ra_index_key(key, key_len, z_to TSRMLS_CC);
+    }
+
+    /* close transaction */
+    ra_index_exec(z_to, NULL, 0 TSRMLS_CC);
 }
 
 /* callback with the current progress, with hostname and count */
 static void
 zval_rehash_callback(zend_fcall_info *z_cb, zend_fcall_info_cache *z_cb_cache,
-	const char *hostname, long count TSRMLS_DC) {
+    const char *hostname, long count TSRMLS_DC) {
 
     zval zv, *z_ret = &zv;
 
@@ -1105,13 +1105,13 @@ zval_rehash_callback(zend_fcall_info *z_cb, zend_fcall_info_cache *z_cb_cache,
     z_cb->params = z_args;
     z_cb->retval = z_ret;
 #endif
-	z_cb->no_separation = 0;
-	z_cb->param_count = 2;
+    z_cb->no_separation = 0;
+    z_cb->param_count = 2;
 
-	/* run cb(hostname, count) */
-	zend_call_function(z_cb, z_cb_cache TSRMLS_CC);
+    /* run cb(hostname, count) */
+    zend_call_function(z_cb, z_cb_cache TSRMLS_CC);
 
-	/* cleanup */
+    /* cleanup */
 #if (PHP_MAJOR_VERSION < 7)
     zval_ptr_dtor(&z_host);
     zval_ptr_dtor(&z_count);
@@ -1123,7 +1123,7 @@ zval_rehash_callback(zend_fcall_info *z_cb, zend_fcall_info_cache *z_cb_cache,
 
 static void
 ra_rehash_server(RedisArray *ra, zval *z_redis, const char *hostname, zend_bool b_index,
-		zend_fcall_info *z_cb, zend_fcall_info_cache *z_cb_cache TSRMLS_DC) {
+        zend_fcall_info *z_cb, zend_fcall_info_cache *z_cb_cache TSRMLS_DC) {
 
     HashTable *h_keys;
     long count = 0;
@@ -1152,10 +1152,10 @@ ra_rehash_server(RedisArray *ra, zval *z_redis, const char *hostname, zend_bool
         return;
     }
 
-	/* callback */
-	if(z_cb && z_cb_cache) {
-		zval_rehash_callback(z_cb, z_cb_cache, hostname, count TSRMLS_CC);
-	}
+    /* callback */
+    if(z_cb && z_cb_cache) {
+        zval_rehash_callback(z_cb, z_cb_cache, hostname, count TSRMLS_CC);
+    }
 
     /* for each key, redistribute */
     ZEND_HASH_FOREACH_VAL(h_keys, z_ele) {
@@ -1175,14 +1175,14 @@ ra_rehash_server(RedisArray *ra, zval *z_redis, const char *hostname, zend_bool
 
 void
 ra_rehash(RedisArray *ra, zend_fcall_info *z_cb, zend_fcall_info_cache *z_cb_cache TSRMLS_DC) {
-	int i;
+    int i;
 
-	/* redistribute the data, server by server. */
-	if(!ra->prev)
-		return;	/* TODO: compare the two rings for equality */
+    /* redistribute the data, server by server. */
+    if(!ra->prev)
+        return; /* TODO: compare the two rings for equality */
 
-	for(i = 0; i < ra->prev->count; ++i) {
-		ra_rehash_server(ra, &ra->prev->redis[i], ra->prev->hosts[i], ra->index, z_cb, z_cb_cache TSRMLS_CC);
-	}
+    for(i = 0; i < ra->prev->count; ++i) {
+        ra_rehash_server(ra, &ra->prev->redis[i], ra->prev->hosts[i], ra->index, z_cb, z_cb_cache TSRMLS_CC);
+    }
 }