xts5: Fix "missing braces around initializer" warnings.

Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
Acked-by: Peter Hutterer <peter.hutterer@who-t.net>

14 files changed, 510 insertions, 511 deletions

diff --git a/xts5/Xlib12/XDisplayName/Test1.c b/xts5/Xlib12/XDisplayName/Test1.c
index 298ee058..261e8604 100644
--- a/xts5/Xlib12/XDisplayName/Test1.c
+++ b/xts5/Xlib12/XDisplayName/Test1.c
@@ -128,7 +128,7 @@ char	*TestName = "XDisplayName";
 char	*string = "TestString:0.0";
 int     tet_thistest;
 struct tet_testlist tet_testlist[] = {
-	NULL, 0
+	{ NULL, 0 }
 };
 int 	ntests = sizeof(tet_testlist)/sizeof(struct tet_testlist)-1;
 
diff --git a/xts5/Xlib15/XSetWMProperties/Test1.c b/xts5/Xlib15/XSetWMProperties/Test1.c
index 3eb305bf..ed0dae49 100644
--- a/xts5/Xlib15/XSetWMProperties/Test1.c
+++ b/xts5/Xlib15/XSetWMProperties/Test1.c
@@ -127,7 +127,7 @@ extern	Display	*Dsp;
 char	*TestName = "XSetWMProperties";
 int     tet_thistest;
 struct tet_testlist tet_testlist[] = {
-	NULL, 0
+	{ NULL, 0 }
 };
 int 	ntests = sizeof(tet_testlist)/sizeof(struct tet_testlist)-1;
 
diff --git a/xts5/Xlib15/XSetWMProperties/Test2.c b/xts5/Xlib15/XSetWMProperties/Test2.c
index 3aa1f2c1..d52cef36 100644
--- a/xts5/Xlib15/XSetWMProperties/Test2.c
+++ b/xts5/Xlib15/XSetWMProperties/Test2.c
@@ -127,7 +127,7 @@ extern	Display	*Dsp;
 char	*TestName = "XSetWMProperties";
 int     tet_thistest;
 struct tet_testlist tet_testlist[] = {
-	NULL, 0
+	{ NULL, 0 }
 };
 int 	ntests = sizeof(tet_testlist)/sizeof(struct tet_testlist)-1;
 
diff --git a/xts5/Xlib17/XGetDefault/Test3.c b/xts5/Xlib17/XGetDefault/Test3.c
index fba6b2db..27e003d3 100644
--- a/xts5/Xlib17/XGetDefault/Test3.c
+++ b/xts5/Xlib17/XGetDefault/Test3.c
@@ -128,7 +128,7 @@ extern	Display	*Dsp;
 char	*TestName = "XGetDefault";
 int     tet_thistest;
 struct tet_testlist tet_testlist[] = {
-	NULL, 0
+	{ NULL, 0 }
 };
 int 	ntests = sizeof(tet_testlist)/sizeof(struct tet_testlist)-1;
 
diff --git a/xts5/Xlib17/XGetDefault/Test4.c b/xts5/Xlib17/XGetDefault/Test4.c
index 450a6d2b..bac35338 100644
--- a/xts5/Xlib17/XGetDefault/Test4.c
+++ b/xts5/Xlib17/XGetDefault/Test4.c
@@ -128,7 +128,7 @@ extern	Display	*Dsp;
 char	*TestName = "XGetDefault";
 int     tet_thistest;
 struct tet_testlist tet_testlist[] = {
-	NULL, 0
+	{ NULL, 0 }
 };
 int 	ntests = sizeof(tet_testlist)/sizeof(struct tet_testlist)-1;
 
diff --git a/xts5/Xlib17/XGetDefault/Test5.c b/xts5/Xlib17/XGetDefault/Test5.c
index 4da50337..e229a48a 100644
--- a/xts5/Xlib17/XGetDefault/Test5.c
+++ b/xts5/Xlib17/XGetDefault/Test5.c
@@ -131,7 +131,7 @@ extern	Display	*Dsp;
 char	*TestName = "XGetDefault";
 int     tet_thistest;
 struct tet_testlist tet_testlist[] = {
-	NULL, 0
+	{ NULL, 0 }
 };
 int 	ntests = sizeof(tet_testlist)/sizeof(struct tet_testlist)-1;
 
diff --git a/xts5/Xlib3/XDisplayString/Test1.c b/xts5/Xlib3/XDisplayString/Test1.c
index 2d6d5568..7ecc6cba 100644
--- a/xts5/Xlib3/XDisplayString/Test1.c
+++ b/xts5/Xlib3/XDisplayString/Test1.c
@@ -128,7 +128,7 @@ extern	Display	*Dsp;
 char	*TestName = "XDisplayString";
 int     tet_thistest;
 struct tet_testlist tet_testlist[] = {
-	NULL, 0
+	{ NULL, 0 }
 };
 int 	ntests = sizeof(tet_testlist)/sizeof(struct tet_testlist)-1;
 
diff --git a/xts5/Xlib3/XOpenDisplay/Test1.c b/xts5/Xlib3/XOpenDisplay/Test1.c
index 0ea71892..34fc4e07 100644
--- a/xts5/Xlib3/XOpenDisplay/Test1.c
+++ b/xts5/Xlib3/XOpenDisplay/Test1.c
@@ -129,7 +129,7 @@ extern	Display	*Dsp;
 char	*TestName = "XDisplayString";
 int     tet_thistest;
 struct tet_testlist tet_testlist[] = {
-	NULL, 0
+	{ NULL, 0 }
 };
 int 	ntests = sizeof(tet_testlist)/sizeof(struct tet_testlist)-1;
 
diff --git a/xts5/Xlib5/XGetAtomName.m b/xts5/Xlib5/XGetAtomName.m
index 237674f2..160158a6 100644
--- a/xts5/Xlib5/XGetAtomName.m
+++ b/xts5/Xlib5/XGetAtomName.m
@@ -112,10 +112,10 @@ static struct xga_struct {
 	char *name;
 	Atom atom;
 } xga_list[] = {
-	 "PRIMARY", XA_PRIMARY, 
-	 "CUT_BUFFER0", XA_CUT_BUFFER0, 
-	 "RECTANGLE", XA_RECTANGLE,
-	 "COPYRIGHT", XA_COPYRIGHT,
+	{ "PRIMARY", XA_PRIMARY },
+	{ "CUT_BUFFER0", XA_CUT_BUFFER0 },
+	{ "RECTANGLE", XA_RECTANGLE },
+	{ "COPYRIGHT", XA_COPYRIGHT },
 };
 static int xga_nlist = NELEM(xga_list);
 
diff --git a/xts5/Xlib7/XStoreColor.m b/xts5/Xlib7/XStoreColor.m
index ce211902..35109f37 100644
--- a/xts5/Xlib7/XStoreColor.m
+++ b/xts5/Xlib7/XStoreColor.m
@@ -534,21 +534,21 @@ XColor		*refp;
 unsigned long	*reds, *greens, *blues;
 int		pathcnt = 0;
 static XColor triples[] = {
-		(unsigned long)~0L, 0,0,0, DoRed|DoGreen|DoBlue, 0,
-		(unsigned long)~0L, 1,0,0, DoRed|DoGreen|DoBlue, 0,
-		(unsigned long)~0L, 0,1,0, DoRed|DoGreen|DoBlue, 0,
-		(unsigned long)~0L, 0,0,1, DoRed|DoGreen|DoBlue, 0,
-		(unsigned long)~0L, 3,2,1, DoRed|DoGreen|DoBlue, 0,
-		(unsigned long)~0L, 1,3,0, DoRed|DoGreen|DoBlue, 0,
-		(unsigned long)~0L, 7,3,1, DoRed|DoGreen|DoBlue, 0,
-		(unsigned long)~0L, 7,8,5, DoRed|DoGreen|DoBlue, 0,
-		(unsigned long)~0L, 15,11,12, DoRed|DoGreen|DoBlue, 0,
-		(unsigned long)~0L, 42,99,13, DoRed|DoGreen|DoBlue, 0,
-		(unsigned long)~0L, 112,127,64, DoRed|DoGreen|DoBlue, 0,
-		(unsigned long)~0L, 255,64,33, DoRed|DoGreen|DoBlue, 0,
-		(unsigned long)~0L, 64,255,33, DoRed|DoGreen|DoBlue, 0,
-		(unsigned long)~0L, 64,33,255, DoRed|DoGreen|DoBlue, 0,
-		(unsigned long)~0L, 255,255,255, DoRed|DoGreen|DoBlue, 0
+		{ ~0UL, 0,0,0, DoRed|DoGreen|DoBlue, 0 },
+		{ ~0UL, 1,0,0, DoRed|DoGreen|DoBlue, 0 },
+		{ ~0UL, 0,1,0, DoRed|DoGreen|DoBlue, 0 },
+		{ ~0UL, 0,0,1, DoRed|DoGreen|DoBlue, 0 },
+		{ ~0UL, 3,2,1, DoRed|DoGreen|DoBlue, 0 },
+		{ ~0UL, 1,3,0, DoRed|DoGreen|DoBlue, 0 },
+		{ ~0UL, 7,3,1, DoRed|DoGreen|DoBlue, 0 },
+		{ ~0UL, 7,8,5, DoRed|DoGreen|DoBlue, 0 },
+		{ ~0UL, 15,11,12, DoRed|DoGreen|DoBlue, 0 },
+		{ ~0UL, 42,99,13, DoRed|DoGreen|DoBlue, 0 },
+		{ ~0UL, 112,127,64, DoRed|DoGreen|DoBlue, 0 },
+		{ ~0UL, 255,64,33, DoRed|DoGreen|DoBlue, 0 },
+		{ ~0UL, 64,255,33, DoRed|DoGreen|DoBlue, 0 },
+		{ ~0UL, 64,33,255, DoRed|DoGreen|DoBlue, 0 },
+		{ ~0UL, 255,255,255, DoRed|DoGreen|DoBlue, 0 },
 	};
 
 /* If visual class DirectColor is supported: */
