Skip to content

Commit bf99c94

Browse files
edtechdedtechd
committed
Fixed incompatible types
1 parent cf85243 commit bf99c94

File tree

2 files changed

+34
-24
lines changed

2 files changed

+34
-24
lines changed

‎redis.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -705,7 +705,7 @@ PHP_REDIS_API int redis_connect(INTERNAL_FUNCTION_PARAMETERS, int persistent) {
705705
size_t host_len;
706706
zval *id;
707707
char *host = NULL;
708-
long port = -1;
708+
zend_long port = -1;
709709
long retry_interval = 0;
710710

711711
char *persistent_id = NULL;

‎redis_commands.c

Lines changed: 33 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ int redis_str_cmd(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock, char *kw,
3939
char **cmd, int *cmd_len, short *slot, void **ctx)
4040
{
4141
char *arg;
42-
int arg_len;
42+
size_t arg_len;
4343

4444
// Parse args
4545
if(zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &arg, &arg_len)
@@ -61,8 +61,9 @@ int redis_key_long_val_cmd(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock,
6161
{
6262
char *key = NULL;
6363
zend_string *val;
64-
int key_len, val_free, key_free;
65-
long expire;
64+
int val_free, key_free;
65+
size_t key_len;
66+
long long expire;
6667
zval *z_val;
6768

6869
if(zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "slz", &key, &key_len,
@@ -94,8 +95,9 @@ int redis_key_long_str_cmd(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock,
9495
void **ctx)
9596
{
9697
char *key, *val;
97-
int key_len, val_len, key_free;
98-
long lval;
98+
int key_free;
99+
size_t key_len, val_len;
100+
long long lval;
99101

100102
if(zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sls", &key, &key_len,
101103
&lval, &val, &val_len)==FAILURE)
@@ -126,7 +128,8 @@ int redis_kv_cmd(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock,
126128
{
127129
char *key;
128130
zend_string *val;
129-
int key_len, key_free, val_free;
131+
int key_free, val_free;
132+
size_t key_len;
130133
zval *z_val;
131134

132135
if(zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sz", &key, &key_len,
@@ -157,7 +160,8 @@ int redis_key_str_cmd(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock,
157160
void **ctx)
158161
{
159162
char *key, *val;
160-
int key_len, val_len, key_free;
163+
int key_free;
164+
size_t key_len, val_len;
161165

162166
if(zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ss", &key, &key_len,
163167
&val, &val_len)==FAILURE)
@@ -184,7 +188,8 @@ int redis_key_str_str_cmd(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock,
184188
void **ctx)
185189
{
186190
char *key, *val1, *val2;
187-
int key_len, val1_len, val2_len, key_free;
191+
int key_free;
192+
size_t key_len, val1_len, val2_len;
188193

189194
if(zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sss", &key, &key_len,
190195
&val1, &val1_len, &val2, &val2_len)==FAILURE)
@@ -215,7 +220,7 @@ int redis_key_key_cmd(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock,
215220
void **ctx)
216221
{
217222
char *key1, *key2;
218-
int key1_len, key2_len;
223+
size_t key1_len, key2_len;
219224
int key1_free, key2_free;
220225

221226
if(zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ss", &key1, &key1_len,
@@ -260,8 +265,9 @@ int redis_key_long_cmd(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock,
260265
void **ctx)
261266
{
262267
char *key;
263-
int key_len, key_free;
264-
long lval;
268+
int key_free;
269+
long long lval;
270+
size_t key_len;
265271

266272
if(zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sl", &key, &key_len,
267273
&lval)==FAILURE)
@@ -294,8 +300,9 @@ int redis_key_long_long_cmd(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock,
294300
void **ctx)
295301
{
296302
char *key;
297-
int key_len, key_free;
298-
long val1, val2;
303+
int key_free;
304+
size_t key_len;
305+
long long val1, val2;
299306

300307
if(zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sll", &key, &key_len,
301308
&val1, &val2)==FAILURE)
@@ -353,7 +360,7 @@ int redis_key_dbl_cmd(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock,
353360
void **ctx)
354361
{
355362
char *key;
356-
int key_len;
363+
size_t key_len;
357364
int key_free;
358365
double val;
359366

@@ -1891,8 +1898,9 @@ int redis_setbit_cmd(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock,
18911898
char **cmd, int *cmd_len, short *slot, void **ctx)
18921899
{
18931900
char *key;
1894-
int key_len, key_free;
1895-
long offset;
1901+
int key_free;
1902+
size_t key_len;
1903+
long long offset;
18961904
zend_bool val;
18971905

18981906
if(zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "slb", &key, &key_len,
@@ -1924,7 +1932,7 @@ int redis_linsert_cmd(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock,
19241932
char **cmd, int *cmd_len, short *slot, void **ctx)
19251933
{
19261934
char *key, *pos;
1927-
int key_len, pos_len;
1935+
size_t key_len, pos_len;
19281936
int key_free, pivot_free, val_free;
19291937
zval *z_val, *z_pivot;
19301938
zend_string *val, *pivot;
@@ -1968,7 +1976,8 @@ int redis_lrem_cmd(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock,
19681976
char **cmd, int *cmd_len, short *slot, void **ctx)
19691977
{
19701978
char *key;
1971-
int key_len, key_free, val_free;
1979+
int key_free, val_free;
1980+
size_t key_len;
19721981
long count = 0;
19731982
zval *z_val;
19741983
zend_string *val;
@@ -2002,7 +2011,7 @@ int redis_smove_cmd(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock,
20022011
char **cmd, int *cmd_len, short *slot, void **ctx)
20032012
{
20042013
char *src, *dst;
2005-
int src_len, dst_len;
2014+
size_t src_len, dst_len;
20062015
int val_free, src_free, dst_free;
20072016
zval *z_val;
20082017
zend_string *val;
@@ -2050,7 +2059,7 @@ static int gen_hset_cmd(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock,
20502059
char *kw, char **cmd, int *cmd_len, short *slot)
20512060
{
20522061
char *key, *mem;
2053-
int key_len, mem_len;
2062+
size_t key_len, mem_len;
20542063
int val_free, key_free;
20552064
zval *z_val;
20562065
zend_string *val;
@@ -2102,8 +2111,9 @@ int redis_srandmember_cmd(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock,
21022111
short *have_count)
21032112
{
21042113
char *key;
2105-
int key_len, key_free;
2106-
long count;
2114+
int key_free;
2115+
size_t key_len;
2116+
long long count;
21072117

21082118
if(zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|l", &key, &key_len,
21092119
&count)==FAILURE)
@@ -2140,7 +2150,7 @@ int redis_zincrby_cmd(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock,
21402150
char **cmd, int *cmd_len, short *slot, void **ctx)
21412151
{
21422152
char *key;
2143-
int key_len;
2153+
size_t key_len;
21442154
int key_free, mem_free;
21452155
double incrby;
21462156
zval *z_val;

0 commit comments

Comments
 (0)