From 007d55896435ce56d73c6f813de9301922ebc9ed Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 29 Aug 2012 16:40:46 +0200 Subject: [PATCH 1/3] fix unused-variable warnings --- redis.c | 2 -- redis_array.c | 12 ++++-------- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/redis.c b/redis.c index b3e3fbe68d..df59a529fc 100755 --- a/redis.c +++ b/redis.c @@ -3625,7 +3625,6 @@ PHP_METHOD(Redis, brpoplpush) */ PHP_METHOD(Redis, zAdd) { - zval *object; RedisSock *redis_sock; char *cmd; @@ -3633,7 +3632,6 @@ PHP_METHOD(Redis, zAdd) { double score; char *key, *val; int val_free, key_free = 0; - zval *z_value; char *dbl_str; int dbl_len; diff --git a/redis_array.c b/redis_array.c index 8d62106d24..93e843c2bc 100644 --- a/redis_array.c +++ b/redis_array.c @@ -188,7 +188,6 @@ uint32_t rcrc32(const char *s, size_t sz) { PHP_METHOD(RedisArray, __construct) { zval *z0, *z_fun = NULL, *z_dist = NULL, **zpData, *z_opts = NULL; - char *name = NULL; int id; RedisArray *ra = NULL; zend_bool b_index = 0, b_autorehash = 0; @@ -457,7 +456,6 @@ PHP_METHOD(RedisArray, _instance) PHP_METHOD(RedisArray, _function) { zval *object; - int i; RedisArray *ra; if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O", @@ -480,7 +478,6 @@ PHP_METHOD(RedisArray, _function) PHP_METHOD(RedisArray, _distributor) { zval *object; - int i; RedisArray *ra; if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O", @@ -838,12 +835,11 @@ PHP_METHOD(RedisArray, mget) /* MSET will distribute the call to several nodes and regroup the values. */ PHP_METHOD(RedisArray, mset) { - zval *object, *z_keys, z_fun, *z_argarray, **data, z_ret, **z_cur, *z_tmp; - int i, j, n; + zval *object, *z_keys, z_fun, *z_argarray, **data, z_ret; + int i, n; RedisArray *ra; int *pos, argc, *argc_each; HashTable *h_keys; - HashPosition pointer; zval **redis_instances, *redis_inst, **argv; char *key, **keys; unsigned int key_len; @@ -959,8 +955,8 @@ PHP_METHOD(RedisArray, mset) /* DEL will distribute the call to several nodes and regroup the values. */ PHP_METHOD(RedisArray, del) { - zval *object, *z_keys, z_fun, *z_argarray, **data, *z_ret, **z_cur, *z_tmp_array, *z_tmp, **z_args; - int i, j, n; + zval *object, *z_keys, z_fun, *z_argarray, **data, *z_ret, *z_tmp, **z_args; + int i, n; RedisArray *ra; int *pos, argc, *argc_each; HashTable *h_keys; From 9319f637efedab214e4e8a6dd38fdf8eef8f7ab6 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 29 Aug 2012 16:43:19 +0200 Subject: [PATCH 2/3] fix unused-variable warnings (2) --- redis_array_impl.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/redis_array_impl.c b/redis_array_impl.c index 7d45ff57a7..7968a8b56f 100644 --- a/redis_array_impl.c +++ b/redis_array_impl.c @@ -35,7 +35,7 @@ ra_load_hosts(RedisArray *ra, HashTable *hosts TSRMLS_DC) int count = zend_hash_num_elements(hosts); char *host, *p; short port; - zval **zpData, z_cons, *z_args, z_ret; + zval **zpData, z_cons, z_ret; RedisSock *redis_sock = NULL; /* function calls on the Redis object */ @@ -537,7 +537,6 @@ ra_index_keys(zval *z_pairs, zval *z_redis TSRMLS_DC) { void ra_index_key(const char *key, int key_len, zval *z_redis TSRMLS_DC) { - int i; zval z_fun_sadd, z_ret, *z_args[2]; MAKE_STD_ZVAL(z_args[0]); MAKE_STD_ZVAL(z_args[1]); @@ -741,8 +740,7 @@ ra_get_key_type(zval *z_redis, const char *key, int key_len, zval *z_from, long static void ra_remove_from_index(zval *z_redis, const char *key, int key_len TSRMLS_DC) { - int i; - zval z_fun_get, 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, 0); @@ -816,7 +814,6 @@ ra_move_zset(const char *key, int key_len, zval *z_from, zval *z_to, long ttl TS unsigned int val_len; int i; unsigned long idx; - int type; /* run ZRANGE key 0 -1 WITHSCORES on source */ ZVAL_STRINGL(&z_fun_zrange, "ZRANGE", 6, 0); From c6e13befdcb4c4f0dc39a2bf92fb1e230d7e83ff Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 29 Aug 2012 16:48:44 +0200 Subject: [PATCH 3/3] missing TSRMLS_CC, fix ZTS build --- library.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/library.c b/library.c index ce5e01e325..b40d1a11e9 100644 --- a/library.c +++ b/library.c @@ -41,7 +41,7 @@ PHPAPI int redis_check_eof(RedisSock *redis_sock TSRMLS_DC) for (; eof; count++) { if((MULTI == redis_sock->mode) || redis_sock->watching || count == 10) { /* too many failures */ if(redis_sock->stream) { /* close stream if still here */ - redis_stream_close(redis_sock); + redis_stream_close(redis_sock TSRMLS_CC); redis_sock->stream = NULL; redis_sock->mode = ATOMIC; redis_sock->status = REDIS_SOCK_STATUS_FAILED; @@ -51,7 +51,7 @@ PHPAPI int redis_check_eof(RedisSock *redis_sock TSRMLS_DC) return -1; } if(redis_sock->stream) { /* close existing stream before reconnecting */ - redis_stream_close(redis_sock); + redis_stream_close(redis_sock TSRMLS_CC); redis_sock->stream = NULL; redis_sock->mode = ATOMIC; redis_sock->watching = 0;