diff --git a/xts5/Xlib7/XStoreColors.m b/xts5/Xlib7/XStoreColors.m
index c7420905..729e7a43 100644
--- a/xts5/Xlib7/XStoreColors.m
+++ b/xts5/Xlib7/XStoreColors.m
@@ -714,21 +714,21 @@ XColor		*refp;
 unsigned long	*reds, *greens, *blues;
 int		pathcnt = 0;
 static XColor triples[] = {
-		(unsigned long)~0L, 0,0,0, DoRed|DoGreen|DoBlue, 0,
-		(unsigned long)~0L, 1,0,0, DoRed|DoGreen|DoBlue, 0,
-		(unsigned long)~0L, 0,1,0, DoRed|DoGreen|DoBlue, 0,
-		(unsigned long)~0L, 0,0,1, DoRed|DoGreen|DoBlue, 0,
-		(unsigned long)~0L, 3,2,1, DoRed|DoGreen|DoBlue, 0,
-		(unsigned long)~0L, 1,3,0, DoRed|DoGreen|DoBlue, 0,
-		(unsigned long)~0L, 7,3,1, DoRed|DoGreen|DoBlue, 0,
-		(unsigned long)~0L, 7,8,5, DoRed|DoGreen|DoBlue, 0,
-		(unsigned long)~0L, 15,11,12, DoRed|DoGreen|DoBlue, 0,
-		(unsigned long)~0L, 42,99,13, DoRed|DoGreen|DoBlue, 0,
-		(unsigned long)~0L, 112,127,64, DoRed|DoGreen|DoBlue, 0,
-		(unsigned long)~0L, 255,64,33, DoRed|DoGreen|DoBlue, 0,
-		(unsigned long)~0L, 64,255,33, DoRed|DoGreen|DoBlue, 0,
-		(unsigned long)~0L, 64,33,255, DoRed|DoGreen|DoBlue, 0,
-		(unsigned long)~0L, 255,255,255, DoRed|DoGreen|DoBlue, 0
+		{ ~0UL, 0,0,0, DoRed|DoGreen|DoBlue, 0 },
+		{ ~0UL, 1,0,0, DoRed|DoGreen|DoBlue, 0 },
+		{ ~0UL, 0,1,0, DoRed|DoGreen|DoBlue, 0 },
+		{ ~0UL, 0,0,1, DoRed|DoGreen|DoBlue, 0 },
+		{ ~0UL, 3,2,1, DoRed|DoGreen|DoBlue, 0 },
+		{ ~0UL, 1,3,0, DoRed|DoGreen|DoBlue, 0 },
+		{ ~0UL, 7,3,1, DoRed|DoGreen|DoBlue, 0 },
+		{ ~0UL, 7,8,5, DoRed|DoGreen|DoBlue, 0 },
+		{ ~0UL, 15,11,12, DoRed|DoGreen|DoBlue, 0 },
+		{ ~0UL, 42,99,13, DoRed|DoGreen|DoBlue, 0 },
+		{ ~0UL, 112,127,64, DoRed|DoGreen|DoBlue, 0 },
+		{ ~0UL, 255,64,33, DoRed|DoGreen|DoBlue, 0 },
+		{ ~0UL, 64,255,33, DoRed|DoGreen|DoBlue, 0 },
+		{ ~0UL, 64,33,255, DoRed|DoGreen|DoBlue, 0 },
+		{ ~0UL, 255,255,255, DoRed|DoGreen|DoBlue, 0 },
 	};
 
 /* If visual class DirectColor is supported: */
diff --git a/xts5/src/bin/mc/code.c b/xts5/src/bin/mc/code.c
index f1e66a19..aefcc864 100644
--- a/xts5/src/bin/mc/code.c
+++ b/xts5/src/bin/mc/code.c
@@ -229,11 +229,11 @@ FILE *fout;
 	 */
 	for (i = 1; i <= Testnum; i++) {
 		if (!gbflag)
-			(void) fprintf(FpCode, "\tt%03d, %d,\n", Icnum[i], Icnum[i]);
+			(void) fprintf(FpCode, "\t{ t%03d, %d },\n", Icnum[i], Icnum[i]);
 		else
-			(void) fprintf(FpCode, "\tt%03d, %s,\n", Icnum[i], Ictype[i]);
+			(void) fprintf(FpCode, "\t{ t%03d, %s },\n", Icnum[i], Ictype[i]);
 	}
-	(void) fprintf(FpCode, "\tNULL, 0\n};\n\n");
+	(void) fprintf(FpCode, "\t{ NULL, 0 }\n};\n\n");
 	(void) fprintf(FpCode, "%sint \tntests = sizeof(tet_testlist)/sizeof(struct tet_testlist)-1;\n\n",
 		(lflag)?"static ": "");
 
diff --git a/xts5/src/lib/lookupname.c b/xts5/src/lib/lookupname.c
index 98edc233..3e408870 100644
--- a/xts5/src/lib/lookupname.c
+++ b/xts5/src/lib/lookupname.c
@@ -139,8 +139,8 @@ static char	buf[100];
 static char	*bp;
 
 struct valname S_bool[] = {
-	True, "True",
-	False, "False",
+	{ True, "True" },
+	{ False, "False" },
 };
 int 	NS_bool = NELEM(S_bool);
 
@@ -162,32 +162,32 @@ struct valname *vp;
 }
 
 struct valname S_eventmask[] = {
-	NoEventMask, "NoEventMask",
-	KeyPressMask, "KeyPressMask",
-	KeyReleaseMask, "KeyReleaseMask",
-	ButtonPressMask, "ButtonPressMask",
-	ButtonReleaseMask, "ButtonReleaseMask",
-	EnterWindowMask, "EnterWindowMask",
-	LeaveWindowMask, "LeaveWindowMask",
-	PointerMotionMask, "PointerMotionMask",
-	PointerMotionHintMask, "PointerMotionHintMask",
-	Button1MotionMask, "Button1MotionMask",
-	Button2MotionMask, "Button2MotionMask",
-	Button3MotionMask, "Button3MotionMask",
-	Button4MotionMask, "Button4MotionMask",
-	Button5MotionMask, "Button5MotionMask",
-	ButtonMotionMask, "ButtonMotionMask",
-	KeymapStateMask, "KeymapStateMask",
-	ExposureMask, "ExposureMask",
-	VisibilityChangeMask, "VisibilityChangeMask",
-	StructureNotifyMask, "StructureNotifyMask",
-	ResizeRedirectMask, "ResizeRedirectMask",
-	SubstructureNotifyMask, "SubstructureNotifyMask",
-	SubstructureRedirectMask, "SubstructureRedirectMask",
-	FocusChangeMask, "FocusChangeMask",
-	PropertyChangeMask, "PropertyChangeMask",
-	ColormapChangeMask, "ColormapChangeMask",
-	OwnerGrabButtonMask, "OwnerGrabButtonMask",
+	{ NoEventMask, "NoEventMask" },
+	{ KeyPressMask, "KeyPressMask" },
+	{ KeyReleaseMask, "KeyReleaseMask" },
+	{ ButtonPressMask, "ButtonPressMask" },
+	{ ButtonReleaseMask, "ButtonReleaseMask" },
+	{ EnterWindowMask, "EnterWindowMask" },
+	{ LeaveWindowMask, "LeaveWindowMask" },
+	{ PointerMotionMask, "PointerMotionMask" },
+	{ PointerMotionHintMask, "PointerMotionHintMask" },
+	{ Button1MotionMask, "Button1MotionMask" },
+	{ Button2MotionMask, "Button2MotionMask" },
+	{ Button3MotionMask, "Button3MotionMask" },
+	{ Button4MotionMask, "Button4MotionMask" },
+	{ Button5MotionMask, "Button5MotionMask" },
+	{ ButtonMotionMask, "ButtonMotionMask" },
+	{ KeymapStateMask, "KeymapStateMask" },
+	{ ExposureMask, "ExposureMask" },
+	{ VisibilityChangeMask, "VisibilityChangeMask" },
+	{ StructureNotifyMask, "StructureNotifyMask" },
+	{ ResizeRedirectMask, "ResizeRedirectMask" },
+	{ SubstructureNotifyMask, "SubstructureNotifyMask" },
+	{ SubstructureRedirectMask, "SubstructureRedirectMask" },
+	{ FocusChangeMask, "FocusChangeMask" },
+	{ PropertyChangeMask, "PropertyChangeMask" },
+	{ ColormapChangeMask, "ColormapChangeMask" },
+	{ OwnerGrabButtonMask, "OwnerGrabButtonMask" },
 };
 int 	NS_eventmask = NELEM(S_eventmask);
 
