favor C99 initializers for improved grepability; ok mpi@

3 files changed, 22 insertions, 13 deletions

diff --git a/sys/dev/wscons/wskbd.c b/sys/dev/wscons/wskbd.c
index f53a2abd367..49a08976c3a 100644
--- a/sys/dev/wscons/wskbd.c
+++ b/sys/dev/wscons/wskbd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: wskbd.c,v 1.95 2019/02/01 07:02:31 anton Exp $ */
+/* $OpenBSD: wskbd.c,v 1.96 2019/02/19 07:01:02 anton Exp $ */
 /* $NetBSD: wskbd.c,v 1.80 2005/05/04 01:52:16 augustss Exp $ */
 
 /*
@@ -279,13 +279,15 @@ struct wskbd_keyrepeat_data wskbd_default_keyrepeat_data = {
 
 #if NWSMUX > 0 || NWSDISPLAY > 0
 struct wssrcops wskbd_srcops = {
-	WSMUX_KBD,
-	wskbd_mux_open, wskbd_mux_close, wskbd_do_ioctl,
-	wskbd_displayioctl,
+	.type		= WSMUX_KBD,
+	.dopen		= wskbd_mux_open,
+	.dclose		= wskbd_mux_close,
+	.dioctl		= wskbd_do_ioctl,
+	.ddispioctl	= wskbd_displayioctl,
 #if NWSDISPLAY > 0
-	wskbd_set_display
+	.dsetdisplay	= wskbd_set_display,
 #else
-	NULL
+	.dsetdisplay	= NULL,
 #endif
 };
 #endif
diff --git a/sys/dev/wscons/wsmouse.c b/sys/dev/wscons/wsmouse.c
index 981b8c09d18..82036da2922 100644
--- a/sys/dev/wscons/wsmouse.c
+++ b/sys/dev/wscons/wsmouse.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: wsmouse.c,v 1.50 2018/11/20 19:33:44 anton Exp $ */
+/* $OpenBSD: wsmouse.c,v 1.51 2019/02/19 07:01:02 anton Exp $ */
 /* $NetBSD: wsmouse.c,v 1.35 2005/02/27 00:27:52 perry Exp $ */
 
 /*
@@ -168,8 +168,12 @@ struct cfattach wsmouse_ca = {
 
 #if NWSMUX > 0
 struct wssrcops wsmouse_srcops = {
-	WSMUX_MOUSE,
-	wsmouse_mux_open, wsmouse_mux_close, wsmousedoioctl, NULL, NULL
+	.type		= WSMUX_MOUSE,
+	.dopen		= wsmouse_mux_open,
+	.dclose		= wsmouse_mux_close,
+	.dioctl		= wsmousedoioctl,
+	.ddispioctl	= NULL,
+	.dsetdisplay	= NULL,
 };
 #endif
 
diff --git a/sys/dev/wscons/wsmux.c b/sys/dev/wscons/wsmux.c
index 6d49f403921..12d2519498a 100644
--- a/sys/dev/wscons/wsmux.c
+++ b/sys/dev/wscons/wsmux.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: wsmux.c,v 1.39 2019/02/18 17:39:14 anton Exp $	*/
+/*	$OpenBSD: wsmux.c,v 1.40 2019/02/19 07:01:02 anton Exp $	*/
 /*      $NetBSD: wsmux.c,v 1.37 2005/04/30 03:47:12 augustss Exp $      */
 
 /*
@@ -108,9 +108,12 @@ void	wsmuxattach(int);
 void	wsmux_detach_sc_locked(struct wsmux_softc *, struct wsevsrc *);
 
 struct wssrcops wsmux_srcops = {
-	WSMUX_MUX,
-	wsmux_mux_open, wsmux_mux_close, wsmux_do_ioctl, wsmux_do_displayioctl,
-	wsmux_evsrc_set_display
+	.type		= WSMUX_MUX,
+	.dopen		= wsmux_mux_open,
+	.dclose		= wsmux_mux_close,
+	.dioctl		= wsmux_do_ioctl,
+	.ddispioctl	= wsmux_do_displayioctl,
+	.dsetdisplay	= wsmux_evsrc_set_display,
 };
 
 /* From upper level */