Fix mget formatting

Author: michael-grunder

redis_array.c

@@ -865,151 +865,156 @@ PHP_METHOD(RedisArray, select)
 /* MGET will distribute the call to several nodes and regroup the values. */
 PHP_METHOD(RedisArray, mget)
 {
-	zval *object, *z_keys, z_argarray, *data, z_ret, *z_cur, z_tmp_array, *z_tmp;
-	int i, j, n;
-	RedisArray *ra;
-	int *pos, argc, *argc_each;
-	HashTable *h_keys;
-	zval **argv;
+    zval *object, *z_keys, z_argarray, *data, z_ret, *z_cur, z_tmp_array, *z_tmp;
+    int i, j, n;
+    RedisArray *ra;
+    int *pos, argc, *argc_each;
+    HashTable *h_keys;
+    zval **argv;
 
     if ((ra = redis_array_get(getThis() TSRMLS_CC)) == NULL) {
         RETURN_FALSE;
     }
 
-	/* Multi/exec support */
+    /* Multi/exec support */
     HANDLE_MULTI_EXEC(ra, "MGET");
 
-	if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Oa",
-				&object, redis_array_ce, &z_keys) == FAILURE) {
-		RETURN_FALSE;
-	}
+    if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Oa",
+				     &object, redis_array_ce, &z_keys) == FAILURE) {
+        RETURN_FALSE;
+    }
 
 
-	/* init data structures */
-	h_keys = Z_ARRVAL_P(z_keys);
-	argc = zend_hash_num_elements(h_keys);
-	argv = emalloc(argc * sizeof(zval*));
-	pos = emalloc(argc * sizeof(int));
+    /* init data structures */
+    h_keys = Z_ARRVAL_P(z_keys);
+    argc = zend_hash_num_elements(h_keys);
+    argv = emalloc(argc * sizeof(zval*));
+    pos = emalloc(argc * sizeof(int));
 
-	argc_each = emalloc(ra->count * sizeof(int));
-	memset(argc_each, 0, ra->count * sizeof(int));
+    argc_each = emalloc(ra->count * sizeof(int));
+    memset(argc_each, 0, ra->count * sizeof(int));
 
-	/* associate each key to a redis node */
+    /* associate each key to a redis node */
     i = 0;
     ZEND_HASH_FOREACH_VAL(h_keys, data) {
-	    /* If we need to represent a long key as a string */
-	    unsigned int key_len;
-	    char kbuf[40], *key_lookup;
-
-	    /* phpredis proper can only use string or long keys, so restrict to that here */
-	    if (Z_TYPE_P(data) != IS_STRING && Z_TYPE_P(data) != IS_LONG) {
-	        php_error_docref(NULL TSRMLS_CC, E_ERROR, "MGET: all keys must be strings or longs");
-	        efree(argv);
-	        efree(pos);
-	        efree(argc_each);
-	        RETURN_FALSE;
-	    }
-
-	    /* Convert to a string for hash lookup if it isn't one */
-	    if (Z_TYPE_P(data) == IS_STRING) {
-	        key_len = Z_STRLEN_P(data);
+        /* If we need to represent a long key as a string */
+        unsigned int key_len;
+        char kbuf[40], *key_lookup;
+
+        /* phpredis proper can only use string or long keys, so restrict to that here */
+        if (Z_TYPE_P(data) != IS_STRING && Z_TYPE_P(data) != IS_LONG) {
+            php_error_docref(NULL TSRMLS_CC, E_ERROR, "MGET: all keys must be strings or longs");
+            efree(argv);
+            efree(pos);
+            efree(argc_each);
+            RETURN_FALSE;
+        }
+
+        /* Convert to a string for hash lookup if it isn't one */
+        if (Z_TYPE_P(data) == IS_STRING) {
+            key_len = Z_STRLEN_P(data);
             key_lookup = Z_STRVAL_P(data);
-	    } else {
-	        key_len = snprintf(kbuf, sizeof(kbuf), "%ld", Z_LVAL_P(data));
-	        key_lookup = (char*)kbuf;
-	    }
+        } else {
+            key_len = snprintf(kbuf, sizeof(kbuf), "%ld", Z_LVAL_P(data));
+            key_lookup = (char*)kbuf;
+        }
 
-		/* Find our node */
+        /* Find our node */
         if (ra_find_node(ra, key_lookup, key_len, &pos[i] TSRMLS_CC) == NULL) {
             /* TODO: handle */
         }
 
-		argc_each[pos[i]]++;	/* count number of keys per node */
-		argv[i++] = data;
-	} ZEND_HASH_FOREACH_END();
+        argc_each[pos[i]]++;	/* count number of keys per node */
+        argv[i++] = data;
+    } ZEND_HASH_FOREACH_END();
 