@@ -237,60 +237,60 @@ unsigned long	masks;
 }
 
 struct valname S_event[] = {
-	KeyPress, "KeyPress",
-	KeyRelease, "KeyRelease",
-	ButtonPress, "ButtonPress",
-	ButtonRelease, "ButtonRelease",
-	MotionNotify, "MotionNotify",
-	EnterNotify, "EnterNotify",
-	LeaveNotify, "LeaveNotify",
-	FocusIn, "FocusIn",
-	FocusOut, "FocusOut",
-	KeymapNotify, "KeymapNotify",
-	Expose, "Expose",
-	GraphicsExpose, "GraphicsExpose",
-	NoExpose, "NoExpose",
-	VisibilityNotify, "VisibilityNotify",
-	CreateNotify, "CreateNotify",
-	DestroyNotify, "DestroyNotify",
-	UnmapNotify, "UnmapNotify",
-	MapNotify, "MapNotify",
-	MapRequest, "MapRequest",
-	ReparentNotify, "ReparentNotify",
-	ConfigureNotify, "ConfigureNotify",
-	ConfigureRequest, "ConfigureRequest",
-	GravityNotify, "GravityNotify",
-	ResizeRequest, "ResizeRequest",
-	CirculateNotify, "CirculateNotify",
-	CirculateRequest, "CirculateRequest",
-	PropertyNotify, "PropertyNotify",
-	SelectionClear, "SelectionClear",
-	SelectionRequest, "SelectionRequest",
-	SelectionNotify, "SelectionNotify",
-	ColormapNotify, "ColormapNotify",
-	ClientMessage, "ClientMessage",
-	MappingNotify, "MappingNotify",
-	LASTEvent, "LASTEvent",
+	{ KeyPress, "KeyPress" },
+	{ KeyRelease, "KeyRelease" },
+	{ ButtonPress, "ButtonPress" },
+	{ ButtonRelease, "ButtonRelease" },
+	{ MotionNotify, "MotionNotify" },
+	{ EnterNotify, "EnterNotify" },
+	{ LeaveNotify, "LeaveNotify" },
+	{ FocusIn, "FocusIn" },
+	{ FocusOut, "FocusOut" },
+	{ KeymapNotify, "KeymapNotify" },
+	{ Expose, "Expose" },
+	{ GraphicsExpose, "GraphicsExpose" },
+	{ NoExpose, "NoExpose" },
+	{ VisibilityNotify, "VisibilityNotify" },
+	{ CreateNotify, "CreateNotify" },
+	{ DestroyNotify, "DestroyNotify" },
+	{ UnmapNotify, "UnmapNotify" },
+	{ MapNotify, "MapNotify" },
+	{ MapRequest, "MapRequest" },
+	{ ReparentNotify, "ReparentNotify" },
+	{ ConfigureNotify, "ConfigureNotify" },
+	{ ConfigureRequest, "ConfigureRequest" },
+	{ GravityNotify, "GravityNotify" },
+	{ ResizeRequest, "ResizeRequest" },
+	{ CirculateNotify, "CirculateNotify" },
+	{ CirculateRequest, "CirculateRequest" },
+	{ PropertyNotify, "PropertyNotify" },
+	{ SelectionClear, "SelectionClear" },
+	{ SelectionRequest, "SelectionRequest" },
+	{ SelectionNotify, "SelectionNotify" },
+	{ ColormapNotify, "ColormapNotify" },
+	{ ClientMessage, "ClientMessage" },
+	{ MappingNotify, "MappingNotify" },
+	{ LASTEvent, "LASTEvent" },
 };
 int 	NS_event = NELEM(S_event);
 
 #ifdef INPUTEXTENSION
 struct valname XI_event[] = {
-	XI_DeviceValuator, "DeviceValuator",
-	XI_DeviceKeyPress, "DeviceKeyPress",
-	XI_DeviceKeyRelease, "DeviceKeyRelease",
-	XI_DeviceButtonPress, "DeviceButtonPress",
-	XI_DeviceButtonRelease, "DeviceButtonRelease",
-	XI_DeviceMotionNotify, "DeviceMotionNotify",
-	XI_DeviceFocusIn, "DeviceFocusIn",
-	XI_DeviceFocusOut, "DeviceFocusOut",
-	XI_ProximityIn, "ProximityIn",
-	XI_ProximityOut, "ProximityOut",
-	XI_DeviceStateNotify, "DeviceStateNotify",
-	XI_DeviceMappingNotify, "DeviceMappingNotify",
-	XI_ChangeDeviceNotify, "ChangeDeviceNotify",
-	XI_DeviceKeystateNotify, "DeviceKeyStateNotify",
-	XI_DeviceButtonstateNotify, "DeviceButtonStateNotify",
+	{ XI_DeviceValuator, "DeviceValuator" },
+	{ XI_DeviceKeyPress, "DeviceKeyPress" },
+	{ XI_DeviceKeyRelease, "DeviceKeyRelease" },
+	{ XI_DeviceButtonPress, "DeviceButtonPress" },
+	{ XI_DeviceButtonRelease, "DeviceButtonRelease" },
+	{ XI_DeviceMotionNotify, "DeviceMotionNotify" },
+	{ XI_DeviceFocusIn, "DeviceFocusIn" },
+	{ XI_DeviceFocusOut, "DeviceFocusOut" },
+	{ XI_ProximityIn, "ProximityIn" },
+	{ XI_ProximityOut, "ProximityOut" },
+	{ XI_DeviceStateNotify, "DeviceStateNotify" },
+	{ XI_DeviceMappingNotify, "DeviceMappingNotify" },
+	{ XI_ChangeDeviceNotify, "ChangeDeviceNotify" },
+	{ XI_DeviceKeystateNotify, "DeviceKeyStateNotify" },
+	{ XI_DeviceButtonstateNotify, "DeviceButtonStateNotify" },
 };
 int 	NXI_event = NELEM(XI_event);
 #endif
@@ -319,14 +319,14 @@ struct valname *vp;
 }
 
 struct valname S_keymask[] = {
-	ShiftMask, "ShiftMask",
-	LockMask, "LockMask",
-	ControlMask, "ControlMask",
-	Mod1Mask, "Mod1Mask",
-	Mod2Mask, "Mod2Mask",
-	Mod3Mask, "Mod3Mask",
-	Mod4Mask, "Mod4Mask",
-	Mod5Mask, "Mod5Mask",
+	{ ShiftMask, "ShiftMask" },
+	{ LockMask, "LockMask" },
+	{ ControlMask, "ControlMask" },
+	{ Mod1Mask, "Mod1Mask" },
+	{ Mod2Mask, "Mod2Mask" },
+	{ Mod3Mask, "Mod3Mask" },
+	{ Mod4Mask, "Mod4Mask" },
+	{ Mod5Mask, "Mod5Mask" },
 };
 int 	NS_keymask = NELEM(S_keymask);
 
@@ -376,14 +376,14 @@ unsigned long	masks;
 }
 
 struct valname S_modifier[] = {
-	ShiftMapIndex, "ShiftMapIndex",
-	LockMapIndex, "LockMapIndex",
-	ControlMapIndex, "ControlMapIndex",
-	Mod1MapIndex, "Mod1MapIndex",
-	Mod2MapIndex, "Mod2MapIndex",
-	Mod3MapIndex, "Mod3MapIndex",
-	Mod4MapIndex, "Mod4MapIndex",
-	Mod5MapIndex, "Mod5MapIndex",
+	{ ShiftMapIndex, "ShiftMapIndex" },
+	{ LockMapIndex, "LockMapIndex" },
+	{ ControlMapIndex, "ControlMapIndex" },
+	{ Mod1MapIndex, "Mod1MapIndex" },
+	{ Mod2MapIndex, "Mod2MapIndex" },
+	{ Mod3MapIndex, "Mod3MapIndex" },
+	{ Mod4MapIndex, "Mod4MapIndex" },
+	{ Mod5MapIndex, "Mod5MapIndex" },
 };
 int 	NS_modifier = NELEM(S_modifier);
 
@@ -405,11 +405,11 @@ struct valname *vp;
 }
 
 struct valname S_buttonmask[] = {
-	Button1Mask, "Button1Mask",
-	Button2Mask, "Button2Mask",
-	Button3Mask, "Button3Mask",
-	Button4Mask, "Button4Mask",
-	Button5Mask, "Button5Mask",
+	{ Button1Mask, "Button1Mask" },
+	{ Button2Mask, "Button2Mask" },
+	{ Button3Mask, "Button3Mask" },
+	{ Button4Mask, "Button4Mask" },
+	{ Button5Mask, "Button5Mask" },
 };
 int 	NS_buttonmask = NELEM(S_buttonmask);
 
@@ -459,11 +459,11 @@ unsigned long	masks;
 }
 
 struct valname S_button[] = {
-	Button1, "Button1",
-	Button2, "Button2",
-	Button3, "Button3",
-	Button4, "Button4",
-	Button5, "Button5",
+	{ Button1, "Button1" },
+	{ Button2, "Button2" },
+	{ Button3, "Button3" },
+	{ Button4, "Button4" },
+	{ Button5, "Button5" },
 };
 int 	NS_button = NELEM(S_button);
 
@@ -485,10 +485,10 @@ struct valname *vp;
 }
 
 struct valname S_notifymode[] = {
-	NotifyNormal, "NotifyNormal",
-	NotifyGrab, "NotifyGrab",
-	NotifyUngrab, "NotifyUngrab",
-	NotifyWhileGrabbed, "NotifyWhileGrabbed",
+	{ NotifyNormal, "NotifyNormal" },
+	{ NotifyGrab, "NotifyGrab" },
+	{ NotifyUngrab, "NotifyUngrab" },
+	{ NotifyWhileGrabbed, "NotifyWhileGrabbed" },
 };
 int 	NS_notifymode = NELEM(S_notifymode);
 
@@ -510,13 +510,13 @@ struct valname *vp;
 }
 
 struct valname S_notifydetail[] = {
-	NotifyAncestor, "NotifyAncestor",
-	NotifyVirtual, "NotifyVirtual",
-	NotifyInferior, "NotifyInferior",
-	NotifyNonlinear, "NotifyNonlinear",
-	NotifyNonlinearVirtual, "NotifyNonlinearVirtual",
-	NotifyPointer, "NotifyPointer",
-	NotifyPointerRoot, "NotifyPointerRoot",
+	{ NotifyAncestor, "NotifyAncestor" },
+	{ NotifyVirtual, "NotifyVirtual" },
+	{ NotifyInferior, "NotifyInferior" },
+	{ NotifyNonlinear, "NotifyNonlinear" },
+	{ NotifyNonlinearVirtual, "NotifyNonlinearVirtual" },
+	{ NotifyPointer, "NotifyPointer" },
+	{ NotifyPointerRoot, "NotifyPointerRoot" },
 };
 int 	NS_notifydetail = NELEM(S_notifydetail);
 
