Update upstream source from tag 'upstream/1.4.2'

Update to upstream version '1.4.2'
with Debian dir 493e96bcd865e4f9990e20bee26408c96231d727

1 files changed, 16 insertions, 19 deletions

diff --git a/tests/uniconv/test-u8-conv-from-enc.c b/tests/uniconv/test-u8-conv-from-enc.c
index f0bc956e..9fda9959 100644
--- a/tests/uniconv/test-u8-conv-from-enc.c
+++ b/tests/uniconv/test-u8-conv-from-enc.c
@@ -1,5 +1,5 @@
 /* Test of conversion to UTF-8 from legacy encodings.
-   Copyright (C) 2007-2025 Free Software Foundation, Inc.
+   Copyright (C) 2007-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
@@ -44,20 +44,17 @@ main ()
 #if HAVE_ICONV
   static enum iconv_ilseq_handler handlers[] =
     { iconveh_error, iconveh_question_mark, iconveh_escape_sequence };
-  size_t h;
-  size_t o;
-  size_t i;
 
   /* Assume that iconv() supports at least the encodings ASCII, ISO-8859-1,
      ISO-8859-2, and UTF-8.  */
 
   /* Test conversion from ISO-8859-1 to UTF-8 with no errors.  */
-  for (h = 0; h < SIZEOF (handlers); h++)
+  for (size_t h = 0; h < SIZEOF (handlers); h++)
     {
       enum iconv_ilseq_handler handler = handlers[h];
       static const char input[] = "\304rger mit b\366sen B\374bchen ohne Augenma\337";
       static const uint8_t expected[] = "\303\204rger mit b\303\266sen B\303\274bchen ohne Augenma\303\237";
-      for (o = 0; o < 2; o++)
+      for (size_t o = 0; o < 2; o++)
         {
           size_t *offsets = (o ? new_offsets (strlen (input)) : NULL);
           size_t length;
@@ -70,7 +67,7 @@ main ()
           ASSERT (u8_cmp (result, expected, u8_strlen (expected)) == 0);
           if (o)
             {
-              for (i = 0; i < 37; i++)
+              for (size_t i = 0; i < 37; i++)
                 ASSERT (offsets[i] == (i < 1 ? i :
                                        i < 12 ? i + 1 :
                                        i < 18 ? i + 2 :
@@ -83,12 +80,12 @@ main ()
     }
 
   /* Test conversion from ISO-8859-2 to UTF-8 with no errors.  */
-  for (h = 0; h < SIZEOF (handlers); h++)
+  for (size_t h = 0; h < SIZEOF (handlers); h++)
     {
       enum iconv_ilseq_handler handler = handlers[h];
       static const char input[] = "Rafa\263 Maszkowski"; /* Rafał Maszkowski */
       static const uint8_t expected[] = "Rafa\305\202 Maszkowski";
-      for (o = 0; o < 2; o++)
+      for (size_t o = 0; o < 2; o++)
         {
           size_t *offsets = (o ? new_offsets (strlen (input)) : NULL);
           size_t length;
@@ -101,7 +98,7 @@ main ()
           ASSERT (u8_cmp (result, expected, u8_strlen (expected)) == 0);
           if (o)
             {
-              for (i = 0; i < 16; i++)
+              for (size_t i = 0; i < 16; i++)
                 ASSERT (offsets[i] == (i < 5 ? i :
                                        i + 1));
               ASSERT (offsets[16] == MAGIC);
@@ -117,12 +114,12 @@ main ()
   if (iconv_supports_encoding ("ISO-2022-JP-2"))
     {
       /* Test conversions from autodetect_jp to UTF-8.  */
-      for (h = 0; h < SIZEOF (handlers); h++)
+      for (size_t h = 0; h < SIZEOF (handlers); h++)
         {
           enum iconv_ilseq_handler handler = handlers[h];
           static const char input[] = "\244\263\244\363\244\313\244\301\244\317"; /* こんにちは in EUC-JP */
           static const uint8_t expected[] = "\343\201\223\343\202\223\343\201\253\343\201\241\343\201\257"; /* こんにちは */
-          for (o = 0; o < 2; o++)
+          for (size_t o = 0; o < 2; o++)
             {
               size_t *offsets = (o ? new_offsets (strlen (input)) : NULL);
               size_t length;
@@ -135,7 +132,7 @@ main ()
               ASSERT (u8_cmp (result, expected, u8_strlen (expected)) == 0);
               if (o)
                 {
-                  for (i = 0; i < 10; i++)
+                  for (size_t i = 0; i < 10; i++)
                     ASSERT (offsets[i] == ((i % 2) == 0 ? (i / 2) * 3 : (size_t)(-1)));
                   ASSERT (offsets[10] == MAGIC);
                   free (offsets);
@@ -143,12 +140,12 @@ main ()
               free (result);
             }
         }
-      for (h = 0; h < SIZEOF (handlers); h++)
+      for (size_t h = 0; h < SIZEOF (handlers); h++)
         {
           enum iconv_ilseq_handler handler = handlers[h];
           static const char input[] = "\202\261\202\361\202\311\202\277\202\315"; /* こんにちは in Shift_JIS */
           static const uint8_t expected[] = "\343\201\223\343\202\223\343\201\253\343\201\241\343\201\257"; /* こんにちは */
-          for (o = 0; o < 2; o++)
+          for (size_t o = 0; o < 2; o++)
             {
               size_t *offsets = (o ? new_offsets (strlen (input)) : NULL);
               size_t length;
@@ -161,7 +158,7 @@ main ()
               ASSERT (u8_cmp (result, expected, u8_strlen (expected)) == 0);
               if (o)
                 {
-                  for (i = 0; i < 10; i++)
+                  for (size_t i = 0; i < 10; i++)
                     ASSERT (offsets[i] == ((i % 2) == 0 ? (i / 2) * 3 : (size_t)(-1)));
                   ASSERT (offsets[10] == MAGIC);
                   free (offsets);
@@ -169,12 +166,12 @@ main ()
               free (result);
             }
         }
-      for (h = 0; h < SIZEOF (handlers); h++)
+      for (size_t h = 0; h < SIZEOF (handlers); h++)
         {
           enum iconv_ilseq_handler handler = handlers[h];
           static const char input[] = "\033$B$3$s$K$A$O\033(B"; /* こんにちは in ISO-2022-JP-2 */
           static const uint8_t expected[] = "\343\201\223\343\202\223\343\201\253\343\201\241\343\201\257"; /* こんにちは */
-          for (o = 0; o < 2; o++)
+          for (size_t o = 0; o < 2; o++)
             {
               size_t *offsets = (o ? new_offsets (strlen (input)) : NULL);
               size_t length;
@@ -187,7 +184,7 @@ main ()
               ASSERT (u8_cmp (result, expected, u8_strlen (expected)) == 0);
               if (o)
                 {
-                  for (i = 0; i < 16; i++)
+                  for (size_t i = 0; i < 16; i++)
                     ASSERT (offsets[i] == (i == 0 ? 0 :
                                            i == 5 ? 3 :
                                            i == 7 ? 6 :