This commit should be a extensive NO-OP:

        Reformat and initialize correctly all "struct cdevsw".

        Initialize the d_maj and d_bmaj fields.

        The d_reset field was not removed, although it is never used.

I used a program to do most of this, so all the files now use the
same consistent format.  Please keep it that way.

Vinum and i4b not modified, patches emailed to respective authors.

1 files changed, 41 insertions, 13 deletions

diff --git a/sys/kern/tty_pty.c b/sys/kern/tty_pty.c
index 87f21f0..535df84 100644
--- a/sys/kern/tty_pty.c
+++ b/sys/kern/tty_pty.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tty_pty.c	8.4 (Berkeley) 2/20/95
- * $Id: tty_pty.c,v 1.58 1999/05/14 20:44:20 luoqi Exp $
+ * $Id: tty_pty.c,v 1.59 1999/05/18 14:53:52 luoqi Exp $
  */
 
 /*
@@ -80,21 +80,49 @@ static	d_write_t	ptcwrite;
 static	d_poll_t	ptcpoll;
 
 #define	CDEV_MAJOR_S	5
-static	struct cdevsw	pts_cdevsw = {
-	ptsopen,	ptsclose,	ptsread,	ptswrite,
-	ptyioctl,	ptsstop,	nullreset,	ptydevtotty,
-	ttpoll,		nommap,		NULL,		"pts",
-	NULL,		-1,		nodump,		nopsize,
-	D_TTY,
+static struct cdevsw pts_cdevsw = {
+	/* open */	ptsopen,
+	/* close */	ptsclose,
+	/* read */	ptsread,
+	/* write */	ptswrite,
+	/* ioctl */	ptyioctl,
+	/* stop */	ptsstop,
+	/* reset */	noreset,
+	/* devtotty */	ptydevtotty,
+	/* poll */	ttpoll,
+	/* mmap */	nommap,
+	/* strategy */	nostrategy,
+	/* name */	"pts",
+	/* parms */	noparms,
+	/* maj */	CDEV_MAJOR_S,
+	/* dump */	nodump,
+	/* psize */	nopsize,
+	/* flags */	D_TTY,
+	/* maxio */	0,
+	/* bmaj */	-1
 };
 
 #define	CDEV_MAJOR_C	6
-static	struct cdevsw	ptc_cdevsw = {
-	ptcopen,	ptcclose,	ptcread,	ptcwrite,
-	ptyioctl,	nullstop,	nullreset,	ptydevtotty,
-	ptcpoll,	nommap,		NULL,		"ptc",
-	NULL,		-1,		nodump,		nopsize,
-	D_TTY,
+static struct cdevsw ptc_cdevsw = {
+	/* open */	ptcopen,
+	/* close */	ptcclose,
+	/* read */	ptcread,
+	/* write */	ptcwrite,
+	/* ioctl */	ptyioctl,
+	/* stop */	nostop,
+	/* reset */	noreset,
+	/* devtotty */	ptydevtotty,
+	/* poll */	ptcpoll,
+	/* mmap */	nommap,
+	/* strategy */	nostrategy,
+	/* name */	"ptc",
+	/* parms */	noparms,
+	/* maj */	CDEV_MAJOR_C,
+	/* dump */	nodump,
+	/* psize */	nopsize,
+	/* flags */	D_TTY,
+	/* maxio */	0,
+	/* bmaj */	-1
 };
 
 #if NPTY == 1