[src/trunk]: src/external/cddl/osnet Use C99 initializers for the cdevsw

[pgoyette <pgoyette%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/4d91450021a8
branches:  trunk
changeset: 816666:4d91450021a8
user:      pgoyette <pgoyette%NetBSD.org@localhost>
date:      Sun Jul 17 02:09:10 2016 +0000

description:
Use C99 initializers for the cdevsw

No functional change intended or expected.

diffstat:

 external/cddl/osnet/dev/fbt/fbt.c                   |  17 +++++++++++++----
 external/cddl/osnet/dev/sdt/sdt.c                   |  17 +++++++++++++----
 external/cddl/osnet/dist/uts/common/dtrace/dtrace.c |  15 ++++++++++++---
 3 files changed, 38 insertions(+), 11 deletions(-)

diffs (90 lines):

diff -r dbd2928ed6ce -r 4d91450021a8 external/cddl/osnet/dev/fbt/fbt.c
--- a/external/cddl/osnet/dev/fbt/fbt.c Sun Jul 17 02:02:01 2016 +0000
+++ b/external/cddl/osnet/dev/fbt/fbt.c Sun Jul 17 02:09:10 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: fbt.c,v 1.18 2015/02/26 10:31:52 ozaki-r Exp $ */
+/*     $NetBSD: fbt.c,v 1.19 2016/07/17 02:09:10 pgoyette Exp $        */
 
 /*
  * CDDL HEADER START
@@ -152,9 +152,18 @@
 #define        FBT_PROBETAB_SIZE       0x8000          /* 32k entries -- 128K total */
 
 static const struct cdevsw fbt_cdevsw = {
-       fbt_open, noclose, noread, nowrite, noioctl,
-       nostop, notty, nopoll, nommap, nokqfilter, nodiscard,
-       D_OTHER
+       .d_open         = fbt_open,
+       .d_close        = noclose,
+       .d_read         = noread,
+       .d_write        = nowrite,
+       .d_ioctl        = noioctl,
+       .d_stop         = nostop,
+       .d_tty          = notty,
+       .d_poll         = nopoll,
+       .d_mmap         = nommap,
+       .d_kqfilter     = nokqfilter,
+       .d_discard      = nodiscard,
+       .d_flag         = D_OTHER
 };
 
 static dtrace_pattr_t fbt_attr = {
diff -r dbd2928ed6ce -r 4d91450021a8 external/cddl/osnet/dev/sdt/sdt.c
--- a/external/cddl/osnet/dev/sdt/sdt.c Sun Jul 17 02:02:01 2016 +0000
+++ b/external/cddl/osnet/dev/sdt/sdt.c Sun Jul 17 02:09:10 2016 +0000
@@ -39,7 +39,7 @@
  * unloaded; in particular, probes may not span multiple kernel modules.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sdt.c,v 1.16 2016/06/16 06:08:06 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sdt.c,v 1.17 2016/07/17 02:09:10 pgoyette Exp $");
 
 #include <sys/cdefs.h>
 #include <sys/param.h>
@@ -119,9 +119,18 @@
 }
 
 static const struct cdevsw sdt_cdevsw = {
-       sdt_open, noclose, noread, nowrite, noioctl,
-       nostop, notty, nopoll, nommap, nokqfilter, nodiscard,
-       D_OTHER
+       .d_open         = sdt_open,
+       .d_close        = noclose,
+       .d_read         = noread,
+       .d_write        = nowrite,
+       .d_ioctl        = noioctl,
+       .d_stop         = nostop,
+       .d_tty          = notty,
+       .d_poll         = nopoll,
+       .d_mmap         = nommap,
+       .d_kqfilter     = nokqfilter,
+       .d_discard      = nodiscard,
+       .d_flag         = D_OTHER
 };
 #endif
 
diff -r dbd2928ed6ce -r 4d91450021a8 external/cddl/osnet/dist/uts/common/dtrace/dtrace.c
--- a/external/cddl/osnet/dist/uts/common/dtrace/dtrace.c       Sun Jul 17 02:02:01 2016 +0000
+++ b/external/cddl/osnet/dist/uts/common/dtrace/dtrace.c       Sun Jul 17 02:09:10 2016 +0000
@@ -15338,9 +15338,18 @@
 /* Pseudo Device Entry points */
 /* Just opens, clones to the fileops below */
 const struct cdevsw dtrace_cdevsw = {
-       dtrace_open, noclose, noread, nowrite, noioctl,
-       nostop, notty, nopoll, nommap, nokqfilter, nodiscard,
-       D_OTHER | D_MPSAFE
+       .d_open         = dtrace_open,
+       .d_close        = noclose,
+       .d_read         = noread,
+       .d_write        = nowrite,
+       .d_ioctl        = noioctl,
+       .d_stop         = nostop,
+       .d_tty          = notty,
+       .d_poll         = nopoll,
+       .d_mmap         = nommap,
+       .d_kqfilter     = nokqfilter,
+       .d_discard      = nodiscard,
+       .d_flag         = D_OTHER | D_MPSAFE
 };
 
 static int dtrace_ioctl(struct file *fp, u_long cmd, void *data);