Merge branch 'release/debian/1.4.2-1'HEADdebian/1.4.2-1master

1 files changed, 12 insertions, 12 deletions

diff --git a/tests/unistr/test-strncpy.h b/tests/unistr/test-strncpy.h
index c3ad19c6..3e4afb8e 100644
--- a/tests/unistr/test-strncpy.h
+++ b/tests/unistr/test-strncpy.h
@@ -1,5 +1,5 @@
 /* Test of uN_strncpy() 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
@@ -21,22 +21,24 @@ check_single (const UNIT *input, size_t length, size_t n)
 {
   UNIT *dest;
   UNIT *result;
-  size_t i;
 
   dest = (UNIT *) malloc ((1 + n + 1) * sizeof (UNIT));
   ASSERT (dest != NULL);
 
-  for (i = 0; i < 1 + n + 1; i++)
+  for (size_t i = 0; i < 1 + n + 1; i++)
     dest[i] = MAGIC;
 
   result = U_STRNCPY (dest + 1, input, n);
   ASSERT (result == dest + 1);
 
   ASSERT (dest[0] == MAGIC);
-  for (i = 0; i < (n <= length ? n : length + 1); i++)
-    ASSERT (dest[1 + i] == input[i]);
-  for (; i < n; i++)
-    ASSERT (dest[1 + i] == 0);
+  {
+    size_t i;
+    for (i = 0; i < (n <= length ? n : length + 1); i++)
+      ASSERT (dest[1 + i] == input[i]);
+    for (; i < n; i++)
+      ASSERT (dest[1 + i] == 0);
+  }
   ASSERT (dest[1 + n] == MAGIC);
 
   free (dest);
@@ -46,13 +48,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_STRNCPY (D, S, N) does not look at more than
@@ -62,14 +63,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);