Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Reordered arguments to ra_index_multi().

  • Loading branch information...
commit 8f5783cb4c8cd7608f6dff776a4e7466464e7954 1 parent 09527a6
@nicolasff nicolasff authored
Showing with 8 additions and 8 deletions.
  1. +4 −4 redis_array.c
  2. +3 −3 redis_array_impl.c
  3. +1 −1  redis_array_impl.h
View
8 redis_array.c
@@ -295,7 +295,7 @@ ra_forward_call(INTERNAL_FUNCTION_PARAMETERS, RedisArray *ra, const char *cmd, i
b_write_cmd = ra_is_write_cmd(ra, cmd, cmd_len);
if(ra->index && b_write_cmd && !ra->z_multi_exec) { /* add MULTI + SADD */
- ra_index_multi(redis_inst TSRMLS_CC, MULTI);
+ ra_index_multi(redis_inst, MULTI TSRMLS_CC);
}
/* pass call through */
@@ -847,7 +847,7 @@ PHP_METHOD(RedisArray, mset)
}
if(ra->index) { /* add MULTI */
- ra_index_multi(redis_inst TSRMLS_CC, MULTI);
+ ra_index_multi(redis_inst, MULTI TSRMLS_CC);
}
/* call */
@@ -981,7 +981,7 @@ PHP_METHOD(RedisArray, del)
}
if(ra->index) { /* add MULTI */
- ra_index_multi(redis_inst TSRMLS_CC, MULTI);
+ ra_index_multi(redis_inst, MULTI TSRMLS_CC);
}
/* call */
@@ -1051,7 +1051,7 @@ PHP_METHOD(RedisArray, multi)
ra->z_multi_exec = z_redis;
/* switch redis instance to multi/exec mode. */
- ra_index_multi(z_redis TSRMLS_CC, multi_value);
+ ra_index_multi(z_redis, multi_value TSRMLS_CC);
/* return this. */
RETURN_ZVAL(object, 1, 0);
View
6 redis_array_impl.c
@@ -432,7 +432,7 @@ ra_find_key(RedisArray *ra, zval *z_args, const char *cmd, int *key_len) {
}
void
-ra_index_multi(zval *z_redis TSRMLS_DC, long multi_value) {
+ra_index_multi(zval *z_redis, long multi_value TSRMLS_DC) {
zval z_fun_multi, z_ret;
zval *z_args[1];
@@ -727,7 +727,7 @@ ra_del_key(const char *key, int key_len, zval *z_from TSRMLS_DC) {
zval z_fun_del, z_ret, *z_args;
/* in a transaction */
- ra_index_multi(z_from TSRMLS_CC, MULTI);
+ ra_index_multi(z_from, MULTI TSRMLS_CC);
/* run DEL on source */
MAKE_STD_ZVAL(z_args);
@@ -980,7 +980,7 @@ ra_move_key(const char *key, int key_len, zval *z_from, zval *z_to TSRMLS_DC) {
zend_bool success = 0;
/* open transaction on target server */
- ra_index_multi(z_to TSRMLS_CC, MULTI);
+ ra_index_multi(z_to, MULTI TSRMLS_CC);
switch(type) {
case REDIS_STRING:
View
2  redis_array_impl.h
@@ -14,7 +14,7 @@ void ra_init_function_table(RedisArray *ra);
void ra_move_key(const char *key, int key_len, zval *z_from, zval *z_to TSRMLS_DC);
char * ra_find_key(RedisArray *ra, zval *z_args, const char *cmd, int *key_len);
-void ra_index_multi(zval *z_redis TSRMLS_DC, long multi_value);
+void ra_index_multi(zval *z_redis, long multi_value TSRMLS_DC);
void ra_index_key(const char *key, int key_len, zval *z_redis TSRMLS_DC);
void ra_index_keys(zval *z_pairs, zval *z_redis TSRMLS_DC);
Please sign in to comment.
Something went wrong with that request. Please try again.