diff options
author | Jan-E <github@ehrhardt.nl> | 2015-09-09 03:47:49 +0300 |
---|---|---|
committer | Sean DuBois <sean@siobud.com> | 2015-09-09 05:40:38 +0300 |
commit | 2ee2b2a273875a77db0baf5696720c1d685e25d6 (patch) | |
tree | a2bd384bbfe2357cfca72d50b6324240077c7dab | |
parent | 4d66e3d4c06b9f90430f701baa179d73d805a267 (diff) |
Fix signed/unsigned mismatch
-rw-r--r-- | redis_array.c | 7 | ||||
-rw-r--r-- | redis_session.c | 2 |
2 files changed, 5 insertions, 4 deletions
diff --git a/redis_array.c b/redis_array.c index e0b12d78..4d05f909 100644 --- a/redis_array.c +++ b/redis_array.c @@ -950,7 +950,8 @@ PHP_METHOD(RedisArray, mset) zval *redis_inst, **redis_instances, **argv; char *key, **keys, **key_free, kbuf[40]; zend_string *key_zstr; - unsigned int key_len, free_idx = 0; + unsigned int key_len; + int free_idx = 0; int type, *key_lens; zend_ulong idx; @@ -1059,7 +1060,7 @@ PHP_METHOD(RedisArray, mset) } /* Free any keys that we needed to allocate memory for, because they weren't strings */ - for(i=0; i<free_idx; i++) { + for(i=0; i < free_idx; i++) { efree(key_free[i]); } @@ -1105,7 +1106,7 @@ PHP_METHOD(RedisArray, del) /* copy all elements to z_keys */ array_init(&z_keys); free_zkeys = 1; - for(i = 0; i < ZEND_NUM_ARGS(); ++i) { + for(i = 0; i < (int)ZEND_NUM_ARGS(); ++i) { ZVAL_DUP(&z_tmp, &z_args[i]); /* add copy to z_keys */ diff --git a/redis_session.c b/redis_session.c index a33aa927..7a51a551 100644 --- a/redis_session.c +++ b/redis_session.c @@ -157,7 +157,7 @@ redis_pool_get_sock(redis_pool *pool, const char *key TSRMLS_DC) { redis_pool_member *rpm = pool->head; - for(i = 0; i < pool->totalWeight;) { + for(i = 0; i < (unsigned int)pool->totalWeight;) { if(pos >= i && pos < i + rpm->weight) { int needs_auth = 0; if(rpm->auth && rpm->auth_len && rpm->redis_sock->status != REDIS_SOCK_STATUS_CONNECTED) { |