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

1 files changed, 26 insertions, 20 deletions

diff --git a/lib/unistr/u16-strrchr.c b/lib/unistr/u16-strrchr.c
index 822a44bf..f00d0cd7 100644
--- a/lib/unistr/u16-strrchr.c
+++ b/lib/unistr/u16-strrchr.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.  */
@@ -35,7 +38,6 @@ u16_strrchr (const uint16_t *s, ucs4_t uc)
   /* Calling u16_strlen and then searching from the other end would cause more
      memory accesses. Avoid that, at the cost of a few more comparisons.  */
   uint16_t *result = NULL;
-  uint16_t c[2];
 
   if (uc < 0x10000)
     {
@@ -50,24 +52,28 @@ u16_strrchr (const uint16_t *s, ucs4_t uc)
         }
     }
   else
-    switch (u16_uctomb_aux (c, uc, 2))
-      {
-      case 2:
-        if (*s)
-          {
-            uint16_t c0 = c[0];
-            uint16_t c1 = c[1];
+    {
+      uint16_t c[2];
+
+      switch (u16_uctomb_aux (c, uc, 2))
+        {
+        case 2:
+          if (*s)
+            {
+              uint16_t c0 = c[0];
+              uint16_t c1 = c[1];
 
-            /* FIXME: Maybe walking the string via u16_mblen is a win?  */
-            for (;; s++)
-              {
-                if (s[1] == 0)
-                  break;
-                if (*s == c0 && s[1] == c1)
-                  result = (uint16_t *) s;
-              }
-          }
-        break;
-      }
+              /* FIXME: Maybe walking the string via u16_mblen is a win?  */
+              for (;; s++)
+                {
+                  if (s[1] == 0)
+                    break;
+                  if (*s == c0 && s[1] == c1)
+                    result = (uint16_t *) s;
+                }
+            }
+          break;
+        }
+    }
   return result;
 }