From 7fd6414648dde320aaa21900a8e41e784ad6e651 Mon Sep 17 00:00:00 2001
From: Jon Shallow <supjps-libcoap@jpshallow.com>
Date: Sun, 23 Apr 2023 17:47:10 +0100
Subject: [PATCH] tests: Fix compiler clash over index usage in test suites

Some compilers complain that index is already defined in <strings.h>.
Replace index with lindex.

Signed-off-by: Jon Shallow <supjps-libcoap@jpshallow.com>
---
 tests/dtls-client.c       | 14 +++++++-------
 tests/dtls-server.c       | 14 +++++++-------
 tests/dtls_ciphers_util.c | 22 +++++++++++-----------
 3 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/tests/dtls-client.c b/tests/dtls-client.c
index 84c530c6..e4d5ba7a 100644
--- a/tests/dtls-client.c
+++ b/tests/dtls-client.c
@@ -239,16 +239,16 @@ get_user_parameters(struct dtls_context_t *ctx,
   (void) session;
   user_parameters->force_extended_master_secret = force_extended_master_secret;
   if (ciphers) {
-    int index = 0;
-    while (index < DTLS_MAX_CIPHER_SUITES) {
-      user_parameters->cipher_suites[index] = ciphers[index];
-      if (ciphers[index] == TLS_NULL_WITH_NULL_NULL) {
+    int i = 0;
+    while (i < DTLS_MAX_CIPHER_SUITES) {
+      user_parameters->cipher_suites[i] = ciphers[i];
+      if (ciphers[i] == TLS_NULL_WITH_NULL_NULL) {
         break;
       }
-      ++index;
+      ++i;
     }
-    if (index == DTLS_MAX_CIPHER_SUITES) {
-      user_parameters->cipher_suites[index] = TLS_NULL_WITH_NULL_NULL;
+    if (i == DTLS_MAX_CIPHER_SUITES) {
+      user_parameters->cipher_suites[i] = TLS_NULL_WITH_NULL_NULL;
     }
   }
 }
diff --git a/tests/dtls-server.c b/tests/dtls-server.c
index 309f0b5c..8d99c628 100644
--- a/tests/dtls-server.c
+++ b/tests/dtls-server.c
@@ -200,16 +200,16 @@ get_user_parameters(struct dtls_context_t *ctx,
   (void) session;
   user_parameters->force_extended_master_secret = force_extended_master_secret;
   if (ciphers) {
-    int index = 0;
-    while (index < DTLS_MAX_CIPHER_SUITES) {
-      user_parameters->cipher_suites[index] = ciphers[index];
-      if (ciphers[index] == TLS_NULL_WITH_NULL_NULL) {
+    int i = 0;
+    while (i < DTLS_MAX_CIPHER_SUITES) {
+      user_parameters->cipher_suites[i] = ciphers[i];
+      if (ciphers[i] == TLS_NULL_WITH_NULL_NULL) {
         break;
       }
-      ++index;
+      ++i;
     }
-    if (index == DTLS_MAX_CIPHER_SUITES) {
-      user_parameters->cipher_suites[index] = TLS_NULL_WITH_NULL_NULL;
+    if (i == DTLS_MAX_CIPHER_SUITES) {
+      user_parameters->cipher_suites[i] = TLS_NULL_WITH_NULL_NULL;
     }
   }
 }
diff --git a/tests/dtls_ciphers_util.c b/tests/dtls_ciphers_util.c
index d9d548df..d8444f9a 100644
--- a/tests/dtls_ciphers_util.c
+++ b/tests/dtls_ciphers_util.c
@@ -44,11 +44,11 @@ static dtls_cipher_t ciphers_table[ARRAY_LENGTH] = { TLS_NULL_WITH_NULL_NULL };
 static dtls_cipher_t find_cipher_suite(const char *arg) {
   if (arg) {
     size_t arg_len = strlen(arg);
-    for (size_t index=0; index < ARRAY_LENGTH - 1; ++index) {
-      size_t len = strlen(map[index].name);
+    for (size_t i=0; i < ARRAY_LENGTH - 1; ++i) {
+      size_t len = strlen(map[i].name);
       if (len <= arg_len) {
-        if (strncmp(arg, map[index].name, len) == 0 && (arg[len] == 0 || arg[len] == SEP)) {
-          return map[index].cipher;
+        if (strncmp(arg, map[i].name, len) == 0 && (arg[len] == 0 || arg[len] == SEP)) {
+          return map[i].cipher;
         }
       }
     }
@@ -57,13 +57,13 @@ static dtls_cipher_t find_cipher_suite(const char *arg) {
 }
 
 static void add_cipher_suite(dtls_cipher_t cipher) {
-  for (size_t index=0; index < ARRAY_LENGTH - 1; ++index) {
-    if (ciphers_table[index] == cipher) {
+  for (size_t i=0; i < ARRAY_LENGTH - 1; ++i) {
+    if (ciphers_table[i] == cipher) {
       return;
     }
-    if (ciphers_table[index] == TLS_NULL_WITH_NULL_NULL) {
-      ciphers_table[index] = cipher;
-      ciphers_table[index + 1] = TLS_NULL_WITH_NULL_NULL;
+    if (ciphers_table[i] == TLS_NULL_WITH_NULL_NULL) {
+      ciphers_table[i] = cipher;
+      ciphers_table[i + 1] = TLS_NULL_WITH_NULL_NULL;
       return;
     }
   }
@@ -88,8 +88,8 @@ void
 cipher_suites_usage(FILE* file, const char* head) {
   fprintf(file, "%s-c ciphers\tlist of cipher suites separated by ':'\n", head);
   fprintf(file, "%s\t\t(default is %s", head, map[0].name);
-  for (int index = 1; map[index].name; ++index) {
-     fprintf(file, "\n%s\t\t :%s", head, map[index].name);
+  for (int i = 1; map[i].name; ++i) {
+     fprintf(file, "\n%s\t\t :%s", head, map[i].name);
   }
   fprintf(file, ")\n");
 }