@@ -538,9 +538,9 @@ struct valname *vp;
 }
 
 struct valname S_visibility[] = {
-	VisibilityUnobscured, "VisibilityUnobscured",
-	VisibilityPartiallyObscured, "VisibilityPartiallyObscured",
-	VisibilityFullyObscured, "VisibilityFullyObscured",
+	{ VisibilityUnobscured, "VisibilityUnobscured" },
+	{ VisibilityPartiallyObscured, "VisibilityPartiallyObscured" },
+	{ VisibilityFullyObscured, "VisibilityFullyObscured" },
 };
 int 	NS_visibility = NELEM(S_visibility);
 
@@ -562,11 +562,11 @@ struct valname *vp;
 }
 
 struct valname S_grabreply[] = {
-	GrabSuccess, "GrabSuccess",
-	AlreadyGrabbed, "AlreadyGrabbed",
-	GrabInvalidTime, "GrabInvalidTime",
-	GrabNotViewable, "GrabNotViewable",
-	GrabFrozen, "GrabFrozen",
+	{ GrabSuccess, "GrabSuccess" },
+	{ AlreadyGrabbed, "AlreadyGrabbed" },
+	{ GrabInvalidTime, "GrabInvalidTime" },
+	{ GrabNotViewable, "GrabNotViewable" },
+	{ GrabFrozen, "GrabFrozen" },
 };
 int 	NS_grabreply = NELEM(S_grabreply);
 
@@ -588,14 +588,14 @@ struct valname *vp;
 }
 
 struct valname S_alloweventmode[] = {
-	AsyncPointer, "AsyncPointer",
-	SyncPointer, "SyncPointer",
-	ReplayPointer, "ReplayPointer",
-	AsyncKeyboard, "AsyncKeyboard",
-	SyncKeyboard, "SyncKeyboard",
-	ReplayKeyboard, "ReplayKeyboard",
-	AsyncBoth, "AsyncBoth",
-	SyncBoth, "SyncBoth",
+	{ AsyncPointer, "AsyncPointer" },
+	{ SyncPointer, "SyncPointer" },
+	{ ReplayPointer, "ReplayPointer" },
+	{ AsyncKeyboard, "AsyncKeyboard" },
+	{ SyncKeyboard, "SyncKeyboard" },
+	{ ReplayKeyboard, "ReplayKeyboard" },
+	{ AsyncBoth, "AsyncBoth" },
+	{ SyncBoth, "SyncBoth" },
 };
 int 	NS_alloweventmode = NELEM(S_alloweventmode);
 
@@ -617,9 +617,9 @@ struct valname *vp;
 }
 
 struct valname S_revertto[] = {
-	RevertToNone, "RevertToNone",
-	RevertToPointerRoot, "RevertToPointerRoot",
-	RevertToParent, "RevertToParent",
+	{ RevertToNone, "RevertToNone" },
+	{ RevertToPointerRoot, "RevertToPointerRoot" },
+	{ RevertToParent, "RevertToParent" },
 };
 int 	NS_revertto = NELEM(S_revertto);
 
@@ -641,34 +641,34 @@ struct valname *vp;
 }
 
 struct valname S_error[] = {
-	Success, "Success",
-	BadRequest, "BadRequest",
-	BadValue, "BadValue",
-	BadWindow, "BadWindow",
-	BadPixmap, "BadPixmap",
-	BadAtom, "BadAtom",
-	BadCursor, "BadCursor",
-	BadFont, "BadFont",
-	BadMatch, "BadMatch",
-	BadDrawable, "BadDrawable",
-	BadAccess, "BadAccess",
-	BadAlloc, "BadAlloc",
-	BadColor, "BadColor",
-	BadGC, "BadGC",
-	BadIDChoice, "BadIDChoice",
-	BadName, "BadName",
-	BadLength, "BadLength",
-	BadImplementation, "BadImplementation",
+	{ Success, "Success" },
+	{ BadRequest, "BadRequest" },
+	{ BadValue, "BadValue" },
+	{ BadWindow, "BadWindow" },
+	{ BadPixmap, "BadPixmap" },
+	{ BadAtom, "BadAtom" },
+	{ BadCursor, "BadCursor" },
+	{ BadFont, "BadFont" },
+	{ BadMatch, "BadMatch" },
+	{ BadDrawable, "BadDrawable" },
+	{ BadAccess, "BadAccess" },
+	{ BadAlloc, "BadAlloc" },
+	{ BadColor, "BadColor" },
+	{ BadGC, "BadGC" },
+	{ BadIDChoice, "BadIDChoice" },
+	{ BadName, "BadName" },
+	{ BadLength, "BadLength" },
+	{ BadImplementation, "BadImplementation" },
 };
 int 	NS_error = NELEM(S_error);
 
 #ifdef INPUTEXTENSION
 struct valname S_XIerror[] = {
-	0, "BadDevice",
-	1, "BadEvent",
-	2, "BadMode",
-	3, "DeviceBusy",
-	4, "BadClass",
+	{ 0, "BadDevice" },
+	{ 1, "BadEvent" },
+	{ 2, "BadMode" },
+	{ 3, "DeviceBusy" },
+	{ 4, "BadClass" },
 };
 int 	NS_XIerror = NELEM(S_XIerror);
 #endif
@@ -700,8 +700,8 @@ struct valname *vp;
 }
 
 struct valname S_class[] = {
-	InputOutput, "InputOutput",
-	InputOnly, "InputOnly",
+	{ InputOutput, "InputOutput" },
+	{ InputOnly, "InputOnly" },
 };
 int 	NS_class = NELEM(S_class);
 
@@ -723,17 +723,17 @@ struct valname *vp;
 }
 
 struct valname S_bitgravity[] = {
-	ForgetGravity, "ForgetGravity",
-	NorthWestGravity, "NorthWestGravity",
-	NorthGravity, "NorthGravity",
-	NorthEastGravity, "NorthEastGravity",
-	WestGravity, "WestGravity",
-	CenterGravity, "CenterGravity",
-	EastGravity, "EastGravity",
-	SouthWestGravity, "SouthWestGravity",
-	SouthGravity, "SouthGravity",
-	SouthEastGravity, "SouthEastGravity",
-	StaticGravity, "StaticGravity",
+	{ ForgetGravity, "ForgetGravity" },
+	{ NorthWestGravity, "NorthWestGravity" },
+	{ NorthGravity, "NorthGravity" },
+	{ NorthEastGravity, "NorthEastGravity" },
+	{ WestGravity, "WestGravity" },
+	{ CenterGravity, "CenterGravity" },
+	{ EastGravity, "EastGravity" },
+	{ SouthWestGravity, "SouthWestGravity" },
+	{ SouthGravity, "SouthGravity" },
+	{ SouthEastGravity, "SouthEastGravity" },
+	{ StaticGravity, "StaticGravity" },
 };
 int 	NS_bitgravity = NELEM(S_bitgravity);
 
@@ -755,17 +755,17 @@ struct valname *vp;
 }
 
 struct valname S_wingravity[] = {
-	UnmapGravity, "UnmapGravity",
-	NorthWestGravity, "NorthWestGravity",
-	NorthGravity, "NorthGravity",
-	NorthEastGravity, "NorthEastGravity",
-	WestGravity, "WestGravity",
-	CenterGravity, "CenterGravity",
-	EastGravity, "EastGravity",
-	SouthWestGravity, "SouthWestGravity",
-	SouthGravity, "SouthGravity",
-	SouthEastGravity, "SouthEastGravity",
-	StaticGravity, "StaticGravity",
+	{ UnmapGravity, "UnmapGravity" },
+	{ NorthWestGravity, "NorthWestGravity" },
+	{ NorthGravity, "NorthGravity" },
+	{ NorthEastGravity, "NorthEastGravity" },
+	{ WestGravity, "WestGravity" },
+	{ CenterGravity, "CenterGravity" },
+	{ EastGravity, "EastGravity" },
+	{ SouthWestGravity, "SouthWestGravity" },
+	{ SouthGravity, "SouthGravity" },
+	{ SouthEastGravity, "SouthEastGravity" },
+	{ StaticGravity, "StaticGravity" },
 };
 int 	NS_wingravity = NELEM(S_wingravity);
 
@@ -787,9 +787,9 @@ struct valname *vp;
 }
 
 struct valname S_backingstore[] = {
-	NotUseful, "NotUseful",
-	WhenMapped, "WhenMapped",
-	Always, "Always",
+	{ NotUseful, "NotUseful" },
+	{ WhenMapped, "WhenMapped" },
+	{ Always, "Always" },
 };
 int 	NS_backingstore = NELEM(S_backingstore);
 
