New upstream version 1.4.2upstream/1.4.2upstream

1 files changed, 56 insertions, 53 deletions

diff --git a/lib/unistr/u8-strrchr.c b/lib/unistr/u8-strrchr.c
index 4f364fa6..c4fcee99 100644
--- a/lib/unistr/u8-strrchr.c
+++ b/lib/unistr/u8-strrchr.c
@@ -1,5 +1,5 @@
 /* Search character in UTF-8 string.
-   Copyright (C) 1999, 2002, 2006-2007, 2009-2025 Free Software Foundation,
+   Copyright (C) 1999, 2002, 2006-2007, 2009-2026 Free Software Foundation,
    Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2002.
 
@@ -38,7 +38,6 @@ u8_strrchr (const uint8_t *s, ucs4_t uc)
   /* Calling u8_strlen and then searching from the other end would cause more
      memory accesses. Avoid that, at the cost of a few more comparisons.  */
   uint8_t *result = NULL;
-  uint8_t c[6];
 
   if (uc < 0x80)
     {
@@ -53,61 +52,65 @@ u8_strrchr (const uint8_t *s, ucs4_t uc)
         }
     }
   else
-    switch (u8_uctomb_aux (c, uc, 6))
-      {
-      case 2:
-        if (*s)
-          {
-            uint8_t c0 = c[0];
-            uint8_t c1 = c[1];
+    {
+      uint8_t c[6];
+
+      switch (u8_uctomb_aux (c, uc, 6))
+        {
+        case 2:
+          if (*s)
+            {
+              uint8_t c0 = c[0];
+              uint8_t c1 = c[1];
 
-            /* FIXME: Maybe walking the string via u8_mblen is a win?  */
-            for (;; s++)
-              {
-                if (s[1] == 0)
-                  break;
-                if (*s == c0 && s[1] == c1)
-                  result = (uint8_t *) s;
-              }
-          }
-        break;
+              /* FIXME: Maybe walking the string via u8_mblen is a win?  */
+              for (;; s++)
+                {
+                  if (s[1] == 0)
+                    break;
+                  if (*s == c0 && s[1] == c1)
+                    result = (uint8_t *) s;
+                }
+            }
+          break;
 
-      case 3:
-        if (*s && s[1])
-          {
-            uint8_t c0 = c[0];
-            uint8_t c1 = c[1];
-            uint8_t c2 = c[2];
+        case 3:
+          if (*s && s[1])
+            {
+              uint8_t c0 = c[0];
+              uint8_t c1 = c[1];
+              uint8_t c2 = c[2];
 
-            /* FIXME: Maybe walking the string via u8_mblen is a win?  */
-            for (;; s++)
-              {
-                if (s[2] == 0)
-                  break;
-                if (*s == c0 && s[1] == c1 && s[2] == c2)
-                  result = (uint8_t *) s;
-              }
-          }
-        break;
+              /* FIXME: Maybe walking the string via u8_mblen is a win?  */
+              for (;; s++)
+                {
+                  if (s[2] == 0)
+                    break;
+                  if (*s == c0 && s[1] == c1 && s[2] == c2)
+                    result = (uint8_t *) s;
+                }
+            }
+          break;
 
-      case 4:
-        if (*s && s[1] && s[2])
-          {
-            uint8_t c0 = c[0];
-            uint8_t c1 = c[1];
-            uint8_t c2 = c[2];
-            uint8_t c3 = c[3];
+        case 4:
+          if (*s && s[1] && s[2])
+            {
+              uint8_t c0 = c[0];
+              uint8_t c1 = c[1];
+              uint8_t c2 = c[2];
+              uint8_t c3 = c[3];
 
-            /* FIXME: Maybe walking the string via u8_mblen is a win?  */
-            for (;; s++)
-              {
-                if (s[3] == 0)
-                  break;
-                if (*s == c0 && s[1] == c1 && s[2] == c2 && s[3] == c3)
-                  result = (uint8_t *) s;
-              }
-          }
-        break;
-      }
+              /* FIXME: Maybe walking the string via u8_mblen is a win?  */
+              for (;; s++)
+                {
+                  if (s[3] == 0)
+                    break;
+                  if (*s == c0 && s[1] == c1 && s[2] == c2 && s[3] == c3)
+                    result = (uint8_t *) s;
+                }
+            }
+          break;
+        }
+    }
   return result;
 }