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

1 files changed, 24 insertions, 19 deletions

diff --git a/lib/unistr/u16-strchr.c b/lib/unistr/u16-strchr.c
index fe42999e..4a533b0f 100644
--- a/lib/unistr/u16-strchr.c
+++ b/lib/unistr/u16-strchr.c
@@ -1,5 +1,5 @@
 /* Search character in UTF-16 string.
-   Copyright (C) 1999, 2002, 2006-2007, 2009-2024 Free Software Foundation,
+   Copyright (C) 1999, 2002, 2006-2007, 2009-2026 Free Software Foundation,
    Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2002.
 
@@ -24,6 +24,9 @@
    License and of the GNU General Public License along with this
    program.  If not, see <https://www.gnu.org/licenses/>.  */
 
+/* Don't use the const-improved function macros in this compilation unit.  */
+#define _LIBUNISTRING_NO_CONST_GENERICS
+
 #include <config.h>
 
 /* Specification.  */
@@ -32,8 +35,6 @@
 uint16_t *
 u16_strchr (const uint16_t *s, ucs4_t uc)
 {
-  uint16_t c[2];
-
   if (uc < 0x10000)
     {
       uint16_t c0 = uc;
@@ -48,25 +49,29 @@ u16_strchr (const uint16_t *s, ucs4_t uc)
       return (uint16_t *) s;
     }
   else
-    switch (u16_uctomb_aux (c, uc, 2))
-      {
-      case 2:
-        if (*s == 0)
-          goto notfound;
+    {
+      uint16_t c[2];
+
+      switch (u16_uctomb_aux (c, uc, 2))
         {
-          uint16_t c0 = c[0];
-          uint16_t c1 = c[1];
+        case 2:
+          if (*s == 0)
+            goto notfound;
+          {
+            uint16_t c0 = c[0];
+            uint16_t c1 = c[1];
 
-          for (;; s++)
-            {
-              if (s[1] == 0)
-                goto notfound;
-              if (*s == c0 && s[1] == c1)
-                break;
-            }
-          return (uint16_t *) s;
+            for (;; s++)
+              {
+                if (s[1] == 0)
+                  goto notfound;
+                if (*s == c0 && s[1] == c1)
+                  break;
+              }
+            return (uint16_t *) s;
+          }
         }
-      }
+    }
 notfound:
   return NULL;
 }