@@ -811,22 +811,22 @@ struct valname *vp;
 }
 
 struct valname S_gcfunction[] = {
-	GXclear, "GXclear",
-	GXand, "GXand",
-	GXandReverse, "GXandReverse",
-	GXcopy, "GXcopy",
-	GXandInverted, "GXandInverted",
-	GXnoop, "GXnoop",
-	GXxor, "GXxor",
-	GXor, "GXor",
-	GXnor, "GXnor",
-	GXequiv, "GXequiv",
-	GXinvert, "GXinvert",
-	GXorReverse, "GXorReverse",
-	GXcopyInverted, "GXcopyInverted",
-	GXorInverted, "GXorInverted",
-	GXnand, "GXnand",
-	GXset, "GXset",
+	{ GXclear, "GXclear" },
+	{ GXand, "GXand" },
+	{ GXandReverse, "GXandReverse" },
+	{ GXcopy, "GXcopy" },
+	{ GXandInverted, "GXandInverted" },
+	{ GXnoop, "GXnoop" },
+	{ GXxor, "GXxor" },
+	{ GXor, "GXor" },
+	{ GXnor, "GXnor" },
+	{ GXequiv, "GXequiv" },
+	{ GXinvert, "GXinvert" },
+	{ GXorReverse, "GXorReverse" },
+	{ GXcopyInverted, "GXcopyInverted" },
+	{ GXorInverted, "GXorInverted" },
+	{ GXnand, "GXnand" },
+	{ GXset, "GXset" },
 };
 int 	NS_gcfunction = NELEM(S_gcfunction);
 
@@ -848,9 +848,9 @@ struct valname *vp;
 }
 
 struct valname S_linestyle[] = {
-	LineSolid, "LineSolid",
-	LineOnOffDash, "LineOnOffDash",
-	LineDoubleDash, "LineDoubleDash",
+	{ LineSolid, "LineSolid" },
+	{ LineOnOffDash, "LineOnOffDash" },
+	{ LineDoubleDash, "LineDoubleDash" },
 };
 int 	NS_linestyle = NELEM(S_linestyle);
 
@@ -872,10 +872,10 @@ struct valname *vp;
 }
 
 struct valname S_capstyle[] = {
-	CapNotLast, "CapNotLast",
-	CapButt, "CapButt",
-	CapRound, "CapRound",
-	CapProjecting, "CapProjecting",
+	{ CapNotLast, "CapNotLast" },
+	{ CapButt, "CapButt" },
+	{ CapRound, "CapRound" },
+	{ CapProjecting, "CapProjecting" },
 };
 int 	NS_capstyle = NELEM(S_capstyle);
 
@@ -897,9 +897,9 @@ struct valname *vp;
 }
 
 struct valname S_joinstyle[] = {
-	JoinMiter, "JoinMiter",
-	JoinRound, "JoinRound",
-	JoinBevel, "JoinBevel",
+	{ JoinMiter, "JoinMiter" },
+	{ JoinRound, "JoinRound" },
+	{ JoinBevel, "JoinBevel" },
 };
 int 	NS_joinstyle = NELEM(S_joinstyle);
 
@@ -921,10 +921,10 @@ struct valname *vp;
 }
 
 struct valname S_fillstyle[] = {
-	FillSolid, "FillSolid",
-	FillTiled, "FillTiled",
-	FillStippled, "FillStippled",
-	FillOpaqueStippled, "FillOpaqueStippled",
+	{ FillSolid, "FillSolid" },
+	{ FillTiled, "FillTiled" },
+	{ FillStippled, "FillStippled" },
+	{ FillOpaqueStippled, "FillOpaqueStippled" },
 };
 int 	NS_fillstyle = NELEM(S_fillstyle);
 
@@ -946,12 +946,12 @@ struct valname *vp;
 }
 
 struct valname S_displayclass[] = {
-	StaticGray, "StaticGray",
-	GrayScale, "GrayScale",
-	StaticColor, "StaticColor",
-	PseudoColor, "PseudoColor",
-	TrueColor, "TrueColor",
-	DirectColor, "DirectColor",
+	{ StaticGray, "StaticGray" },
+	{ GrayScale, "GrayScale" },
+	{ StaticColor, "StaticColor" },
+	{ PseudoColor, "PseudoColor" },
+	{ TrueColor, "TrueColor" },
+	{ DirectColor, "DirectColor" },
 };
 int 	NS_displayclass = NELEM(S_displayclass);
 
