From 6173c3df1b8620e08fd4b7a56592763b1641270d Mon Sep 17 00:00:00 2001
From: Sascha Wildner <saw@online.de>
Date: Wed, 10 Apr 2019 20:06:20 +0200
Subject: [PATCH] libc/locale: Fix -Wmissing-field-initializers.

---
 lib/libc/locale/collate.c |  6 ++++--
 lib/libc/locale/table.c   | 21 ++++++++++++---------
 lib/libc/locale/xlocale.c | 24 ++++++++++++------------
 3 files changed, 28 insertions(+), 23 deletions(-)

diff --git a/lib/libc/locale/collate.c b/lib/libc/locale/collate.c
index adcb02dd64..ee341c6d6e 100644
--- a/lib/libc/locale/collate.c
+++ b/lib/libc/locale/collate.c
@@ -53,11 +53,13 @@
 #include "libc_private.h"
 
 struct xlocale_collate __xlocale_global_collate = {
-	{{0}, "C"}, 1, 0, 0, 0
+	.header = {{0}, "C"},
+	.__collate_load_error = 1
 };
 
 struct xlocale_collate __xlocale_C_collate = {
-	{{0}, "C"}, 1, 0, 0, 0
+	.header = {{0}, "C"},
+	.__collate_load_error = 1
 };
 
 static int
diff --git a/lib/libc/locale/table.c b/lib/libc/locale/table.c
index b916262484..041baf3d49 100644
--- a/lib/libc/locale/table.c
+++ b/lib/libc/locale/table.c
@@ -45,13 +45,14 @@
 #include "mblocal.h"
 
 const _RuneLocale _DefaultRuneLocale = {
-    _RUNE_MAGIC_1,
-    "NONE",
-    NULL,
-    NULL,
-    0xFFFD,
+    .__magic = _RUNE_MAGIC_1,
+    .__encoding = "NONE",
+    .__sgetrune = NULL,
+    .__sputrune = NULL,
+    .__invalid_rune = 0xFFFD,
 
-    {	/*00*/	_CTYPE_C,
+    .__runetype = {
+	/*00*/	_CTYPE_C,
 		_CTYPE_C,
 		_CTYPE_C,
 		_CTYPE_C,
@@ -180,7 +181,8 @@ const _RuneLocale _DefaultRuneLocale = {
 		_CTYPE_P|_CTYPE_R|_CTYPE_G,
 		_CTYPE_C,
     },
-    {	0x00,	0x01,	0x02,	0x03,	0x04,	0x05,	0x06,	0x07,
+    .__maplower = {
+	0x00,	0x01,	0x02,	0x03,	0x04,	0x05,	0x06,	0x07,
      	0x08,	0x09,	0x0a,	0x0b,	0x0c,	0x0d,	0x0e,	0x0f,
 	0x10,	0x11,	0x12,	0x13,	0x14,	0x15,	0x16,	0x17,
      	0x18,	0x19,	0x1a,	0x1b,	0x1c,	0x1d,	0x1e,	0x1f,
@@ -213,7 +215,8 @@ const _RuneLocale _DefaultRuneLocale = {
 	0xf0,	0xf1,	0xf2,	0xf3,	0xf4,	0xf5,	0xf6,	0xf7,
      	0xf8,	0xf9,	0xfa,	0xfb,	0xfc,	0xfd,	0xfe,	0xff,
     },
-    {	0x00,	0x01,	0x02,	0x03,	0x04,	0x05,	0x06,	0x07,
+    .__mapupper = {
+	0x00,	0x01,	0x02,	0x03,	0x04,	0x05,	0x06,	0x07,
      	0x08,	0x09,	0x0a,	0x0b,	0x0c,	0x0d,	0x0e,	0x0f,
 	0x10,	0x11,	0x12,	0x13,	0x14,	0x15,	0x16,	0x17,
      	0x18,	0x19,	0x1a,	0x1b,	0x1c,	0x1d,	0x1e,	0x1f,
@@ -245,7 +248,7 @@ const _RuneLocale _DefaultRuneLocale = {
      	0xe8,	0xe9,	0xea,	0xeb,	0xec,	0xed,	0xee,	0xef,
 	0xf0,	0xf1,	0xf2,	0xf3,	0xf4,	0xf5,	0xf6,	0xf7,
      	0xf8,	0xf9,	0xfa,	0xfb,	0xfc,	0xfd,	0xfe,	0xff,
-    },
+    }
 };
 
 #undef _CurrentRuneLocale
diff --git a/lib/libc/locale/xlocale.c b/lib/libc/locale/xlocale.c
index 0dfc631550..fb607b4771 100644
--- a/lib/libc/locale/xlocale.c
+++ b/lib/libc/locale/xlocale.c
@@ -72,8 +72,8 @@ int __get_locale_str(int category, const char *str, char * const res);
 int __detect_path_locale(void);
 
 struct _xlocale __xlocale_global_locale = {
-	{0},
-	{
+	.header = {0},
+	.components = {
 		&__xlocale_global_collate,
 		&__xlocale_global_ctype,
 		&__xlocale_global_monetary,
@@ -81,23 +81,23 @@ struct _xlocale __xlocale_global_locale = {
 		&__xlocale_global_time,
 		&__xlocale_global_messages
 	},
-	1,
-	0,
-	1,
-	0
+	.monetary_locale_changed = 1,
+	.using_monetary_locale = 0,
+	.numeric_locale_changed = 1,
+	.using_numeric_locale = 0
 };
 
 struct _xlocale __xlocale_C_locale = {
-	{0},
-	{
+	.header = {0},
+	.components = {
 		&__xlocale_C_collate,
 		&__xlocale_C_ctype,
 		0, 0, 0, 0
 	},
-	1,
-	0,
-	1,
-	0
+	.monetary_locale_changed = 1,
+	.using_monetary_locale = 0,
+	.numeric_locale_changed = 1,
+	.using_numeric_locale = 0
 };
 
 static void*(*constructors[])(const char*, locale_t) =
-- 
2.41.0