1 files changed, 15 insertions, 16 deletions

diff --git a/tests/unistr/test-strncat.h b/tests/unistr/test-strncat.h
index c505fc26..c2533c7c 100644
--- a/tests/unistr/test-strncat.h
+++ b/tests/unistr/test-strncat.h
@@ -1,5 +1,5 @@
 /* Test of uN_strncat() functions.
-   Copyright (C) 2010-2024 Free Software Foundation, Inc.
+   Copyright (C) 2010-2026 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -20,34 +20,35 @@ static void
 check_single (const UNIT *input, size_t length, size_t n)
 {
   static const UNIT base[] = { 'C', 'h', 'a', 'n', 'g', 'i', 'n', 'g', 0 };
-  size_t m;
 
-  for (m = 0; m < SIZEOF (base); m++)
+  for (size_t m = 0; m < SIZEOF (base); m++)
     {
       UNIT *dest;
       UNIT *result;
-      size_t i;
 
       dest = (UNIT *) malloc ((1 + m + n + 2) * sizeof (UNIT));
       ASSERT (dest != NULL);
 
       dest[0] = MAGIC;
-      for (i = 0; i < m; i++)
+      for (size_t i = 0; i < m; i++)
         dest[1 + i] = base[i];
       dest[1 + m] = 0;
-      for (i = 1; i < n + 2; i++)
+      for (size_t i = 1; i < n + 2; i++)
         dest[1 + m + i] = MAGIC;
 
       result = U_STRNCAT (dest + 1, input, n);
       ASSERT (result == dest + 1);
 
       ASSERT (dest[0] == MAGIC);
-      for (i = 0; i < m; i++)
+      for (size_t i = 0; i < m; i++)
         ASSERT (dest[1 + i] == base[i]);
-      for (i = 0; i < (n <= length ? n : length); i++)
-        ASSERT (dest[1 + m + i] == input[i]);
-      ASSERT (dest[1 + m + i] == 0);
-      ASSERT (dest[1 + m + i + 1] == MAGIC);
+      {
+        size_t i;
+        for (i = 0; i < (n <= length ? n : length); i++)
+          ASSERT (dest[1 + m + i] == input[i]);
+        ASSERT (dest[1 + m + i] == 0);
+        ASSERT (dest[1 + m + i + 1] == MAGIC);
+      }
 
       free (dest);
     }
@@ -57,13 +58,12 @@ static void
 check (const UNIT *input, size_t input_length)
 {
   size_t length;
-  size_t n;
 
   ASSERT (input_length > 0);
   ASSERT (input[input_length - 1] == 0);
   length = input_length - 1; /* = U_STRLEN (input) */
 
-  for (n = 0; n <= 2 * length + 2; n++)
+  for (size_t n = 0; n <= 2 * length + 2; n++)
     check_single (input, length, n);
 
   /* Check that U_STRNCAT (D, S, N) does not look at more than
@@ -73,14 +73,13 @@ check (const UNIT *input, size_t input_length)
 
     if (page_boundary != NULL)
       {
-        for (n = 0; n <= 2 * length + 2; n++)
+        for (size_t n = 0; n <= 2 * length + 2; n++)
           {
             size_t n_to_copy = (n <= length ? n : length + 1);
             UNIT *copy;
-            size_t i;
 
             copy = (UNIT *) page_boundary - n_to_copy;
-            for (i = 0; i < n_to_copy; i++)
+            for (size_t i = 0; i < n_to_copy; i++)
               copy[i] = input[i];
 
             check_single (copy, length, n);