git:master:daa86b20: db_redis: declare variables at the beginning of the function - sr-dev

23 Nov 2019

Module: kamailio
Branch: master
Commit: daa86b204d3030e2abb2f2459aa348998b982ae2
URL: https://github.com/kamailio/kamailio/commit/daa86b204d3030e2abb2f2459aa34899...
Author: Daniel-Constantin Mierla miconda@gmail.com
Committer: Daniel-Constantin Mierla miconda@gmail.com
Date: 2019-11-23T11:10:40+01:00
db_redis: declare variables at the beginning of the function
- compiling with gcc 4.9 on debian jessie gives:
error: 'for' loop initial declarations are only allowed in C99 or C11 mode
---
Modified: src/modules/db_redis/redis_dbase.c
---
Diff:  https://github.com/kamailio/kamailio/commit/daa86b204d3030e2abb2f2459aa34899...
Patch: https://github.com/kamailio/kamailio/commit/daa86b204d3030e2abb2f2459aa34899...
---

diff --git a/src/modules/db_redis/redis_dbase.c b/src/modules/db_redis/redis_dbase.c
index 919cde71c3..50d1a62b10 100644
--- a/src/modules/db_redis/redis_dbase.c
+++ b/src/modules/db_redis/redis_dbase.c
@@ -923,6 +923,7 @@ static int db_redis_scan_query_keys(km_redis_con_t *con, const str *table_name,
     char *match = NULL;
     int ret;
     redisReply *reply = NULL;
+    int i, j;
*query_keys = NULL;
     *query_keys_count = 0;
@@ -992,7 +993,7 @@ static int db_redis_scan_query_keys(km_redis_con_t *con, const str *table_name,
         memcpy(match, ts_scan_key->s, scan_offset);
// append a number of ?. minimum string length is 10 digits
-        for (int i = 0; i < scan_length - 1; i++) {
+        for (i = 0; i < scan_length - 1; i++) {
             int len = scan_offset + i;
             char match_char = ts_scan_key->s[len];
             // skip non-numbers
@@ -1020,7 +1021,7 @@ static int db_redis_scan_query_keys(km_redis_con_t *con, const str *table_name,
         }
     }
-    for (int i = 0; i < scan_length; i++) {
+    for (i = 0; i < scan_length; i++) {
         int len = scan_offset + i;
         char match_char = ts_scan_key->s[len];
         // skip non-numbers
@@ -1042,7 +1043,7 @@ static int db_redis_scan_query_keys(km_redis_con_t *con, const str *table_name,
         else
             len += sprintf(match + len, "[%c-9]", match_char + 1);
         // finish with trailing ?s
-	for (int j = i + 1; j < scan_length; j++) {
+	for (j = i + 1; j < scan_length; j++) {
             match_char = ts_scan_key->s[scan_offset + j];
             // skip non-numbers
             if (match_char < '0' || match_char > '9') {
@@ -1108,7 +1109,7 @@ static int db_redis_scan_query_keys(km_redis_con_t *con, const str *table_name,
LM_DBG("adding %i keys returned from set", (int) reply->elements);
-        for (int i = 0; i < reply->elements; i++) {
+        for (i = 0; i < reply->elements; i++) {
             if (reply->element[i]->type != REDIS_REPLY_STRING) {
                 LM_ERR("Unexpected entry key type in type query, expecting a string\n");
                 goto out;

    