Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/phpredis/phpredis.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSean DuBois <sean@siobud.com>2015-09-07 10:41:33 +0300
committerSean DuBois <sean@siobud.com>2015-09-07 10:41:33 +0300
commit33bb629ac29a98c545d53382c000fb24d193a78b (patch)
treeb43d0708e81cea834b98634593e58ce3683ede97 /cluster_library.c
parent9c2cdc78aedbc46212a47bc98264f6985518497f (diff)
* Finish int -> size_t move
* Fix a few cases where operations were performed on un-initalized stack values
Diffstat (limited to 'cluster_library.c')
-rw-r--r--cluster_library.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/cluster_library.c b/cluster_library.c
index 8c50d603..1e72e9a9 100644
--- a/cluster_library.c
+++ b/cluster_library.c
@@ -136,8 +136,7 @@ cluster_multibulk_resp_recursive(RedisSock *sock, size_t elements,
switch(r->type) {
case TYPE_ERR:
case TYPE_LINE:
- //TODO Sean-Der
- if(redis_sock_gets(sock, buf, sizeof(buf), (size_t *) &r->len) < 0) {
+ if(redis_sock_gets(sock, buf, sizeof(buf), &r->len) < 0) {
*err = 1;
return;
}
@@ -409,7 +408,7 @@ static clusterKeyVal *cluster_dl_add_key(clusterDistList *dl, char *key,
/* Add a key, returning a pointer to the entry where passed for easy adding
* of values to match this key */
int cluster_dist_add_key(redisCluster *c, HashTable *ht, char *key,
- int key_len, clusterKeyVal **kv)
+ size_t key_len, clusterKeyVal **kv)
{
int key_free;
short slot;
@@ -448,7 +447,8 @@ void cluster_dist_add_val(redisCluster *c, clusterKeyVal *kv, zval *z_val
TSRMLS_DC)
{
char *val;
- int val_len, val_free;
+ int val_free;
+ size_t val_len;
// Serialize our value
val_free = redis_serialize(c->flags, z_val, &val, &val_len TSRMLS_CC);