Merge branch 'feature/upstream' into develop

1 files changed, 3 insertions, 7 deletions

diff --git a/lib/setlocale_null-unlocked.c b/lib/setlocale_null-unlocked.c
index 72729e6b..e7f155c7 100644
--- a/lib/setlocale_null-unlocked.c
+++ b/lib/setlocale_null-unlocked.c
@@ -1,5 +1,5 @@
 /* Query the name of the current global locale, without locking.
-   Copyright (C) 2019-2025 Free Software Foundation, Inc.
+   Copyright (C) 2019-2026 Free Software Foundation, Inc.
 
    This file is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as
@@ -86,10 +86,8 @@ setlocale_null_r_unlocked (int category, char *buf, size_t bufsize)
       size_t length = wcslen (result);
       if (length < bufsize)
         {
-          size_t i;
-
           /* Convert wchar_t[] -> char[], assuming plain ASCII.  */
-          for (i = 0; i <= length; i++)
+          for (size_t i = 0; i <= length; i++)
             buf[i] = result[i];
 
           return 0;
@@ -101,10 +99,8 @@ setlocale_null_r_unlocked (int category, char *buf, size_t bufsize)
               /* Return a truncated result in BUF.
                  This is a convenience for callers that don't want to write
                  explicit code for handling ERANGE.  */
-              size_t i;
-
               /* Convert wchar_t[] -> char[], assuming plain ASCII.  */
-              for (i = 0; i < bufsize; i++)
+              for (size_t i = 0; i < bufsize; i++)
                 buf[i] = result[i];
               buf[bufsize - 1] = '\0';
             }