@@ -973,166 +973,166 @@ struct valname *vp;
 }
 
 struct valname S_proto[] = {
-	X_CreateWindow, "X_CreateWindow",
-	X_ChangeWindowAttributes, "X_ChangeWindowAttributes",
-	X_GetWindowAttributes, "X_GetWindowAttributes",
-	X_DestroyWindow, "X_DestroyWindow",
-	X_DestroySubwindows, "X_DestroySubwindows",
-	X_ChangeSaveSet, "X_ChangeSaveSet",
-	X_ReparentWindow, "X_ReparentWindow",
-	X_MapWindow, "X_MapWindow",
-	X_MapSubwindows, "X_MapSubwindows",
-	X_UnmapWindow, "X_UnmapWindow",
-	X_UnmapSubwindows, "X_UnmapSubwindows",
-	X_ConfigureWindow, "X_ConfigureWindow",
-	X_CirculateWindow, "X_CirculateWindow",
-	X_GetGeometry, "X_GetGeometry",
-	X_QueryTree, "X_QueryTree",
-	X_InternAtom, "X_InternAtom",
-	X_GetAtomName, "X_GetAtomName",
-	X_ChangeProperty, "X_ChangeProperty",
-	X_DeleteProperty, "X_DeleteProperty",
-	X_GetProperty, "X_GetProperty",
-	X_ListProperties, "X_ListProperties",
-	X_SetSelectionOwner, "X_SetSelectionOwner",
-	X_GetSelectionOwner, "X_GetSelectionOwner",
-	X_ConvertSelection, "X_ConvertSelection",
-	X_SendEvent, "X_SendEvent",
-	X_GrabPointer, "X_GrabPointer",
-	X_UngrabPointer, "X_UngrabPointer",
-	X_GrabButton, "X_GrabButton",
-	X_UngrabButton, "X_UngrabButton",
-	X_ChangeActivePointerGrab, "X_ChangeActivePointerGrab",
-	X_GrabKeyboard, "X_GrabKeyboard",
-	X_UngrabKeyboard, "X_UngrabKeyboard",
-	X_GrabKey, "X_GrabKey",
-	X_UngrabKey, "X_UngrabKey",
-	X_AllowEvents, "X_AllowEvents",
-	X_GrabServer, "X_GrabServer",
-	X_UngrabServer, "X_UngrabServer",
-	X_QueryPointer, "X_QueryPointer",
-	X_GetMotionEvents, "X_GetMotionEvents",
-	X_TranslateCoords, "X_TranslateCoords",
-	X_WarpPointer, "X_WarpPointer",
-	X_SetInputFocus, "X_SetInputFocus",
-	X_GetInputFocus, "X_GetInputFocus",
-	X_QueryKeymap, "X_QueryKeymap",
-	X_OpenFont, "X_OpenFont",
-	X_CloseFont, "X_CloseFont",
-	X_QueryFont, "X_QueryFont",
-	X_QueryTextExtents, "X_QueryTextExtents",
-	X_ListFonts, "X_ListFonts",
-	X_ListFontsWithInfo, "X_ListFontsWithInfo",
-	X_SetFontPath, "X_SetFontPath",
-	X_GetFontPath, "X_GetFontPath",
-	X_CreatePixmap, "X_CreatePixmap",
-	X_FreePixmap, "X_FreePixmap",
-	X_CreateGC, "X_CreateGC",
-	X_ChangeGC, "X_ChangeGC",
-	X_CopyGC, "X_CopyGC",
-	X_SetDashes, "X_SetDashes",
-	X_SetClipRectangles, "X_SetClipRectangles",
-	X_FreeGC, "X_FreeGC",
-	X_ClearArea, "X_ClearArea",
-	X_CopyArea, "X_CopyArea",
-	X_CopyPlane, "X_CopyPlane",
-	X_PolyPoint, "X_PolyPoint",
-	X_PolyLine, "X_PolyLine",
-	X_PolySegment, "X_PolySegment",
-	X_PolyRectangle, "X_PolyRectangle",
-	X_PolyArc, "X_PolyArc",
-	X_FillPoly, "X_FillPoly",
-	X_PolyFillRectangle, "X_PolyFillRectangle",
-	X_PolyFillArc, "X_PolyFillArc",
-	X_PutImage, "X_PutImage",
-	X_GetImage, "X_GetImage",
-	X_PolyText8, "X_PolyText8",
-	X_PolyText16, "X_PolyText16",
-	X_ImageText8, "X_ImageText8",
-	X_ImageText16, "X_ImageText16",
-	X_CreateColormap, "X_CreateColormap",
-	X_FreeColormap, "X_FreeColormap",
-	X_CopyColormapAndFree, "X_CopyColormapAndFree",
-	X_InstallColormap, "X_InstallColormap",
-	X_UninstallColormap, "X_UninstallColormap",
-	X_ListInstalledColormaps, "X_ListInstalledColormaps",
-	X_AllocColor, "X_AllocColor",
-	X_AllocNamedColor, "X_AllocNamedColor",
-	X_AllocColorCells, "X_AllocColorCells",
-	X_AllocColorPlanes, "X_AllocColorPlanes",
-	X_FreeColors, "X_FreeColors",
-	X_StoreColors, "X_StoreColors",
-	X_StoreNamedColor, "X_StoreNamedColor",
-	X_QueryColors, "X_QueryColors",
-	X_LookupColor, "X_LookupColor",
-	X_CreateCursor, "X_CreateCursor",
-	X_CreateGlyphCursor, "X_CreateGlyphCursor",
-	X_FreeCursor, "X_FreeCursor",
-	X_RecolorCursor, "X_RecolorCursor",
-	X_QueryBestSize, "X_QueryBestSize",
-	X_QueryExtension, "X_QueryExtension",
-	X_ListExtensions, "X_ListExtensions",
-	X_ChangeKeyboardMapping, "X_ChangeKeyboardMapping",
-	X_GetKeyboardMapping, "X_GetKeyboardMapping",
-	X_ChangeKeyboardControl, "X_ChangeKeyboardControl",
-	X_GetKeyboardControl, "X_GetKeyboardControl",
-	X_Bell, "X_Bell",
-	X_ChangePointerControl, "X_ChangePointerControl",
-	X_GetPointerControl, "X_GetPointerControl",
-	X_SetScreenSaver, "X_SetScreenSaver",
-	X_GetScreenSaver, "X_GetScreenSaver",
-	X_ChangeHosts, "X_ChangeHosts",
-	X_ListHosts, "X_ListHosts",
-	X_SetAccessControl, "X_SetAccessControl",
-	X_SetCloseDownMode, "X_SetCloseDownMode",
-	X_KillClient, "X_KillClient",
-	X_RotateProperties, "X_RotateProperties",
-	X_ForceScreenSaver, "X_ForceScreenSaver",
-	X_SetPointerMapping, "X_SetPointerMapping",
-	X_GetPointerMapping, "X_GetPointerMapping",
-	X_SetModifierMapping, "X_SetModifierMapping",
-	X_GetModifierMapping, "X_GetModifierMapping",
-	X_NoOperation, "X_NoOperation",
+	{ X_CreateWindow, "X_CreateWindow" },
+	{ X_ChangeWindowAttributes, "X_ChangeWindowAttributes" },
+	{ X_GetWindowAttributes, "X_GetWindowAttributes" },
+	{ X_DestroyWindow, "X_DestroyWindow" },
+	{ X_DestroySubwindows, "X_DestroySubwindows" },
+	{ X_ChangeSaveSet, "X_ChangeSaveSet" },
+	{ X_ReparentWindow, "X_ReparentWindow" },
+	{ X_MapWindow, "X_MapWindow" },
+	{ X_MapSubwindows, "X_MapSubwindows" },
+	{ X_UnmapWindow, "X_UnmapWindow" },
+	{ X_UnmapSubwindows, "X_UnmapSubwindows" },
+	{ X_ConfigureWindow, "X_ConfigureWindow" },
+	{ X_CirculateWindow, "X_CirculateWindow" },
+	{ X_GetGeometry, "X_GetGeometry" },
+	{ X_QueryTree, "X_QueryTree" },
+	{ X_InternAtom, "X_InternAtom" },
+	{ X_GetAtomName, "X_GetAtomName" },
+	{ X_ChangeProperty, "X_ChangeProperty" },
+	{ X_DeleteProperty, "X_DeleteProperty" },
+	{ X_GetProperty, "X_GetProperty" },
+	{ X_ListProperties, "X_ListProperties" },
+	{ X_SetSelectionOwner, "X_SetSelectionOwner" },
+	{ X_GetSelectionOwner, "X_GetSelectionOwner" },
+	{ X_ConvertSelection, "X_ConvertSelection" },
+	{ X_SendEvent, "X_SendEvent" },
+	{ X_GrabPointer, "X_GrabPointer" },
+	{ X_UngrabPointer, "X_UngrabPointer" },
+	{ X_GrabButton, "X_GrabButton" },
+	{ X_UngrabButton, "X_UngrabButton" },
+	{ X_ChangeActivePointerGrab, "X_ChangeActivePointerGrab" },
+	{ X_GrabKeyboard, "X_GrabKeyboard" },
+	{ X_UngrabKeyboard, "X_UngrabKeyboard" },
+	{ X_GrabKey, "X_GrabKey" },
+	{ X_UngrabKey, "X_UngrabKey" },
+	{ X_AllowEvents, "X_AllowEvents" },
+	{ X_GrabServer, "X_GrabServer" },
+	{ X_UngrabServer, "X_UngrabServer" },
+	{ X_QueryPointer, "X_QueryPointer" },
+	{ X_GetMotionEvents, "X_GetMotionEvents" },
+	{ X_TranslateCoords, "X_TranslateCoords" },
+	{ X_WarpPointer, "X_WarpPointer" },
+	{ X_SetInputFocus, "X_SetInputFocus" },
+	{ X_GetInputFocus, "X_GetInputFocus" },
+	{ X_QueryKeymap, "X_QueryKeymap" },
+	{ X_OpenFont, "X_OpenFont" },
+	{ X_CloseFont, "X_CloseFont" },
+	{ X_QueryFont, "X_QueryFont" },
+	{ X_QueryTextExtents, "X_QueryTextExtents" },
+	{ X_ListFonts, "X_ListFonts" },
+	{ X_ListFontsWithInfo, "X_ListFontsWithInfo" },
+	{ X_SetFontPath, "X_SetFontPath" },
+	{ X_GetFontPath, "X_GetFontPath" },
+	{ X_CreatePixmap, "X_CreatePixmap" },
+	{ X_FreePixmap, "X_FreePixmap" },
+	{ X_CreateGC, "X_CreateGC" },
+	{ X_ChangeGC, "X_ChangeGC" },
+	{ X_CopyGC, "X_CopyGC" },
+	{ X_SetDashes, "X_SetDashes" },
+	{ X_SetClipRectangles, "X_SetClipRectangles" },
+	{ X_FreeGC, "X_FreeGC" },
+	{ X_ClearArea, "X_ClearArea" },
+	{ X_CopyArea, "X_CopyArea" },
+	{ X_CopyPlane, "X_CopyPlane" },
+	{ X_PolyPoint, "X_PolyPoint" },
+	{ X_PolyLine, "X_PolyLine" },
+	{ X_PolySegment, "X_PolySegment" },
+	{ X_PolyRectangle, "X_PolyRectangle" },
+	{ X_PolyArc, "X_PolyArc" },
+	{ X_FillPoly, "X_FillPoly" },
+	{ X_PolyFillRectangle, "X_PolyFillRectangle" },
+	{ X_PolyFillArc, "X_PolyFillArc" },
+	{ X_PutImage, "X_PutImage" },
+	{ X_GetImage, "X_GetImage" },
+	{ X_PolyText8, "X_PolyText8" },
+	{ X_PolyText16, "X_PolyText16" },
+	{ X_ImageText8, "X_ImageText8" },
+	{ X_ImageText16, "X_ImageText16" },
+	{ X_CreateColormap, "X_CreateColormap" },
+	{ X_FreeColormap, "X_FreeColormap" },
+	{ X_CopyColormapAndFree, "X_CopyColormapAndFree" },
+	{ X_InstallColormap, "X_InstallColormap" },
+	{ X_UninstallColormap, "X_UninstallColormap" },
+	{ X_ListInstalledColormaps, "X_ListInstalledColormaps" },
+	{ X_AllocColor, "X_AllocColor" },
+	{ X_AllocNamedColor, "X_AllocNamedColor" },
+	{ X_AllocColorCells, "X_AllocColorCells" },
+	{ X_AllocColorPlanes, "X_AllocColorPlanes" },
+	{ X_FreeColors, "X_FreeColors" },
+	{ X_StoreColors, "X_StoreColors" },
+	{ X_StoreNamedColor, "X_StoreNamedColor" },
+	{ X_QueryColors, "X_QueryColors" },
+	{ X_LookupColor, "X_LookupColor" },
+	{ X_CreateCursor, "X_CreateCursor" },
+	{ X_CreateGlyphCursor, "X_CreateGlyphCursor" },
+	{ X_FreeCursor, "X_FreeCursor" },
+	{ X_RecolorCursor, "X_RecolorCursor" },
+	{ X_QueryBestSize, "X_QueryBestSize" },
+	{ X_QueryExtension, "X_QueryExtension" },
+	{ X_ListExtensions, "X_ListExtensions" },
+	{ X_ChangeKeyboardMapping, "X_ChangeKeyboardMapping" },
+	{ X_GetKeyboardMapping, "X_GetKeyboardMapping" },
+	{ X_ChangeKeyboardControl, "X_ChangeKeyboardControl" },
+	{ X_GetKeyboardControl, "X_GetKeyboardControl" },
+	{ X_Bell, "X_Bell" },
+	{ X_ChangePointerControl, "X_ChangePointerControl" },
+	{ X_GetPointerControl, "X_GetPointerControl" },
+	{ X_SetScreenSaver, "X_SetScreenSaver" },
+	{ X_GetScreenSaver, "X_GetScreenSaver" },
+	{ X_ChangeHosts, "X_ChangeHosts" },
+	{ X_ListHosts, "X_ListHosts" },
+	{ X_SetAccessControl, "X_SetAccessControl" },
+	{ X_SetCloseDownMode, "X_SetCloseDownMode" },
+	{ X_KillClient, "X_KillClient" },
+	{ X_RotateProperties, "X_RotateProperties" },
+	{ X_ForceScreenSaver, "X_ForceScreenSaver" },
+	{ X_SetPointerMapping, "X_SetPointerMapping" },
+	{ X_GetPointerMapping, "X_GetPointerMapping" },
+	{ X_SetModifierMapping, "X_SetModifierMapping" },
+	{ X_GetModifierMapping, "X_GetModifierMapping" },
+	{ X_NoOperation, "X_NoOperation" },
 };
 int 	NS_proto = NELEM(S_proto);
 
 #ifdef INPUTEXTENSION
 struct valname XI_proto[] = {
-	X_GetExtensionVersion, "X_GetExtensionVersion",
-	X_ListInputDevices, "X_ListInputDevices",
-	X_OpenDevice, "X_OpenDevice",
-	X_CloseDevice, "X_CloseDevice",
-	X_SetDeviceMode, "X_SetDeviceMode",
-	X_SelectExtensionEvent, "X_SelectExtensionEvent",
-	X_GetSelectedExtensionEvents, "X_GetSelectedExtensionEvents",
-	X_ChangeDeviceDontPropagateList, "X_ChangeDeviceDontPropagateList",
-	X_GetDeviceDontPropagateList, "X_GetDeviceDontPropagateList",
-	X_GetDeviceMotionEvents, "X_GetDeviceMotionEvents ",
-	X_ChangeKeyboardDevice, "X_ChangeKeyboardDevice",
-	X_ChangePointerDevice, "X_ChangePointerDevice",
-	X_GrabDevice, "X_GrabDevice",
-	X_UngrabDevice, "X_UngrabDevice",
-	X_GrabDeviceKey, "X_GrabDeviceKey",
-	X_UngrabDeviceKey, "X_UngrabDeviceKey",
-	X_GrabDeviceButton, "X_GrabDeviceButton",
-	X_UngrabDeviceButton, "X_UngrabDeviceButton",
-	X_AllowDeviceEvents, "X_AllowDeviceEvents",
-	X_GetDeviceFocus, "X_GetDeviceFocus",
-	X_SetDeviceFocus, "X_SetDeviceFocus",
-	X_GetFeedbackControl, "X_GetFeedbackControl",
-	X_ChangeFeedbackControl, "X_ChangeFeedbackControl",
-	X_GetDeviceKeyMapping, "X_GetDeviceKeyMapping",
-	X_ChangeDeviceKeyMapping, "X_ChangeDeviceKeyMapping",
-	X_GetDeviceModifierMapping, "X_GetDeviceModifierMapping",
-	X_SetDeviceModifierMapping, "X_SetDeviceModifierMapping",
-	X_GetDeviceButtonMapping, "X_GetDeviceButtonMapping",
-	X_SetDeviceButtonMapping, "X_SetDeviceButtonMapping",
-	X_QueryDeviceState, "X_QueryDeviceState",
-	X_SendExtensionEvent, "X_SendExtensionEvent",
-	X_DeviceBell, "X_DeviceBell",
-	X_SetDeviceValuators, "X_SetDeviceValuators",
-	X_GetDeviceControl, "X_GetDeviceControl",
-	X_ChangeDeviceControl, "X_ChangeDeviceControl",
+	{ X_GetExtensionVersion, "X_GetExtensionVersion" },
+	{ X_ListInputDevices, "X_ListInputDevices" },
+	{ X_OpenDevice, "X_OpenDevice" },
+	{ X_CloseDevice, "X_CloseDevice" },
+	{ X_SetDeviceMode, "X_SetDeviceMode" },
+	{ X_SelectExtensionEvent, "X_SelectExtensionEvent" },
+	{ X_GetSelectedExtensionEvents, "X_GetSelectedExtensionEvents" },
+	{ X_ChangeDeviceDontPropagateList, "X_ChangeDeviceDontPropagateList" },
+	{ X_GetDeviceDontPropagateList, "X_GetDeviceDontPropagateList" },
+	{ X_GetDeviceMotionEvents, "X_GetDeviceMotionEvents " },
+	{ X_ChangeKeyboardDevice, "X_ChangeKeyboardDevice" },
+	{ X_ChangePointerDevice, "X_ChangePointerDevice" },
+	{ X_GrabDevice, "X_GrabDevice" },
+	{ X_UngrabDevice, "X_UngrabDevice" },
+	{ X_GrabDeviceKey, "X_GrabDeviceKey" },
+	{ X_UngrabDeviceKey, "X_UngrabDeviceKey" },
+	{ X_GrabDeviceButton, "X_GrabDeviceButton" },
+	{ X_UngrabDeviceButton, "X_UngrabDeviceButton" },
+	{ X_AllowDeviceEvents, "X_AllowDeviceEvents" },
+	{ X_GetDeviceFocus, "X_GetDeviceFocus" },
+	{ X_SetDeviceFocus, "X_SetDeviceFocus" },
+	{ X_GetFeedbackControl, "X_GetFeedbackControl" },
+	{ X_ChangeFeedbackControl, "X_ChangeFeedbackControl" },
+	{ X_GetDeviceKeyMapping, "X_GetDeviceKeyMapping" },
+	{ X_ChangeDeviceKeyMapping, "X_ChangeDeviceKeyMapping" },
+	{ X_GetDeviceModifierMapping, "X_GetDeviceModifierMapping" },
+	{ X_SetDeviceModifierMapping, "X_SetDeviceModifierMapping" },
+	{ X_GetDeviceButtonMapping, "X_GetDeviceButtonMapping" },
+	{ X_SetDeviceButtonMapping, "X_SetDeviceButtonMapping" },
+	{ X_QueryDeviceState, "X_QueryDeviceState" },
+	{ X_SendExtensionEvent, "X_SendExtensionEvent" },
+	{ X_DeviceBell, "X_DeviceBell" },
+	{ X_SetDeviceValuators, "X_SetDeviceValuators" },
+	{ X_GetDeviceControl, "X_GetDeviceControl" },
+	{ X_ChangeDeviceControl, "X_ChangeDeviceControl" },
 };
 int 	NXI_proto = NELEM(XI_proto);
 #endif
