Fix some warnings in W32 part of gtkmain
authorРуслан Ижбулатов <lrn1986@gmail.com>
Sun, 10 Jun 2018 21:02:56 +0000 (21:02 +0000)
committerРуслан Ижбулатов <lrn1986@gmail.com>
Sun, 10 Jun 2018 21:21:20 +0000 (21:21 +0000)
* Add missing default cases
* Cast string literals as non-const

gtk/gtkmain.c

index 85bcc3865c065cf7dcf61cf74a20e2092d151b36..ee9ee075a13fd7d9f6d6bae9ba4678ad5a9a91e3 100644 (file)
@@ -431,6 +431,8 @@ enum_locale_proc (LPTSTR locale)
                     case MAKELANGID (LANG_SERBIAN, 0x07):
                       /* Serbian in Bosnia and Herzegovina, Cyrillic */
                       return TRUE;
+                    default:
+                      break;
                     }
                 }
               else if (strcmp (script_to_check, "Cyrl") == 0)
@@ -446,6 +448,8 @@ enum_locale_proc (LPTSTR locale)
                     case MAKELANGID (LANG_SERBIAN, 0x06):
                       /* Serbian in Bosnia and Herzegovina, Latin */
                       return TRUE;
+                    default:
+                      break;
                     }
                 }
             }
@@ -521,7 +525,7 @@ setlocale_initialization (void)
                    */
                   if (strcmp (iso3166_to_check, "CS") == 0 ||
                       strcmp (iso3166_to_check, "YU") == 0)
-                    iso3166_to_check = "SP";
+                    iso3166_to_check = (char *) "SP";
                 }
               else
                 {
@@ -530,7 +534,7 @@ setlocale_initialization (void)
                     *script_to_check++ = '\0';
                   /* LANG_SERBIAN == LANG_CROATIAN, recognize just "sr" */
                   if (strcmp (iso639_to_check, "sr") == 0)
-                    iso3166_to_check = "SP";
+                    iso3166_to_check = (char *) "SP";
                 }
 
               EnumSystemLocales (enum_locale_proc, LCID_SUPPORTED);