Module Name: src
Committed By: pgoyette
Date: Sun Jul 17 02:09:10 UTC 2016
Modified Files:
src/external/cddl/osnet/dev/fbt: fbt.c
src/external/cddl/osnet/dev/sdt: sdt.c
src/external/cddl/osnet/dist/uts/common/dtrace: dtrace.c
Log Message:
Use C99 initializers for the cdevsw
No functional change intended or expected.
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/external/cddl/osnet/dev/fbt/fbt.c
cvs rdiff -u -r1.16 -r1.17 src/external/cddl/osnet/dev/sdt/sdt.c
cvs rdiff -u -r1.32 -r1.33 \
src/external/cddl/osnet/dist/uts/common/dtrace/dtrace.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/cddl/osnet/dev/fbt/fbt.c
diff -u src/external/cddl/osnet/dev/fbt/fbt.c:1.18 src/external/cddl/osnet/dev/fbt/fbt.c:1.19
--- src/external/cddl/osnet/dev/fbt/fbt.c:1.18 Thu Feb 26 10:31:52 2015
+++ src/external/cddl/osnet/dev/fbt/fbt.c Sun Jul 17 02:09:10 2016
@@ -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 @@ static void fbt_resume(void *, dtrace_id
#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 = {
Index: src/external/cddl/osnet/dev/sdt/sdt.c
diff -u src/external/cddl/osnet/dev/sdt/sdt.c:1.16 src/external/cddl/osnet/dev/sdt/sdt.c:1.17
--- src/external/cddl/osnet/dev/sdt/sdt.c:1.16 Thu Jun 16 06:08:06 2016
+++ src/external/cddl/osnet/dev/sdt/sdt.c Sun Jul 17 02:09:10 2016
@@ -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 @@ sdt_open(dev_t dev, int flags, int mode,
}
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
Index: src/external/cddl/osnet/dist/uts/common/dtrace/dtrace.c
diff -u src/external/cddl/osnet/dist/uts/common/dtrace/dtrace.c:1.32 src/external/cddl/osnet/dist/uts/common/dtrace/dtrace.c:1.33
--- src/external/cddl/osnet/dist/uts/common/dtrace/dtrace.c:1.32 Thu Jun 23 04:35:35 2016
+++ src/external/cddl/osnet/dist/uts/common/dtrace/dtrace.c Sun Jul 17 02:09:10 2016
@@ -15338,9 +15338,18 @@ static dev_type_open(dtrace_open);
/* 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);
