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

1 files changed, 22 insertions, 34 deletions

diff --git a/tests/unistr/test-move.h b/tests/unistr/test-move.h
index 74acb9a6..a4a22e45 100644
--- a/tests/unistr/test-move.h
+++ b/tests/unistr/test-move.h
@@ -1,5 +1,5 @@
 /* Test of uN_move() 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
@@ -22,19 +22,17 @@ main ()
   /* Test copying operations with disjoint source and destination.  */
   {
     static const UNIT src[] = { 'c', 'l', 'i', 'm', 'a', 't', 'e' };
-    size_t n;
 
-    for (n = 0; n <= SIZEOF (src); n++)
+    for (size_t n = 0; n <= SIZEOF (src); n++)
       {
         UNIT dest[1 + SIZEOF (src) + 1] =
           { MAGIC, MAGIC, MAGIC, MAGIC, MAGIC, MAGIC, MAGIC, MAGIC, MAGIC };
         UNIT *ret;
-        size_t i;
 
         ret = U_MOVE (dest + 1, src, n);
         ASSERT (ret == dest + 1);
         ASSERT (dest[0] == MAGIC);
-        for (i = 0; i < n; i++)
+        for (size_t i = 0; i < n; i++)
           ASSERT (dest[1 + i] == src[i]);
         ASSERT (dest[1 + n] == MAGIC);
       }
@@ -43,23 +41,21 @@ main ()
   /* Test copying operations with overlap, in-place.  */
   {
     static const UNIT src[] = { 'c', 'l', 'i', 'm', 'a', 't', 'e' };
-    size_t n;
 
-    for (n = 0; n <= SIZEOF (src); n++)
+    for (size_t n = 0; n <= SIZEOF (src); n++)
       {
         UNIT dest[1 + SIZEOF (src) + 1];
         UNIT *ret;
-        size_t i;
 
         dest[0] = MAGIC;
-        for (i = 0; i < n; i++)
+        for (size_t i = 0; i < n; i++)
           dest[1 + i] = src[i];
         dest[1 + n] = MAGIC;
 
         ret = U_MOVE (dest + 1, dest + 1, n);
         ASSERT (ret == dest + 1);
         ASSERT (dest[0] == MAGIC);
-        for (i = 0; i < n; i++)
+        for (size_t i = 0; i < n; i++)
           ASSERT (dest[1 + i] == src[i]);
         ASSERT (dest[1 + n] == MAGIC);
       }
@@ -69,23 +65,19 @@ main ()
   {
     static const UNIT src[] = { 'c', 'l', 'i', 'm', 'a', 't', 'e' };
     static const UNIT src2[] = { 'C', 'L', 'I', 'M', 'A', 'T', 'E' };
-    size_t d;
 
     ASSERT (SIZEOF (src) == SIZEOF (src2));
-    for (d = 0; d <= SIZEOF (src); d++)
+    for (size_t d = 0; d <= SIZEOF (src); d++)
       {
-        size_t n;
-
-        for (n = 0; n <= SIZEOF (src); n++)
+        for (size_t n = 0; n <= SIZEOF (src); n++)
           {
             UNIT dest[1 + 2 * SIZEOF (src) + 1];
             UNIT *ret;
-            size_t i;
 
             dest[0] = MAGIC;
-            for (i = 0; i < SIZEOF (src2); i++)
+            for (size_t i = 0; i < SIZEOF (src2); i++)
               dest[1 + i] = src2[i];
-            for (i = 0; i < SIZEOF (src); i++)
+            for (size_t i = 0; i < SIZEOF (src); i++)
               dest[1 + SIZEOF (src) + i] = src[i];
             dest[1 + 2 * SIZEOF (src)] = MAGIC;
 
@@ -93,13 +85,13 @@ main ()
               U_MOVE (dest + 1 + SIZEOF (src) - d, dest + 1 + SIZEOF (src), n);
             ASSERT (ret == dest + 1 + SIZEOF (src) - d);
             ASSERT (dest[0] == MAGIC);
-            for (i = 0; i < SIZEOF (src) - d; i++)
+            for (size_t i = 0; i < SIZEOF (src) - d; i++)
               ASSERT (dest[1 + i] == src2[i]);
-            for (i = 0; i < n; i++)
+            for (size_t i = 0; i < n; i++)
               ASSERT (dest[1 + SIZEOF (src) - d + i] == src[i]);
-            for (i = SIZEOF (src) - d + n; i < SIZEOF (src2); i++)
+            for (size_t i = SIZEOF (src) - d + n; i < SIZEOF (src2); i++)
               ASSERT (dest[1 + i] == src2[i]);
-            for (i = (n >= d ? n - d : 0); i < SIZEOF (src); i++)
+            for (size_t i = (n >= d ? n - d : 0); i < SIZEOF (src); i++)
               ASSERT (dest[1 + SIZEOF (src) + i] == src[i]);
             ASSERT (dest[1 + 2 * SIZEOF (src)] == MAGIC);
           }
@@ -110,36 +102,32 @@ main ()
   {
     static const UNIT src[] = { 'c', 'l', 'i', 'm', 'a', 't', 'e' };
     static const UNIT src2[] = { 'C', 'L', 'I', 'M', 'A', 'T', 'E' };
-    size_t d;
 
     ASSERT (SIZEOF (src) == SIZEOF (src2));
-    for (d = 0; d <= SIZEOF (src); d++)
+    for (size_t d = 0; d <= SIZEOF (src); d++)
       {
-        size_t n;
-
-        for (n = 0; n <= SIZEOF (src); n++)
+        for (size_t n = 0; n <= SIZEOF (src); n++)
           {
             UNIT dest[1 + 2 * SIZEOF (src) + 1];
             UNIT *ret;
-            size_t i;
 
             dest[0] = MAGIC;
-            for (i = 0; i < SIZEOF (src); i++)
+            for (size_t i = 0; i < SIZEOF (src); i++)
               dest[1 + i] = src[i];
-            for (i = 0; i < SIZEOF (src2); i++)
+            for (size_t i = 0; i < SIZEOF (src2); i++)
               dest[1 + SIZEOF (src) + i] = src2[i];
             dest[1 + 2 * SIZEOF (src)] = MAGIC;
 
             ret = U_MOVE (dest + 1 + d, dest + 1, n);
             ASSERT (ret == dest + 1 + d);
             ASSERT (dest[0] == MAGIC);
-            for (i = 0; i < d; i++)
+            for (size_t i = 0; i < d; i++)
               ASSERT (dest[1 + i] == src[i]);
-            for (i = 0; i < n; i++)
+            for (size_t i = 0; i < n; i++)
               ASSERT (dest[1 + d + i] == src[i]);
-            for (i = d + n; i < SIZEOF (src); i++)
+            for (size_t i = d + n; i < SIZEOF (src); i++)
               ASSERT (dest[1 + i] == src[i]);
-            for (i = (d + n >= SIZEOF (src) ? d + n - SIZEOF (src) : 0);
+            for (size_t i = (d + n >= SIZEOF (src) ? d + n - SIZEOF (src) : 0);
                  i < SIZEOF (src2);
                  i++)
               ASSERT (dest[1 + SIZEOF (src) + i] == src2[i]);