diff options
author | Remi Collet <remi@remirepo.net> | 2021-03-25 10:54:15 +0300 |
---|---|---|
committer | Remi Collet <remi@remirepo.net> | 2021-03-25 10:54:15 +0300 |
commit | c93eba4a4f9ef00dcb29003c91d550e0a8ecb835 (patch) | |
tree | c33c1cb4ce23eb80bcdc681ac5b3aad88f003204 | |
parent | cc6b37eee661b4cf80f06f37cb9c130ac3f84dfe (diff) |
Fix #1956 bad type usage on 32-bit
-rw-r--r-- | library.c | 2 | ||||
-rw-r--r-- | redis_array.c | 4 | ||||
-rw-r--r-- | redis_array_impl.c | 4 |
3 files changed, 5 insertions, 5 deletions
@@ -2968,7 +2968,7 @@ redis_unpack(RedisSock *redis_sock, const char *val, int val_len, zval *z_ret) #ifdef HAVE_REDIS_ZSTD { char *data; - size_t len; + unsigned long long len; len = ZSTD_getFrameContentSize(val, val_len); diff --git a/redis_array.c b/redis_array.c index ff7d8ba6..2eb8e3dd 100644 --- a/redis_array.c +++ b/redis_array.c @@ -224,7 +224,7 @@ PHP_METHOD(RedisArray, __construct) RedisArray *ra = NULL; zend_bool b_index = 0, b_autorehash = 0, b_pconnect = 0, consistent = 0; HashTable *hPrev = NULL, *hOpts = NULL; - long l_retry_interval = 0; + zend_long l_retry_interval = 0; zend_bool b_lazy_connect = 0; double d_connect_timeout = 0, read_timeout = 0.0; zend_string *algorithm = NULL, *user = NULL, *pass = NULL; @@ -276,7 +276,7 @@ PHP_METHOD(RedisArray, __construct) } ra = ra_make_array(Z_ARRVAL_P(z0), &z_fun, &z_dist, hPrev, b_index, - b_pconnect, l_retry_interval, b_lazy_connect, + b_pconnect, (long)l_retry_interval, b_lazy_connect, d_connect_timeout, read_timeout, consistent, algorithm, user, pass); diff --git a/redis_array_impl.c b/redis_array_impl.c index 37a84ba7..1d96542d 100644 --- a/redis_array_impl.c +++ b/redis_array_impl.c @@ -158,7 +158,7 @@ RedisArray *ra_load_array(const char *name) { zend_string *algorithm = NULL, *user = NULL, *pass = NULL; zend_bool b_index = 0, b_autorehash = 0, b_pconnect = 0, consistent = 0; - long l_retry_interval = 0; + zend_long l_retry_interval = 0; zend_bool b_lazy_connect = 0; double d_connect_timeout = 0, read_timeout = 0.0; HashTable *hHosts = NULL, *hPrev = NULL; @@ -291,7 +291,7 @@ RedisArray *ra_load_array(const char *name) { } /* create RedisArray object */ - ra = ra_make_array(hHosts, &z_fun, &z_dist, hPrev, b_index, b_pconnect, l_retry_interval, + ra = ra_make_array(hHosts, &z_fun, &z_dist, hPrev, b_index, b_pconnect, (long)l_retry_interval, b_lazy_connect, d_connect_timeout, read_timeout, consistent, algorithm, user, pass); if (ra) { |