@@ -1163,74 +1163,74 @@ struct valname *vp;
 }
 
 struct valname S_atom[] = {
-	XA_PRIMARY, "XA_PRIMARY",
-	XA_SECONDARY, "XA_SECONDARY",
-	XA_ARC, "XA_ARC",
-	XA_ATOM, "XA_ATOM",
-	XA_BITMAP, "XA_BITMAP",
-	XA_CARDINAL, "XA_CARDINAL",
-	XA_COLORMAP, "XA_COLORMAP",
-	XA_CURSOR, "XA_CURSOR",
-	XA_CUT_BUFFER0, "XA_CUT_BUFFER0",
-	XA_CUT_BUFFER1, "XA_CUT_BUFFER1",
-	XA_CUT_BUFFER2, "XA_CUT_BUFFER2",
-	XA_CUT_BUFFER3, "XA_CUT_BUFFER3",
-	XA_CUT_BUFFER4, "XA_CUT_BUFFER4",
-	XA_CUT_BUFFER5, "XA_CUT_BUFFER5",
-	XA_CUT_BUFFER6, "XA_CUT_BUFFER6",
-	XA_CUT_BUFFER7, "XA_CUT_BUFFER7",
-	XA_DRAWABLE, "XA_DRAWABLE",
-	XA_FONT, "XA_FONT",
-	XA_INTEGER, "XA_INTEGER",
-	XA_PIXMAP, "XA_PIXMAP",
-	XA_POINT, "XA_POINT",
-	XA_RECTANGLE, "XA_RECTANGLE",
-	XA_RESOURCE_MANAGER, "XA_RESOURCE_MANAGER",
-	XA_RGB_COLOR_MAP, "XA_RGB_COLOR_MAP",
-	XA_RGB_BEST_MAP, "XA_RGB_BEST_MAP",
-	XA_RGB_BLUE_MAP, "XA_RGB_BLUE_MAP",
-	XA_RGB_DEFAULT_MAP, "XA_RGB_DEFAULT_MAP",
-	XA_RGB_GRAY_MAP, "XA_RGB_GRAY_MAP",
-	XA_RGB_GREEN_MAP, "XA_RGB_GREEN_MAP",
-	XA_RGB_RED_MAP, "XA_RGB_RED_MAP",
-	XA_STRING, "XA_STRING",
-	XA_VISUALID, "XA_VISUALID",
-	XA_WINDOW, "XA_WINDOW",
-	XA_WM_COMMAND, "XA_WM_COMMAND",
-	XA_WM_HINTS, "XA_WM_HINTS",
-	XA_WM_CLIENT_MACHINE, "XA_WM_CLIENT_MACHINE",
-	XA_WM_ICON_NAME, "XA_WM_ICON_NAME",
-	XA_WM_ICON_SIZE, "XA_WM_ICON_SIZE",
-	XA_WM_NAME, "XA_WM_NAME",
-	XA_WM_NORMAL_HINTS, "XA_WM_NORMAL_HINTS",
-	XA_WM_SIZE_HINTS, "XA_WM_SIZE_HINTS",
-	XA_WM_ZOOM_HINTS, "XA_WM_ZOOM_HINTS",
-	XA_MIN_SPACE, "XA_MIN_SPACE",
-	XA_NORM_SPACE, "XA_NORM_SPACE",
-	XA_MAX_SPACE, "XA_MAX_SPACE",
-	XA_END_SPACE, "XA_END_SPACE",
-	XA_SUPERSCRIPT_X, "XA_SUPERSCRIPT_X",
-	XA_SUPERSCRIPT_Y, "XA_SUPERSCRIPT_Y",
-	XA_SUBSCRIPT_X, "XA_SUBSCRIPT_X",
-	XA_SUBSCRIPT_Y, "XA_SUBSCRIPT_Y",
-	XA_UNDERLINE_POSITION, "XA_UNDERLINE_POSITION",
-	XA_UNDERLINE_THICKNESS, "XA_UNDERLINE_THICKNESS",
-	XA_STRIKEOUT_ASCENT, "XA_STRIKEOUT_ASCENT",
-	XA_STRIKEOUT_DESCENT, "XA_STRIKEOUT_DESCENT",
-	XA_ITALIC_ANGLE, "XA_ITALIC_ANGLE",
-	XA_X_HEIGHT, "XA_X_HEIGHT",
-	XA_QUAD_WIDTH, "XA_QUAD_WIDTH",
-	XA_WEIGHT, "XA_WEIGHT",
-	XA_POINT_SIZE, "XA_POINT_SIZE",
-	XA_RESOLUTION, "XA_RESOLUTION",
-	XA_COPYRIGHT, "XA_COPYRIGHT",
-	XA_NOTICE, "XA_NOTICE",
-	XA_FONT_NAME, "XA_FONT_NAME",
-	XA_FAMILY_NAME, "XA_FAMILY_NAME",
-	XA_FULL_NAME, "XA_FULL_NAME",
-	XA_CAP_HEIGHT, "XA_CAP_HEIGHT",
-	XA_WM_CLASS, "XA_WM_CLASS",
-	XA_WM_TRANSIENT_FOR, "XA_WM_TRANSIENT_FOR",
+	{ XA_PRIMARY, "XA_PRIMARY" },
+	{ XA_SECONDARY, "XA_SECONDARY" },
+	{ XA_ARC, "XA_ARC" },
+	{ XA_ATOM, "XA_ATOM" },
+	{ XA_BITMAP, "XA_BITMAP" },
+	{ XA_CARDINAL, "XA_CARDINAL" },
+	{ XA_COLORMAP, "XA_COLORMAP" },
+	{ XA_CURSOR, "XA_CURSOR" },
+	{ XA_CUT_BUFFER0, "XA_CUT_BUFFER0" },
+	{ XA_CUT_BUFFER1, "XA_CUT_BUFFER1" },
+	{ XA_CUT_BUFFER2, "XA_CUT_BUFFER2" },
+	{ XA_CUT_BUFFER3, "XA_CUT_BUFFER3" },
+	{ XA_CUT_BUFFER4, "XA_CUT_BUFFER4" },
+	{ XA_CUT_BUFFER5, "XA_CUT_BUFFER5" },
+	{ XA_CUT_BUFFER6, "XA_CUT_BUFFER6" },
+	{ XA_CUT_BUFFER7, "XA_CUT_BUFFER7" },
+	{ XA_DRAWABLE, "XA_DRAWABLE" },
+	{ XA_FONT, "XA_FONT" },
+	{ XA_INTEGER, "XA_INTEGER" },
+	{ XA_PIXMAP, "XA_PIXMAP" },
+	{ XA_POINT, "XA_POINT" },
+	{ XA_RECTANGLE, "XA_RECTANGLE" },
+	{ XA_RESOURCE_MANAGER, "XA_RESOURCE_MANAGER" },
+	{ XA_RGB_COLOR_MAP, "XA_RGB_COLOR_MAP" },
+	{ XA_RGB_BEST_MAP, "XA_RGB_BEST_MAP" },
+	{ XA_RGB_BLUE_MAP, "XA_RGB_BLUE_MAP" },
+	{ XA_RGB_DEFAULT_MAP, "XA_RGB_DEFAULT_MAP" },
+	{ XA_RGB_GRAY_MAP, "XA_RGB_GRAY_MAP" },
+	{ XA_RGB_GREEN_MAP, "XA_RGB_GREEN_MAP" },
+	{ XA_RGB_RED_MAP, "XA_RGB_RED_MAP" },
+	{ XA_STRING, "XA_STRING" },
+	{ XA_VISUALID, "XA_VISUALID" },
+	{ XA_WINDOW, "XA_WINDOW" },
+	{ XA_WM_COMMAND, "XA_WM_COMMAND" },
+	{ XA_WM_HINTS, "XA_WM_HINTS" },
+	{ XA_WM_CLIENT_MACHINE, "XA_WM_CLIENT_MACHINE" },
+	{ XA_WM_ICON_NAME, "XA_WM_ICON_NAME" },
+	{ XA_WM_ICON_SIZE, "XA_WM_ICON_SIZE" },
+	{ XA_WM_NAME, "XA_WM_NAME" },
+	{ XA_WM_NORMAL_HINTS, "XA_WM_NORMAL_HINTS" },
+	{ XA_WM_SIZE_HINTS, "XA_WM_SIZE_HINTS" },
+	{ XA_WM_ZOOM_HINTS, "XA_WM_ZOOM_HINTS" },
+	{ XA_MIN_SPACE, "XA_MIN_SPACE" },
+	{ XA_NORM_SPACE, "XA_NORM_SPACE" },
+	{ XA_MAX_SPACE, "XA_MAX_SPACE" },
+	{ XA_END_SPACE, "XA_END_SPACE" },
+	{ XA_SUPERSCRIPT_X, "XA_SUPERSCRIPT_X" },
+	{ XA_SUPERSCRIPT_Y, "XA_SUPERSCRIPT_Y" },
+	{ XA_SUBSCRIPT_X, "XA_SUBSCRIPT_X" },
+	{ XA_SUBSCRIPT_Y, "XA_SUBSCRIPT_Y" },
+	{ XA_UNDERLINE_POSITION, "XA_UNDERLINE_POSITION" },
+	{ XA_UNDERLINE_THICKNESS, "XA_UNDERLINE_THICKNESS" },
+	{ XA_STRIKEOUT_ASCENT, "XA_STRIKEOUT_ASCENT" },
+	{ XA_STRIKEOUT_DESCENT, "XA_STRIKEOUT_DESCENT" },
+	{ XA_ITALIC_ANGLE, "XA_ITALIC_ANGLE" },
+	{ XA_X_HEIGHT, "XA_X_HEIGHT" },
+	{ XA_QUAD_WIDTH, "XA_QUAD_WIDTH" },
+	{ XA_WEIGHT, "XA_WEIGHT" },
+	{ XA_POINT_SIZE, "XA_POINT_SIZE" },
+	{ XA_RESOLUTION, "XA_RESOLUTION" },
+	{ XA_COPYRIGHT, "XA_COPYRIGHT" },
+	{ XA_NOTICE, "XA_NOTICE" },
+	{ XA_FONT_NAME, "XA_FONT_NAME" },
+	{ XA_FAMILY_NAME, "XA_FAMILY_NAME" },
+	{ XA_FULL_NAME, "XA_FULL_NAME" },
+	{ XA_CAP_HEIGHT, "XA_CAP_HEIGHT" },
+	{ XA_WM_CLASS, "XA_WM_CLASS" },
+	{ XA_WM_TRANSIENT_FOR, "XA_WM_TRANSIENT_FOR" },
 };
 int 	NS_atom = NELEM(S_atom);
 
