fix C99 usages

This commit is contained in:
Remi Collet
2023-08-02 16:07:21 +02:00
committed by Remi Collet
parent a3327d9d2b
commit 715012b2c1
2 changed files with 8 additions and 5 deletions

View File

@@ -1845,7 +1845,8 @@ redis_read_mpop_response(RedisSock *redis_sock, zval *zdst, int elements,
array_init_size(&zele, elements);
if (ctx == PHPREDIS_CTX_PTR) {
for (int i = 0; i < elements; i++) {
int i;
for (i = 0; i < elements; i++) {
if (read_mbulk_header(redis_sock, &subele) < 0 || subele != 2) {
zval_dtor(&zele);
goto fail;

View File

@@ -1877,6 +1877,7 @@ gen_vararg_cmd(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock,
smart_string cmdstr = {0};
zval *argv = NULL;
int argc = 0;
uint32_t i;
ZEND_PARSE_PARAMETERS_START(min_argc, -1)
Z_PARAM_VARIADIC('*', argv, argc)
@@ -1884,7 +1885,7 @@ gen_vararg_cmd(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock,
redis_cmd_init_sstr(&cmdstr, argc, kw, strlen(kw));
for (uint32_t i = 0; i < argc; i++) {
for (i = 0; i < argc; i++) {
redis_cmd_append_sstr_zval(&cmdstr, &argv[i], NULL);
}
@@ -1986,7 +1987,8 @@ static int gen_varkey_cmd(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock,
}
} ZEND_HASH_FOREACH_END();
} else {
for(uint32_t i = 0; i < argc - !!has_timeout; i++) {
uint32_t i;
for(i = 0; i < argc - !!has_timeout; i++) {
redis_cmd_append_sstr_key_zval(&cmdstr, &argv[i], redis_sock, slot);
if (slot) {
if (kslot != -1 && *slot != kslot)
@@ -2605,7 +2607,7 @@ int redis_hmget_cmd(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock,
smart_string cmdstr = {0};
HashTable *fields = NULL;
zend_string *key = NULL;
zend_ulong valid = 0;
zend_ulong valid = 0, i;
ZEND_PARSE_PARAMETERS_START(2, 2)
Z_PARAM_STR(key)
@@ -2635,7 +2637,7 @@ int redis_hmget_cmd(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock,
REDIS_CMD_INIT_SSTR_STATIC(&cmdstr, 1 + valid, "HMGET");
redis_cmd_append_sstr_key_zstr(&cmdstr, key, redis_sock, slot);
for (zend_ulong i = 0; i < valid; i++) {
for (i = 0; i < valid; i++) {
redis_cmd_append_sstr_zval(&cmdstr, &zctx[i], NULL);
}