[gtk/win32-enable-werror: 4/10] win32: Rename a shadowing variable



commit 4f0cc3086f929755d8bf3b1291f757fb634f17ae
Author: Benjamin Otte <otte redhat com>
Date:   Tue May 21 07:15:16 2019 +0200

    win32: Rename a shadowing variable

 gtk/gtkmain.c | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)
---
diff --git a/gtk/gtkmain.c b/gtk/gtkmain.c
index 22513d95c3..4dce1cd7e7 100644
--- a/gtk/gtkmain.c
+++ b/gtk/gtkmain.c
@@ -419,7 +419,6 @@ enum_locale_proc (LPTSTR locale)
             SUBLANGID (LANGIDFROMLCID (lcid)) == SUBLANG_DEFAULT)))
         {
           char language[100], country[100];
-          char locale[300];
 
           if (script_to_check != NULL)
             {
@@ -467,11 +466,13 @@ enum_locale_proc (LPTSTR locale)
           if (GetLocaleInfo (lcid, LOCALE_SENGLANGUAGE, language, sizeof (language)) &&
               GetLocaleInfo (lcid, LOCALE_SENGCOUNTRY, country, sizeof (country)))
             {
-              strcpy (locale, language);
-              strcat (locale, "_");
-              strcat (locale, country);
+              char str[300];
 
-              if (setlocale (LC_ALL, locale) != NULL)
+              strcpy (str, language);
+              strcat (str, "_");
+              strcat (str, country);
+
+              if (setlocale (LC_ALL, str) != NULL)
                 setlocale_called = TRUE;
             }
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]