@@ -1252,9 +1252,9 @@ struct valname *vp;
 }
 
 struct valname S_mapstate[] = {
-	IsUnmapped, "IsUnmapped",
-	IsUnviewable, "IsUnviewable",
-	IsViewable, "IsViewable",
+	{ IsUnmapped, "IsUnmapped" },
+	{ IsUnviewable, "IsUnviewable" },
+	{ IsViewable, "IsViewable" },
 };
 int 	NS_mapstate = NELEM(S_mapstate);
 
@@ -1276,16 +1276,16 @@ struct valname *vp;
 }
 
 struct valname S_visualmask[] = {
-	VisualNoMask, "VisualNoMask",
-	VisualIDMask, "VisualIDMask",
-	VisualScreenMask, "VisualScreenMask",
-	VisualDepthMask, "VisualDepthMask",
-	VisualClassMask, "VisualClassMask",
-	VisualRedMaskMask, "VisualRedMaskMask",
-	VisualGreenMaskMask, "VisualGreenMaskMask",
-	VisualBlueMaskMask, "VisualBlueMaskMask",
-	VisualColormapSizeMask, "VisualColormapSizeMask",
-	VisualBitsPerRGBMask, "VisualBitsPerRGBMask",
+	{ VisualNoMask, "VisualNoMask" },
+	{ VisualIDMask, "VisualIDMask" },
+	{ VisualScreenMask, "VisualScreenMask" },
+	{ VisualDepthMask, "VisualDepthMask" },
+	{ VisualClassMask, "VisualClassMask" },
+	{ VisualRedMaskMask, "VisualRedMaskMask" },
+	{ VisualGreenMaskMask, "VisualGreenMaskMask" },
+	{ VisualBlueMaskMask, "VisualBlueMaskMask" },
+	{ VisualColormapSizeMask, "VisualColormapSizeMask" },
+	{ VisualBitsPerRGBMask, "VisualBitsPerRGBMask" },
 };
 int 	NS_visualmask = NELEM(S_visualmask);
 
@@ -1335,9 +1335,9 @@ unsigned long	masks;
 }
 
 struct valname S_contexterror[] = {
-	XCSUCCESS, "XCSUCCESS",
-	XCNOMEM, "XCNOMEM",
-	XCNOENT, "XCNOENT",
+	{ XCSUCCESS, "XCSUCCESS" },
+	{ XCNOMEM, "XCNOMEM" },
+	{ XCNOENT, "XCNOENT" },
 };
 int 	NS_contexterror = NELEM(S_contexterror);
 
@@ -1357,4 +1357,3 @@ struct valname *vp;
 	sprintf(buf, "UNDEFINED (%d)", val);
 	return(buf);
 }
-
diff --git a/xts5/src/lib/nextvclass.c b/xts5/src/lib/nextvclass.c
index 2c9b3c23..13b7f6cb 100644
--- a/xts5/src/lib/nextvclass.c
+++ b/xts5/src/lib/nextvclass.c
@@ -151,13 +151,13 @@ static	int 	Nclass;
 static char classbuf[CLASSBUFLEN+1];
 
 static struct valname S_displayclass[] = {
-	StaticGray, "StaticGray",
-	GrayScale, "GrayScale",
-	StaticColor, "StaticColor",
-	PseudoColor, "PseudoColor",
-	TrueColor, "TrueColor",
-	DirectColor, "DirectColor",
-	0, (char*)0,
+	{ StaticGray, "StaticGray" },
+	{ GrayScale, "GrayScale" },
+	{ StaticColor, "StaticColor" },
+	{ PseudoColor, "PseudoColor" },
+	{ TrueColor, "TrueColor" },
+	{ DirectColor, "DirectColor" },
+	{ 0, (char*)0 },
 };
 
 /*