New upstream version 1.4.2upstream/1.4.2upstream

43 files changed, 81 insertions, 116 deletions

diff --git a/tests/unictype/test-bidi_byname.c b/tests/unictype/test-bidi_byname.c
index f1d50b12..5fc3d4b9 100644
--- a/tests/unictype/test-bidi_byname.c
+++ b/tests/unictype/test-bidi_byname.c
@@ -1,5 +1,5 @@
 /* Test the Unicode character type functions.
-   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
diff --git a/tests/unictype/test-bidi_longname.c b/tests/unictype/test-bidi_longname.c
index 365a065e..2b5173ec 100644
--- a/tests/unictype/test-bidi_longname.c
+++ b/tests/unictype/test-bidi_longname.c
@@ -1,5 +1,5 @@
 /* Test the Unicode character type functions.
-   Copyright (C) 2011-2025 Free Software Foundation, Inc.
+   Copyright (C) 2011-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
diff --git a/tests/unictype/test-bidi_name.c b/tests/unictype/test-bidi_name.c
index fac5f27a..a679b503 100644
--- a/tests/unictype/test-bidi_name.c
+++ b/tests/unictype/test-bidi_name.c
@@ -1,5 +1,5 @@
 /* Test the Unicode character type functions.
-   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
diff --git a/tests/unictype/test-bidi_of.c b/tests/unictype/test-bidi_of.c
index 8715ba92..06822a5f 100644
--- a/tests/unictype/test-bidi_of.c
+++ b/tests/unictype/test-bidi_of.c
@@ -1,5 +1,5 @@
 /* Test the Unicode character type functions.
-   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
diff --git a/tests/unictype/test-bidi_test.c b/tests/unictype/test-bidi_test.c
index 2cdb4dc2..86b2bfd0 100644
--- a/tests/unictype/test-bidi_test.c
+++ b/tests/unictype/test-bidi_test.c
@@ -1,5 +1,5 @@
 /* Test the Unicode character type functions.
-   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
@@ -37,12 +37,8 @@ main ()
   ASSERT (!uc_is_bidi_class ('7', UC_BIDI_L));
   ASSERT (!uc_is_bidi_class ('7', UC_BIDI_R));
 
-  {
-    unsigned int c;
-
-    for (c = 0; c < 0x110000; c++)
-      ASSERT (uc_is_bidi_class (c, uc_bidi_class (c)));
-  }
+  for (unsigned int c = 0; c < 0x110000; c++)
+    ASSERT (uc_is_bidi_class (c, uc_bidi_class (c)));
 
   return test_exit_status;
 }
diff --git a/tests/unictype/test-block_list.c b/tests/unictype/test-block_list.c
index a026c4b6..4105e19f 100644
--- a/tests/unictype/test-block_list.c
+++ b/tests/unictype/test-block_list.c
@@ -1,5 +1,5 @@
 /* Test the Unicode character type functions.
-   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
@@ -33,9 +33,8 @@ main ()
   {
     const uc_block_t *latin_block = NULL;
     const uc_block_t *hebrew_block = NULL;
-    size_t i;
 
-    for (i = 0; i < nblocks; i++)
+    for (size_t i = 0; i < nblocks; i++)
       {
         if (strcmp (blocks[i].name, "Latin") == 0)
           latin_block = &blocks[i];
diff --git a/tests/unictype/test-block_of.c b/tests/unictype/test-block_of.c
index 28ca1b27..7aceef09 100644
--- a/tests/unictype/test-block_of.c
+++ b/tests/unictype/test-block_of.c
@@ -1,5 +1,5 @@
 /* Test the Unicode character type functions.
-   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
@@ -28,24 +28,19 @@ main ()
   ASSERT (strcmp (uc_block ('x')->name, "Basic Latin") == 0);
   ASSERT (strcmp (uc_block (0x20AC)->name, "Currency Symbols") == 0);
 
-  {
-    unsigned int c;
-
-    for (c = 0; c < 0x110000; c++)
-      {
-        const uc_block_t *block = uc_block (c);
-        ASSERT (block == NULL || uc_is_block (c, block));
-      }
-  }
+  for (unsigned int c = 0; c < 0x110000; c++)
+    {
+      const uc_block_t *block = uc_block (c);
+      ASSERT (block == NULL || uc_is_block (c, block));
+    }
 
   {
     const uc_block_t *blocks;
     size_t nblocks;
-    size_t i;
 
     uc_all_blocks (&blocks, &nblocks);
 
-    for (i = 0; i < nblocks; i++)
+    for (size_t i = 0; i < nblocks; i++)
       {
         if (strcmp (blocks[i].name, "Hebrew") == 0)
           {
@@ -54,11 +49,9 @@ main ()
           }
       }
 
-    for (i = 0; i < nblocks; i++)
+    for (size_t i = 0; i < nblocks; i++)
       {
-        unsigned int c;
-
-        for (c = blocks[i].start; c <= blocks[i].end; c++)
+        for (unsigned int c = blocks[i].start; c <= blocks[i].end; c++)
           ASSERT (uc_block (c) == &blocks[i]);
       }
   }
diff --git a/tests/unictype/test-block_test.c b/tests/unictype/test-block_test.c
index 9139ea71..6499a47c 100644
--- a/tests/unictype/test-block_test.c
+++ b/tests/unictype/test-block_test.c
@@ -1,5 +1,5 @@
 /* Test the Unicode character type functions.
-   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
diff --git a/tests/unictype/test-categ_and.c b/tests/unictype/test-categ_and.c
index eb620d05..9f5be0bf 100644
--- a/tests/unictype/test-categ_and.c
+++ b/tests/unictype/test-categ_and.c
@@ -1,5 +1,5 @@
 /* Test the Unicode character type functions.
-   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
diff --git a/tests/unictype/test-categ_and_not.c b/tests/unictype/test-categ_and_not.c
index d09d6859..0f90c1d9 100644
--- a/tests/unictype/test-categ_and_not.c
+++ b/tests/unictype/test-categ_and_not.c
@@ -1,5 +1,5 @@
 /* Test the Unicode character type functions.
-   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
diff --git a/tests/unictype/test-categ_byname.c b/tests/unictype/test-categ_byname.c
index d7f4924d..5fe54499 100644
--- a/tests/unictype/test-categ_byname.c
+++ b/tests/unictype/test-categ_byname.c
@@ -1,5 +1,5 @@
 /* Test the Unicode character type functions.
-   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
@@ -208,19 +208,17 @@ main ()
 
   {
     uc_general_category_t ct = uc_general_category_byname ("Nd");
-    unsigned int c;
 
-    for (c = 0x30; c <= 0x39; c++)
+    for (unsigned int c = 0x30; c <= 0x39; c++)
       ASSERT (uc_is_general_category (c, ct));
-    for (c = 0x40; c < 0x80; c++)
+    for (unsigned int c = 0x40; c < 0x80; c++)
       ASSERT (!uc_is_general_category (c, ct));
   }
 
   {
     uc_general_category_t ct = uc_general_category_byname ("Nl");
-    unsigned int c;
 
-    for (c = 0x2160; c < 0x2180; c++)
+    for (unsigned int c = 0x2160; c < 0x2180; c++)
       ASSERT (uc_is_general_category (c, ct));
     ASSERT (!uc_is_general_category (0x0BF1, ct));
     ASSERT (!uc_is_general_category (0x0D71, ct));
@@ -228,9 +226,8 @@ main ()
 
   {
     uc_general_category_t ct = uc_general_category_byname ("Foo");
-    unsigned int c;
 
-    for (c = 0; c < 0x110000; c++)
+    for (unsigned int c = 0; c < 0x110000; c++)
       ASSERT (!uc_is_general_category (c, ct));
   }
 
diff --git a/tests/unictype/test-categ_longname.c b/tests/unictype/test-categ_longname.c
index 45426b5b..72827bd7 100644
--- a/tests/unictype/test-categ_longname.c
+++ b/tests/unictype/test-categ_longname.c
@@ -1,5 +1,5 @@
 /* Test the Unicode character type functions.
-   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
diff --git a/tests/unictype/test-categ_name.c b/tests/unictype/test-categ_name.c
index 26435ea0..f75b625e 100644
--- a/tests/unictype/test-categ_name.c
+++ b/tests/unictype/test-categ_name.c
@@ -1,5 +1,5 @@
 /* Test the Unicode character type functions.
-   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
diff --git a/tests/unictype/test-categ_none.c b/tests/unictype/test-categ_none.c
index 9cd80044..3c68f643 100644
--- a/tests/unictype/test-categ_none.c
+++ b/tests/unictype/test-categ_none.c
@@ -1,5 +1,5 @@
 /* Test the Unicode character type functions.
-   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
@@ -31,9 +31,8 @@ main ()
 #if !defined _MSC_VER
 
   uc_general_category_t ct = _UC_CATEGORY_NONE;
-  unsigned int c;
 
-  for (c = 0; c < 0x110000; c++)
+  for (unsigned int c = 0; c < 0x110000; c++)
     ASSERT (!uc_is_general_category (c, ct));
 
 #endif
diff --git a/tests/unictype/test-categ_of.c b/tests/unictype/test-categ_of.c
index 007e0c40..5b2c8742 100644
--- a/tests/unictype/test-categ_of.c
+++ b/tests/unictype/test-categ_of.c
@@ -1,5 +1,5 @@
 /* Test the Unicode character type functions.
-   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
@@ -25,29 +25,24 @@
 int
 main ()
 {
-  {
-    unsigned int c;
-    for (c = 0; c < 0x110000; c++)
-      ASSERT (uc_is_general_category (c, uc_general_category (c)));
-  }
+  for (unsigned int c = 0; c < 0x110000; c++)
+    ASSERT (uc_is_general_category (c, uc_general_category (c)));
 
   {
     uc_general_category_t decimal_digits = uc_general_category ('7');
-    unsigned int c;
 
-    for (c = 0x30; c <= 0x39; c++)
+    for (unsigned int c = 0x30; c <= 0x39; c++)
       ASSERT (uc_is_general_category (c, decimal_digits));
-    for (c = 0x40; c < 0x80; c++)
+    for (unsigned int c = 0x40; c < 0x80; c++)
       ASSERT (!uc_is_general_category (c, decimal_digits));
   }
 
   {
     uc_general_category_t lowercase_letters = uc_general_category ('x');
-    unsigned int c;
 
-    for (c = 0x41; c <= 0x5A; c++)
+    for (unsigned int c = 0x41; c <= 0x5A; c++)
       ASSERT (!uc_is_general_category (c, lowercase_letters));
-    for (c = 0x61; c <= 0x7A; c++)
+    for (unsigned int c = 0x61; c <= 0x7A; c++)
       ASSERT (uc_is_general_category (c, lowercase_letters));
   }
 
diff --git a/tests/unictype/test-categ_or.c b/tests/unictype/test-categ_or.c
index fbef5cf3..89687e31 100644
--- a/tests/unictype/test-categ_or.c
+++ b/tests/unictype/test-categ_or.c
@@ -1,5 +1,5 @@
 /* Test the Unicode character type functions.
-   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
diff --git a/tests/unictype/test-categ_test_withtable.c b/tests/unictype/test-categ_test_withtable.c
index 7e796fb6..c724ec4e 100644
--- a/tests/unictype/test-categ_test_withtable.c
+++ b/tests/unictype/test-categ_test_withtable.c
@@ -1,5 +1,5 @@
 /* Test the Unicode character type functions.
-   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
diff --git a/tests/unictype/test-combiningclass.c b/tests/unictype/test-combiningclass.c
index ba6645cb..4d1911a9 100644
--- a/tests/unictype/test-combiningclass.c
+++ b/tests/unictype/test-combiningclass.c
@@ -1,5 +1,5 @@
 /* Test the Unicode character type functions.
-   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
diff --git a/tests/unictype/test-combiningclass_byname.c b/tests/unictype/test-combiningclass_byname.c
index 98f4fbad..731442fb 100644
--- a/tests/unictype/test-combiningclass_byname.c
+++ b/tests/unictype/test-combiningclass_byname.c
@@ -1,5 +1,5 @@
 /* Test the Unicode character Arabic joining group functions.
-   Copyright (C) 2011-2025 Free Software Foundation, Inc.
+   Copyright (C) 2011-2026 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2011.
 
    This program is free software: you can redistribute it and/or modify it
diff --git a/tests/unictype/test-combiningclass_longname.c b/tests/unictype/test-combiningclass_longname.c
index 2ee2520a..469e0a66 100644
--- a/tests/unictype/test-combiningclass_longname.c
+++ b/tests/unictype/test-combiningclass_longname.c
@@ -1,5 +1,5 @@
 /* Test the Unicode character type functions.
-   Copyright (C) 2011-2025 Free Software Foundation, Inc.
+   Copyright (C) 2011-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
diff --git a/tests/unictype/test-combiningclass_name.c b/tests/unictype/test-combiningclass_name.c
index 1f06d08c..728707c3 100644
--- a/tests/unictype/test-combiningclass_name.c
+++ b/tests/unictype/test-combiningclass_name.c
@@ -1,5 +1,5 @@
 /* Test the Unicode character type functions.
-   Copyright (C) 2011-2025 Free Software Foundation, Inc.
+   Copyright (C) 2011-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
diff --git a/tests/unictype/test-decdigit.c b/tests/unictype/test-decdigit.c
index 1e860f05..632f1c8d 100644
--- a/tests/unictype/test-decdigit.c
+++ b/tests/unictype/test-decdigit.c
@@ -1,5 +1,5 @@
 /* Test the Unicode character type functions.
-   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
@@ -31,10 +31,9 @@ int
 main ()
 {
   unsigned int c;
-  size_t i;
 
   c = 0;
-  for (i = 0; i < SIZEOF (mapping); i++)
+  for (size_t i = 0; i < SIZEOF (mapping); i++)
     {
       for (; c < mapping[i].ch; c++)
         ASSERT (uc_decimal_value (c) == -1);
diff --git a/tests/unictype/test-digit.c b/tests/unictype/test-digit.c
index a9cd6518..2a0663c1 100644
--- a/tests/unictype/test-digit.c
+++ b/tests/unictype/test-digit.c
@@ -1,5 +1,5 @@
 /* Test the Unicode character type functions.
-   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
@@ -31,10 +31,9 @@ int
 main ()
 {
   unsigned int c;
-  size_t i;
 
   c = 0;
-  for (i = 0; i < SIZEOF (mapping); i++)
+  for (size_t i = 0; i < SIZEOF (mapping); i++)
     {
       for (; c < mapping[i].ch; c++)
         ASSERT (uc_digit_value (c) == -1);
diff --git a/tests/unictype/test-incb_byname.c b/tests/unictype/test-incb_byname.c
index a7ab1730..747d7275 100644
--- a/tests/unictype/test-incb_byname.c
+++ b/tests/unictype/test-incb_byname.c
@@ -1,5 +1,5 @@
 /* Test the Indic_Conjunct_Break value functions.
-   Copyright (C) 2011-2025 Free Software Foundation, Inc.
+   Copyright (C) 2011-2026 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2024.
 
    This program is free software: you can redistribute it and/or modify it
diff --git a/tests/unictype/test-incb_name.c b/tests/unictype/test-incb_name.c
index bf46adc0..c486fc60 100644
--- a/tests/unictype/test-incb_name.c
+++ b/tests/unictype/test-incb_name.c
@@ -1,5 +1,5 @@
 /* Test the Indic_Conjunct_Break value functions.
-   Copyright (C) 2011-2025 Free Software Foundation, Inc.
+   Copyright (C) 2011-2026 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2024.
 
    This program is free software: you can redistribute it and/or modify it
diff --git a/tests/unictype/test-incb_of.c b/tests/unictype/test-incb_of.c
index c4d8cd71..3c08a0ef 100644
--- a/tests/unictype/test-incb_of.c
+++ b/tests/unictype/test-incb_of.c
@@ -1,5 +1,5 @@
 /* Test the Unicode character Indic_Conjunct_Break attribute functions.
-   Copyright (C) 2011-2025 Free Software Foundation, Inc.
+   Copyright (C) 2011-2026 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2024.
 
    This program is free software: you can redistribute it and/or modify it
@@ -35,10 +35,9 @@ int
 main ()
 {
   unsigned int c;
-  size_t i;
 
   c = 0;
-  for (i = 0; i < SIZEOF (mapping); i++)
+  for (size_t i = 0; i < SIZEOF (mapping); i++)
     {
       for (; c < mapping[i].ch; c++)
         ASSERT (uc_indic_conjunct_break (c) == UC_INDIC_CONJUNCT_BREAK_NONE);
diff --git a/tests/unictype/test-joininggroup_byname.c b/tests/unictype/test-joininggroup_byname.c
index fdd96801..b960a829 100644
--- a/tests/unictype/test-joininggroup_byname.c
+++ b/tests/unictype/test-joininggroup_byname.c
@@ -1,5 +1,5 @@
 /* Test the Unicode character Arabic joining group functions.
-   Copyright (C) 2011-2025 Free Software Foundation, Inc.
+   Copyright (C) 2011-2026 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2011.
 
    This program is free software: you can redistribute it and/or modify it
diff --git a/tests/unictype/test-joininggroup_name.c b/tests/unictype/test-joininggroup_name.c
index 9196014b..f3cce59d 100644
--- a/tests/unictype/test-joininggroup_name.c
+++ b/tests/unictype/test-joininggroup_name.c
@@ -1,5 +1,5 @@
 /* Test the Unicode character Arabic joining group functions.
-   Copyright (C) 2011-2025 Free Software Foundation, Inc.
+   Copyright (C) 2011-2026 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2011.
 
    This program is free software: you can redistribute it and/or modify it
diff --git a/tests/unictype/test-joininggroup_of.c b/tests/unictype/test-joininggroup_of.c
index 8ff37325..20d40788 100644
--- a/tests/unictype/test-joininggroup_of.c
+++ b/tests/unictype/test-joininggroup_of.c
@@ -1,5 +1,5 @@
 /* Test the Unicode character Arabic joining group functions.
-   Copyright (C) 2011-2025 Free Software Foundation, Inc.
+   Copyright (C) 2011-2026 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2011.
 
    This program is free software: you can redistribute it and/or modify it
@@ -35,10 +35,9 @@ int
 main ()
 {
   unsigned int c;
-  size_t i;
 
   c = 0;
-  for (i = 0; i < SIZEOF (mapping); i++)
+  for (size_t i = 0; i < SIZEOF (mapping); i++)
     {
       for (; c < mapping[i].ch; c++)
         ASSERT (uc_joining_group (c) == UC_JOINING_GROUP_NONE);
diff --git a/tests/unictype/test-joiningtype_byname.c b/tests/unictype/test-joiningtype_byname.c
index 81798156..b794584a 100644
--- a/tests/unictype/test-joiningtype_byname.c
+++ b/tests/unictype/test-joiningtype_byname.c
@@ -1,5 +1,5 @@
 /* Test the Unicode character Arabic joining type functions.
-   Copyright (C) 2011-2025 Free Software Foundation, Inc.
+   Copyright (C) 2011-2026 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2011.
 
    This program is free software: you can redistribute it and/or modify it
diff --git a/tests/unictype/test-joiningtype_longname.c b/tests/unictype/test-joiningtype_longname.c
index 1c347eb1..e1970150 100644
--- a/tests/unictype/test-joiningtype_longname.c
+++ b/tests/unictype/test-joiningtype_longname.c
@@ -1,5 +1,5 @@
 /* Test the Unicode character Arabic joining type functions.
-   Copyright (C) 2011-2025 Free Software Foundation, Inc.
+   Copyright (C) 2011-2026 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2011.
 
    This program is free software: you can redistribute it and/or modify it
diff --git a/tests/unictype/test-joiningtype_name.c b/tests/unictype/test-joiningtype_name.c
index 9f93f5f2..1bb8edcd 100644
--- a/tests/unictype/test-joiningtype_name.c
+++ b/tests/unictype/test-joiningtype_name.c
@@ -1,5 +1,5 @@
 /* Test the Unicode character Arabic joining type functions.
-   Copyright (C) 2011-2025 Free Software Foundation, Inc.
+   Copyright (C) 2011-2026 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2011.
 
    This program is free software: you can redistribute it and/or modify it
diff --git a/tests/unictype/test-joiningtype_of.c b/tests/unictype/test-joiningtype_of.c
index f04695a9..c67ff87a 100644
--- a/tests/unictype/test-joiningtype_of.c
+++ b/tests/unictype/test-joiningtype_of.c
@@ -1,5 +1,5 @@
 /* Test the Unicode character Arabic joining type functions.
-   Copyright (C) 2011-2025 Free Software Foundation, Inc.
+   Copyright (C) 2011-2026 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2011.
 
    This program is free software: you can redistribute it and/or modify it
@@ -35,10 +35,9 @@ int
 main ()
 {
   unsigned int c;
-  size_t i;
 
   c = 0;
-  for (i = 0; i < SIZEOF (mapping); i++)
+  for (size_t i = 0; i < SIZEOF (mapping); i++)
     {
       for (; c < mapping[i].ch; c++)
         ASSERT (uc_joining_type (c) == UC_JOINING_TYPE_U
diff --git a/tests/unictype/test-mirror.c b/tests/unictype/test-mirror.c
index 70b8fae8..de7dc2b0 100644
--- a/tests/unictype/test-mirror.c
+++ b/tests/unictype/test-mirror.c
@@ -1,5 +1,5 @@
 /* Test the Unicode character type functions.
-   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
diff --git a/tests/unictype/test-numeric.c b/tests/unictype/test-numeric.c
index 824db1a2..7b230dcd 100644
--- a/tests/unictype/test-numeric.c
+++ b/tests/unictype/test-numeric.c
@@ -1,5 +1,5 @@
 /* Test the Unicode character type functions.
-   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
@@ -33,10 +33,9 @@ main ()
 {
   unsigned int c;
   uc_fraction_t value;
-  size_t i;
 
   c = 0;
-  for (i = 0; i < SIZEOF (mapping); i++)
+  for (size_t i = 0; i < SIZEOF (mapping); i++)
     {
       for (; c < mapping[i].ch; c++)
         {
diff --git a/tests/unictype/test-pr_byname.c b/tests/unictype/test-pr_byname.c
index fc0908c7..788889b9 100644
--- a/tests/unictype/test-pr_byname.c
+++ b/tests/unictype/test-pr_byname.c
@@ -1,5 +1,5 @@
 /* Test the Unicode character type functions.
-   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
@@ -27,9 +27,8 @@ main ()
 {
   {
     uc_property_t pr = uc_property_byname ("composite");
-    unsigned int c;
 
-    for (c = 0; c < 0x110000; c++)
+    for (unsigned int c = 0; c < 0x110000; c++)
       ASSERT (uc_is_property (c, pr) == uc_is_property_composite (c));
   }
 
diff --git a/tests/unictype/test-pr_test.c b/tests/unictype/test-pr_test.c
index c8b52328..5a1f4820 100644
--- a/tests/unictype/test-pr_test.c
+++ b/tests/unictype/test-pr_test.c
@@ -1,5 +1,5 @@
 /* Test the Unicode character type functions.
-   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
@@ -26,9 +26,8 @@ int
 main ()
 {
   uc_property_t pr = UC_PROPERTY_COMPOSITE;
-  unsigned int c;
 
-  for (c = 0; c < 0x110000; c++)
+  for (unsigned int c = 0; c < 0x110000; c++)
     ASSERT (uc_is_property (c, pr) == uc_is_property_composite (c));
 
   return test_exit_status;
diff --git a/tests/unictype/test-predicate-part1.h b/tests/unictype/test-predicate-part1.h
index caf2dc2f..207e465b 100644
--- a/tests/unictype/test-predicate-part1.h
+++ b/tests/unictype/test-predicate-part1.h
@@ -1,5 +1,5 @@
 /* Test the Unicode character type functions.
-   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
diff --git a/tests/unictype/test-predicate-part2.h b/tests/unictype/test-predicate-part2.h
index b4eef82e..83cf7e89 100644
--- a/tests/unictype/test-predicate-part2.h
+++ b/tests/unictype/test-predicate-part2.h
@@ -1,5 +1,5 @@
 /* Test the Unicode character type functions.
-   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
@@ -20,10 +20,9 @@ int
 main ()
 {
   unsigned int c;
-  size_t i;
 
   c = 0;
-  for (i = 0; i < SIZEOF (set); i++)
+  for (size_t i = 0; i < SIZEOF (set); i++)
     {
       for (; c < set[i].start; c++)
         ASSERT (!PREDICATE (c));
diff --git a/tests/unictype/test-scripts.c b/tests/unictype/test-scripts.c
index 54699b31..86841c63 100644
--- a/tests/unictype/test-scripts.c
+++ b/tests/unictype/test-scripts.c
@@ -1,5 +1,5 @@
 /* Test the Unicode character type functions.
-   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
@@ -40,28 +40,23 @@ main ()
   ASSERT (!uc_is_script (0x05DA, uc_script_byname ("Latin")));
   ASSERT (uc_is_script (0x05DA, uc_script_byname ("Hebrew")));
 
-  {
-    unsigned int c;
-
-    for (c = 0; c < 0x110000; c++)
-      {
-        const uc_script_t *script = uc_script (c);
-        if (script != NULL)
-          ASSERT (uc_is_script (c, script));
-      }
-  }
+  for (unsigned int c = 0; c < 0x110000; c++)
+    {
+      const uc_script_t *script = uc_script (c);
+      if (script != NULL)
+        ASSERT (uc_is_script (c, script));
+    }
 
   /* Test the uc_all_scripts function.  */
   {
     const uc_script_t *scripts;
     size_t nscripts;
-    size_t i;
     bool found;
 
     uc_all_scripts (&scripts, &nscripts);
 
     found = false;
-    for (i = 0; i < nscripts; i++)
+    for (size_t i = 0; i < nscripts; i++)
       {
         ASSERT (scripts[i].name != NULL);
         if (strcmp (scripts[i].name, "Hebrew") == 0)
diff --git a/tests/unictype/test-sy_c_ident.c b/tests/unictype/test-sy_c_ident.c
index db42c4af..b23da71d 100644
--- a/tests/unictype/test-sy_c_ident.c
+++ b/tests/unictype/test-sy_c_ident.c
@@ -1,5 +1,5 @@
 /* Test the Unicode character type functions.
-   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
diff --git a/tests/unictype/test-sy_java_ident.c b/tests/unictype/test-sy_java_ident.c
index 0030ec2f..e3ea67bd 100644
--- a/tests/unictype/test-sy_java_ident.c
+++ b/tests/unictype/test-sy_java_ident.c
@@ -1,5 +1,5 @@
 /* Test the Unicode character type functions.
-   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
diff --git a/tests/unictype/test-unictype-h.c b/tests/unictype/test-unictype-h.c
index b1f07c99..53032ebf 100644
--- a/tests/unictype/test-unictype-h.c
+++ b/tests/unictype/test-unictype-h.c
@@ -1,5 +1,5 @@
 /* Test of <unictype.h>.
-   Copyright (C) 2025 Free Software Foundation, Inc.
+   Copyright (C) 2025-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