-	array_init(&z_tmp_array);
-	/* calls */
-	for(n = 0; n < ra->count; ++n) { /* for each node */
-	    /* We don't even need to make a call to this node if no keys go there */
-	    if(!argc_each[n]) continue;
+    array_init(&z_tmp_array);
 
-	    /* copy args for MGET call on node. */
-		array_init(&z_argarray);
+    /* calls */
+    for(n = 0; n < ra->count; ++n) { /* for each node */
+        /* We don't even need to make a call to this node if no keys go there */
+        if(!argc_each[n]) continue;
 
-		for(i = 0; i < argc; ++i) {
-			if(pos[i] != n) continue;
+        /* copy args for MGET call on node. */
+        array_init(&z_argarray);
+
+        for(i = 0; i < argc; ++i) {
+            if(pos[i] != n) continue;
 
 #if (PHP_MAJOR_VERSION < 7)
-			MAKE_STD_ZVAL(z_tmp);
+            MAKE_STD_ZVAL(z_tmp);
 #else
             zval zv;
             z_tmp = &zv;
 #endif
+
             ZVAL_ZVAL(z_tmp, argv[i], 1, 0);
-			add_next_index_zval(&z_argarray, z_tmp);
-		}
+            add_next_index_zval(&z_argarray, z_tmp);
+        }
 
         zval z_fun;
         /* prepare call */
         ZVAL_STRINGL(&z_fun, "MGET", 4);
-		/* call MGET on the node */
+
+        /* call MGET on the node */
         call_user_function(&redis_ce->function_table, &ra->redis[n], &z_fun, &z_ret, 1, &z_argarray);
         zval_dtor(&z_fun);
 
-		/* cleanup args array */
-		zval_dtor(&z_argarray);
+        /* cleanup args array */
+        zval_dtor(&z_argarray);
 
         /* Error out if we didn't get a proper response */
         if (Z_TYPE(z_ret) != IS_ARRAY) {
             /* cleanup */
             zval_dtor(&z_ret);
             zval_dtor(&z_tmp_array);
-	        efree(argv);
+	    efree(argv);
             efree(pos);
             efree(argc_each);
 
             /* failure */
             RETURN_FALSE;
         }
 
-		for(i = 0, j = 0; i < argc; ++i) {
-		    if(pos[i] != n) continue;
+        for(i = 0, j = 0; i < argc; ++i) {
+            if(pos[i] != n) continue;
 
-			z_cur = zend_hash_index_find(Z_ARRVAL(z_ret), j++);
+            z_cur = zend_hash_index_find(Z_ARRVAL(z_ret), j++);
 
 #if (PHP_MAJOR_VERSION < 7)
-			MAKE_STD_ZVAL(z_tmp);
+            MAKE_STD_ZVAL(z_tmp);
 #else
             zval zv;
             z_tmp = &zv;
 #endif
             ZVAL_ZVAL(z_tmp, z_cur, 1, 0);
-			add_index_zval(&z_tmp_array, i, z_tmp);
-		}
-		zval_dtor(&z_ret);
-	}
+            add_index_zval(&z_tmp_array, i, z_tmp);
+        }
 
-	array_init(return_value);
-	/* copy temp array in the right order to return_value */
-	for(i = 0; i < argc; ++i) {
-		z_cur = zend_hash_index_find(Z_ARRVAL(z_tmp_array), i);
+        zval_dtor(&z_ret);
+    }
+
+    array_init(return_value);
+    /* copy temp array in the right order to return_value */
+    for(i = 0; i < argc; ++i) {
+        z_cur = zend_hash_index_find(Z_ARRVAL(z_tmp_array), i);
 
 #if (PHP_MAJOR_VERSION < 7)
-		MAKE_STD_ZVAL(z_tmp);
+        MAKE_STD_ZVAL(z_tmp);
 #else
         zval zv;
         z_tmp = &zv;
 #endif
+
         ZVAL_ZVAL(z_tmp, z_cur, 1, 0);
-		add_next_index_zval(return_value, z_tmp);
-	}
+        add_next_index_zval(return_value, z_tmp);
+    }
 
-	/* cleanup */
-	zval_dtor(&z_tmp_array);
-	efree(argv);
-	efree(pos);
-	efree(argc_each);
+    /* cleanup */
+    zval_dtor(&z_tmp_array);
+    efree(argv);
+    efree(pos);
+    efree(argc_each);
 }