From d8f4f19df081036b73520db1a746a74a4ff0f232 Mon Sep 17 00:00:00 2001
From: Frederic Cambus <fcambus@cvs.openbsd.org>
Date: Wed, 24 Jun 2020 17:24:36 +0000
Subject: Use C99 initializers in wsdisplay_font struct definitions for
 "Boldface", "Boldface.iso1", and "Gallant".

OK mpi@
---
 sys/dev/wsfont/bold8x16-iso1.h | 26 +++++++++++++-------------
 sys/dev/wsfont/bold8x16.h      | 26 +++++++++++++-------------
 sys/dev/wsfont/gallant12x22.h  | 26 +++++++++++++-------------
 3 files changed, 39 insertions(+), 39 deletions(-)

(limited to 'sys/dev')

diff --git a/sys/dev/wsfont/bold8x16-iso1.h b/sys/dev/wsfont/bold8x16-iso1.h
index 6b43cbd14cb..3cd6c8aa15c 100644
--- a/sys/dev/wsfont/bold8x16-iso1.h
+++ b/sys/dev/wsfont/bold8x16-iso1.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bold8x16-iso1.h,v 1.4 2012/01/06 14:55:38 shadchin Exp $ */
+/*	$OpenBSD: bold8x16-iso1.h,v 1.5 2020/06/24 17:24:35 fcambus Exp $ */
 
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -36,18 +36,18 @@
 static u_char bold8x16_iso1_data[];
 
 struct wsdisplay_font bold8x16_iso1 = {
-	"Boldface.iso1",		/* typeface name */
-	0,				/* index */
-	' ',				/* firstchar */
-	256 - ' ',			/* numchars */
-	WSDISPLAY_FONTENC_ISO,		/* encoding */
-	8,				/* width */
-	16,				/* height */
-	1,				/* stride */
-	WSDISPLAY_FONTORDER_L2R,	/* bit order */
-	WSDISPLAY_FONTORDER_L2R,	/* byte order */
-	NULL,				/* cookie */
-	bold8x16_iso1_data		/* data */
+	.name		= "Boldface.iso1",
+	.index		= 0,
+	.firstchar	= ' ',
+	.numchars	= 256 - ' ',
+	.encoding	= WSDISPLAY_FONTENC_ISO,
+	.fontwidth	= 8,
+	.fontheight	= 16,
+	.stride		= 1,
+	.bitorder	= WSDISPLAY_FONTORDER_L2R,
+	.byteorder	= WSDISPLAY_FONTORDER_L2R,
+	.cookie		= NULL,
+	.data		= bold8x16_iso1_data
 };
 
 static u_char bold8x16_iso1_data[] = {
diff --git a/sys/dev/wsfont/bold8x16.h b/sys/dev/wsfont/bold8x16.h
index cd7062a9632..79bff42eef7 100644
--- a/sys/dev/wsfont/bold8x16.h
+++ b/sys/dev/wsfont/bold8x16.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bold8x16.h,v 1.4 2012/01/06 14:55:38 shadchin Exp $ */
+/*	$OpenBSD: bold8x16.h,v 1.5 2020/06/24 17:24:35 fcambus Exp $ */
 /*	$NetBSD: bold8x16.h,v 1.4 2000/01/05 18:44:22 ad Exp $ */
 
 /*-
@@ -37,18 +37,18 @@
 static u_char bold8x16_data[];
 
 struct wsdisplay_font bold8x16 = {
-	"Boldface",			/* typeface name */
-	0,				/* index */
-	1,				/* firstchar */
-	254,				/* numchars */
-	WSDISPLAY_FONTENC_IBM,		/* encoding */
-	8,				/* width */
-	16,				/* height */
-	1,				/* stride */
-	WSDISPLAY_FONTORDER_L2R,	/* bit order */
-	WSDISPLAY_FONTORDER_L2R,	/* byte order */
-	NULL,				/* cookie */
-	bold8x16_data			/* data */
+	.name		= "Boldface",
+	.index		= 0,
+	.firstchar	= 1,
+	.numchars	= 254,
+	.encoding	= WSDISPLAY_FONTENC_IBM,
+	.fontwidth	= 8,
+	.fontheight	= 16,
+	.stride		= 1,
+	.bitorder	= WSDISPLAY_FONTORDER_L2R,
+	.byteorder	= WSDISPLAY_FONTORDER_L2R,
+	.cookie		= NULL,
+	.data		= bold8x16_data
 };
 
 static u_char bold8x16_data[] = {
diff --git a/sys/dev/wsfont/gallant12x22.h b/sys/dev/wsfont/gallant12x22.h
index c4b7ec11a98..bdd33493351 100644
--- a/sys/dev/wsfont/gallant12x22.h
+++ b/sys/dev/wsfont/gallant12x22.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: gallant12x22.h,v 1.5 2012/01/06 14:55:38 shadchin Exp $ */
+/*	$OpenBSD: gallant12x22.h,v 1.6 2020/06/24 17:24:35 fcambus Exp $ */
 /*	$NetBSD: gallant12x22.h,v 1.2 1999/05/18 21:51:58 ad Exp $ */
 
 /*
@@ -39,18 +39,18 @@
 static u_char gallant12x22_data[];
 
 struct wsdisplay_font gallant12x22 = {
-	"Gallant",			/* typeface name */
-	0,				/* index */
-	' ',				/* firstchar */
-	256 - ' ',			/* numchars */
-	WSDISPLAY_FONTENC_ISO,		/* encoding */
-	12,				/* width */
-	22,				/* height */
-	2,				/* stride */
-	WSDISPLAY_FONTORDER_L2R,	/* bit order */
-	WSDISPLAY_FONTORDER_L2R,	/* byte order */
-	NULL,				/* cookie */
-	gallant12x22_data		/* data */
+	.name		= "Gallant",
+	.index		= 0,
+	.firstchar	= ' ',
+	.numchars	= 256 - ' ',
+	.encoding	= WSDISPLAY_FONTENC_ISO,
+	.fontwidth	= 12,
+	.fontheight	= 22,
+	.stride		= 2,
+	.bitorder	= WSDISPLAY_FONTORDER_L2R,
+	.byteorder	= WSDISPLAY_FONTORDER_L2R,
+	.cookie		= NULL,
+	.data		= gallant12x22_data
 };
 
 static u_char gallant12x22_data[] = {
-- 
cgit v1.2.3