Skip to content

Commit 2b9a7d9

Browse files
nicolasffnicolasff
committed
Added TSRMLS_CC/DC where needed.
1 parent cb79454 commit 2b9a7d9

3 files changed

Lines changed: 69 additions & 69 deletions

File tree

‎redis_array.c‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
| Author: Nicolas Favre-Felix <n.favre-felix@owlient.eu> |
1616
+----------------------------------------------------------------------+
1717
*/
18+
1819
#ifdef HAVE_CONFIG_H
1920
#include "config.h"
2021
#endif
@@ -209,11 +210,11 @@ PHP_METHOD(RedisArray, __construct)
209210
/* extract either name of list of hosts from z0 */
210211
switch(Z_TYPE_P(z0)) {
211212
case IS_STRING:
212-
ra = ra_load_array(Z_STRVAL_P(z0));
213+
ra = ra_load_array(Z_STRVAL_P(z0) TSRMLS_CC);
213214
break;
214215

215216
case IS_ARRAY:
216-
ra = ra_make_array(Z_ARRVAL_P(z0), z_fun, hPrev, b_index);
217+
ra = ra_make_array(Z_ARRVAL_P(z0), z_fun, hPrev, b_index TSRMLS_CC);
217218
break;
218219

219220
default:
@@ -253,7 +254,7 @@ ra_forward_call(INTERNAL_FUNCTION_PARAMETERS, RedisArray *ra, const char *cmd, i
253254
}
254255

255256
/* find node */
256-
redis_inst = ra_find_node(ra, key, key_len, NULL);
257+
redis_inst = ra_find_node(ra, key, key_len, NULL TSRMLS_CC);
257258
if(!redis_inst) {
258259
php_error_docref(NULL TSRMLS_CC, E_ERROR, "Could not find any redis servers for this key.");
259260
RETURN_FALSE;
@@ -263,7 +264,7 @@ ra_forward_call(INTERNAL_FUNCTION_PARAMETERS, RedisArray *ra, const char *cmd, i
263264
b_write_cmd = ra_is_write_cmd(ra, cmd, cmd_len);
264265

265266
if(ra->index && b_write_cmd) { // add MULTI + SADD
266-
ra_index_multi(redis_inst);
267+
ra_index_multi(redis_inst TSRMLS_CC);
267268
}
268269

269270
/* pass call through */
@@ -289,7 +290,7 @@ ra_forward_call(INTERNAL_FUNCTION_PARAMETERS, RedisArray *ra, const char *cmd, i
289290
ra_index_key(key, key_len, redis_inst TSRMLS_CC);
290291

291292
// call EXEC
292-
ra_index_exec(redis_inst, return_value);
293+
ra_index_exec(redis_inst, return_value TSRMLS_CC);
293294
} else { // call directly through.
294295
call_user_function(&redis_ce->function_table, &redis_inst, &z_fun, return_value, argc, z_callargs TSRMLS_CC);
295296

@@ -368,7 +369,7 @@ PHP_METHOD(RedisArray, _target)
368369
RETURN_FALSE;
369370
}
370371

371-
redis_inst = ra_find_node(ra, key, key_len, &i);
372+
redis_inst = ra_find_node(ra, key, key_len, &i TSRMLS_CC);
372373
if(redis_inst) {
373374
ZVAL_STRING(return_value, ra->hosts[i], 1);
374375
} else {
@@ -413,7 +414,7 @@ PHP_METHOD(RedisArray, _rehash)
413414
RETURN_FALSE;
414415
}
415416

416-
ra_rehash(ra, z_cb);
417+
ra_rehash(ra, z_cb TSRMLS_CC);
417418
}
418419

419420
static void multihost_distribute(INTERNAL_FUNCTION_PARAMETERS, const char *method_name)
@@ -586,7 +587,7 @@ PHP_METHOD(RedisArray, mget)
586587
RETURN_FALSE;
587588
}
588589

589-
redis_instances[i] = ra_find_node(ra, Z_STRVAL_PP(data), Z_STRLEN_PP(data), &pos[i]);
590+
redis_instances[i] = ra_find_node(ra, Z_STRVAL_PP(data), Z_STRLEN_PP(data), &pos[i] TSRMLS_CC);
590591
argc_each[pos[i]]++; /* count number of keys per node */
591592
argv[i] = *data;
592593
}
@@ -711,7 +712,7 @@ PHP_METHOD(RedisArray, mset)
711712
RETURN_FALSE;
712713
}
713714

714-
redis_instances[i] = ra_find_node(ra, key, key_len - 1, &pos[i]); /* -1 because of PHP assoc keys which count \0... */
715+
redis_instances[i] = ra_find_node(ra, key, key_len - 1, &pos[i] TSRMLS_CC); /* -1 because of PHP assoc keys which count \0... */
715716
argc_each[pos[i]]++; /* count number of keys per node */
716717
argv[i] = *data;
717718
keys[i] = key;
@@ -828,7 +829,7 @@ PHP_METHOD(RedisArray, del)
828829
RETURN_FALSE;
829830
}
830831

831-
redis_instances[i] = ra_find_node(ra, Z_STRVAL_PP(data), Z_STRLEN_PP(data), &pos[i]);
832+
redis_instances[i] = ra_find_node(ra, Z_STRVAL_PP(data), Z_STRLEN_PP(data), &pos[i] TSRMLS_CC);
832833
argc_each[pos[i]]++; /* count number of keys per node */
833834
argv[i] = *data;
834835
}

0 commit comments

Comments
 (0)