Module Name: src
Committed By: maya
Date: Wed Oct 25 08:12:40 UTC 2017
Modified Files:
src/sys/arch/amiga/dev: event.c
src/sys/arch/arc/dev: opms.c
src/sys/arch/atari/dev: event.c
src/sys/arch/landisk/dev: button.c
src/sys/arch/mac68k/dev: aed.c
src/sys/arch/macppc/dev: aed.c
src/sys/arch/sandpoint/sandpoint: satmgr.c
src/sys/arch/shark/shark: opms.c
src/sys/arch/sparc/dev: tctrl.c
src/sys/arch/x68k/dev: event.c
src/sys/coda: coda_psdev.c
src/sys/dev: audio.c midi.c sequencer.c
src/sys/dev/apm: apm.c
src/sys/dev/hpc/apm: apmdev.c
src/sys/dev/ir: irframe_tty.c
src/sys/dev/isa: satlink.c
src/sys/dev/pci: oboe.c
src/sys/dev/putter: putter.c
src/sys/dev/qbus: qd.c
src/sys/dev/sbus: bpp.c
src/sys/dev/scsipi: ch.c
src/sys/dev/sun: event.c
src/sys/dev/sysmon: sysmon_power.c
src/sys/dev/usb: udsir.c ugen.c uhid.c uirda.c usb.c uscanner.c ustir.c
src/sys/dev/wscons: wsevent.c
src/sys/external/bsd/drm2/drm: drm_drv.c
src/sys/fs/smbfs: smbfs_kq.c
src/sys/kern: kern_event.c kern_sig.c subr_cprng.c subr_log.c
sys_pipe.c tty.c tty_pty.c uipc_socket.c
src/sys/miscfs/fifofs: fifo_vnops.c
src/sys/miscfs/genfs: genfs_vnops.c
src/sys/net: bpf.c if_tun.c
src/sys/netisdn: i4b_i4bdrv.c i4b_rbch.c i4b_tel.c
src/sys/nfs: nfs_kq.c
Log Message:
Use C99 initializer for filterops
Mostly done with spatch with touchups for indentation
@@
expression a;
identifier b,c,d;
identifier p;
@@
const struct filterops p =
- { a, b, c, d
+ {
+ .f_isfd = a,
+ .f_attach = b,
+ .f_detach = c,
+ .f_event = d,
};
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/amiga/dev/event.c
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/arc/dev/opms.c
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/atari/dev/event.c
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/landisk/dev/button.c
cvs rdiff -u -r1.33 -r1.34 src/sys/arch/mac68k/dev/aed.c
cvs rdiff -u -r1.29 -r1.30 src/sys/arch/macppc/dev/aed.c
cvs rdiff -u -r1.26 -r1.27 src/sys/arch/sandpoint/sandpoint/satmgr.c
cvs rdiff -u -r1.28 -r1.29 src/sys/arch/shark/shark/opms.c
cvs rdiff -u -r1.60 -r1.61 src/sys/arch/sparc/dev/tctrl.c
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/x68k/dev/event.c
cvs rdiff -u -r1.57 -r1.58 src/sys/coda/coda_psdev.c
cvs rdiff -u -r1.413 -r1.414 src/sys/dev/audio.c
cvs rdiff -u -r1.86 -r1.87 src/sys/dev/midi.c
cvs rdiff -u -r1.66 -r1.67 src/sys/dev/sequencer.c
cvs rdiff -u -r1.31 -r1.32 src/sys/dev/apm/apm.c
cvs rdiff -u -r1.30 -r1.31 src/sys/dev/hpc/apm/apmdev.c
cvs rdiff -u -r1.61 -r1.62 src/sys/dev/ir/irframe_tty.c
cvs rdiff -u -r1.45 -r1.46 src/sys/dev/isa/satlink.c
cvs rdiff -u -r1.44 -r1.45 src/sys/dev/pci/oboe.c
cvs rdiff -u -r1.35 -r1.36 src/sys/dev/putter/putter.c
cvs rdiff -u -r1.56 -r1.57 src/sys/dev/qbus/qd.c
cvs rdiff -u -r1.41 -r1.42 src/sys/dev/sbus/bpp.c
cvs rdiff -u -r1.91 -r1.92 src/sys/dev/scsipi/ch.c
cvs rdiff -u -r1.23 -r1.24 src/sys/dev/sun/event.c
cvs rdiff -u -r1.57 -r1.58 src/sys/dev/sysmon/sysmon_power.c
cvs rdiff -u -r1.4 -r1.5 src/sys/dev/usb/udsir.c
cvs rdiff -u -r1.135 -r1.136 src/sys/dev/usb/ugen.c
cvs rdiff -u -r1.99 -r1.100 src/sys/dev/usb/uhid.c
cvs rdiff -u -r1.41 -r1.42 src/sys/dev/usb/uirda.c
cvs rdiff -u -r1.166 -r1.167 src/sys/dev/usb/usb.c
cvs rdiff -u -r1.80 -r1.81 src/sys/dev/usb/uscanner.c
cvs rdiff -u -r1.37 -r1.38 src/sys/dev/usb/ustir.c
cvs rdiff -u -r1.36 -r1.37 src/sys/dev/wscons/wsevent.c
cvs rdiff -u -r1.17 -r1.18 src/sys/external/bsd/drm2/drm/drm_drv.c
cvs rdiff -u -r1.26 -r1.27 src/sys/fs/smbfs/smbfs_kq.c
cvs rdiff -u -r1.95 -r1.96 src/sys/kern/kern_event.c
cvs rdiff -u -r1.337 -r1.338 src/sys/kern/kern_sig.c
cvs rdiff -u -r1.27 -r1.28 src/sys/kern/subr_cprng.c
cvs rdiff -u -r1.55 -r1.56 src/sys/kern/subr_log.c
cvs rdiff -u -r1.140 -r1.141 src/sys/kern/sys_pipe.c
cvs rdiff -u -r1.274 -r1.275 src/sys/kern/tty.c
cvs rdiff -u -r1.142 -r1.143 src/sys/kern/tty_pty.c
cvs rdiff -u -r1.256 -r1.257 src/sys/kern/uipc_socket.c
cvs rdiff -u -r1.78 -r1.79 src/sys/miscfs/fifofs/fifo_vnops.c
cvs rdiff -u -r1.198 -r1.199 src/sys/miscfs/genfs/genfs_vnops.c
cvs rdiff -u -r1.217 -r1.218 src/sys/net/bpf.c
cvs rdiff -u -r1.139 -r1.140 src/sys/net/if_tun.c
cvs rdiff -u -r1.39 -r1.40 src/sys/netisdn/i4b_i4bdrv.c
cvs rdiff -u -r1.28 -r1.29 src/sys/netisdn/i4b_rbch.c
cvs rdiff -u -r1.27 -r1.28 src/sys/netisdn/i4b_tel.c
cvs rdiff -u -r1.25 -r1.26 src/sys/nfs/nfs_kq.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/amiga/dev/event.c
diff -u src/sys/arch/amiga/dev/event.c:1.13 src/sys/arch/amiga/dev/event.c:1.14
--- src/sys/arch/amiga/dev/event.c:1.13 Sat Mar 1 14:16:49 2008
+++ src/sys/arch/amiga/dev/event.c Wed Oct 25 08:12:37 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: event.c,v 1.13 2008/03/01 14:16:49 rmind Exp $ */
+/* $NetBSD: event.c,v 1.14 2017/10/25 08:12:37 maya Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -43,7 +43,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: event.c,v 1.13 2008/03/01 14:16:49 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: event.c,v 1.14 2017/10/25 08:12:37 maya Exp $");
/*
* Internal `Firm_event' interface for the keyboard and mouse drivers.
@@ -190,8 +190,12 @@ filt_evread(struct knote *kn, long hint)
return (1);
}
-static const struct filterops ev_filtops =
- { 1, NULL, filt_evrdetach, filt_evread };
+static const struct filterops ev_filtops = {
+ .f_isfd = 1,
+ .f_attach = NULL,
+ .f_detach = filt_evrdetach,
+ .f_event = filt_evread,
+};
int
ev_kqfilter(struct evvar *ev, struct knote *kn)
Index: src/sys/arch/arc/dev/opms.c
diff -u src/sys/arch/arc/dev/opms.c:1.21 src/sys/arch/arc/dev/opms.c:1.22
--- src/sys/arch/arc/dev/opms.c:1.21 Fri Jul 25 08:10:31 2014
+++ src/sys/arch/arc/dev/opms.c Wed Oct 25 08:12:37 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: opms.c,v 1.21 2014/07/25 08:10:31 dholland Exp $ */
+/* $NetBSD: opms.c,v 1.22 2017/10/25 08:12:37 maya Exp $ */
/* $OpenBSD: pccons.c,v 1.22 1999/01/30 22:39:37 imp Exp $ */
/* NetBSD: pms.c,v 1.21 1995/04/18 02:25:18 mycroft Exp */
@@ -80,7 +80,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: opms.c,v 1.21 2014/07/25 08:10:31 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: opms.c,v 1.22 2017/10/25 08:12:37 maya Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -472,8 +472,12 @@ filt_opmsread(struct knote *kn, long hin
return kn->kn_data > 0;
}
-static const struct filterops opmsread_filtops =
- { 1, NULL, filt_opmsrdetach, filt_opmsread };
+static const struct filterops opmsread_filtops = {
+ .f_isfd = 1,
+ .f_attach = NULL,
+ .f_detach = filt_opmsrdetach,
+ .f_event = filt_opmsread,
+};
int
opmskqfilter(dev_t dev, struct knote *kn)
Index: src/sys/arch/atari/dev/event.c
diff -u src/sys/arch/atari/dev/event.c:1.13 src/sys/arch/atari/dev/event.c:1.14
--- src/sys/arch/atari/dev/event.c:1.13 Sat Mar 14 15:36:03 2009
+++ src/sys/arch/atari/dev/event.c Wed Oct 25 08:12:37 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: event.c,v 1.13 2009/03/14 15:36:03 dsl Exp $ */
+/* $NetBSD: event.c,v 1.14 2017/10/25 08:12:37 maya Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -47,7 +47,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: event.c,v 1.13 2009/03/14 15:36:03 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: event.c,v 1.14 2017/10/25 08:12:37 maya Exp $");
#include <sys/param.h>
#include <sys/fcntl.h>
@@ -189,8 +189,12 @@ filt_evread(struct knote *kn, long hint)
return (1);
}
-static const struct filterops ev_filtops =
- { 1, NULL, filt_evrdetach, filt_evread };
+static const struct filterops ev_filtops = {
+ .f_isfd = 1,
+ .f_attach = NULL,
+ .f_detach = filt_evrdetach,
+ .f_event = filt_evread,
+};
int
ev_kqfilter(struct evvar *ev, struct knote *kn)
Index: src/sys/arch/landisk/dev/button.c
diff -u src/sys/arch/landisk/dev/button.c:1.8 src/sys/arch/landisk/dev/button.c:1.9
--- src/sys/arch/landisk/dev/button.c:1.8 Fri Jul 25 08:10:33 2014
+++ src/sys/arch/landisk/dev/button.c Wed Oct 25 08:12:37 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: button.c,v 1.8 2014/07/25 08:10:33 dholland Exp $ */
+/* $NetBSD: button.c,v 1.9 2017/10/25 08:12:37 maya Exp $ */
/*
* Copyright (c) 2003 Wasabi Systems, Inc.
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: button.c,v 1.8 2014/07/25 08:10:33 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: button.c,v 1.9 2017/10/25 08:12:37 maya Exp $");
#include <sys/param.h>
#include <sys/conf.h>
@@ -312,11 +312,19 @@ filt_btn_read(struct knote *kn, long hin
return (kn->kn_data > 0);
}
-static const struct filterops btn_read_filtops =
- { 1, NULL, filt_btn_rdetach, filt_btn_read };
+static const struct filterops btn_read_filtops = {
+ .f_isfd = 1,
+ .f_attach = NULL,
+ .f_detach = filt_btn_rdetach,
+ .f_event = filt_btn_read,
+};
-static const struct filterops btn_write_filtops =
- { 1, NULL, filt_btn_rdetach, filt_seltrue };
+static const struct filterops btn_write_filtops = {
+ .f_isfd = 1,
+ .f_attach = NULL,
+ .f_detach = filt_btn_rdetach,
+ .f_event = filt_seltrue,
+};
int
btnkqfilter(dev_t dev, struct knote *kn)
Index: src/sys/arch/mac68k/dev/aed.c
diff -u src/sys/arch/mac68k/dev/aed.c:1.33 src/sys/arch/mac68k/dev/aed.c:1.34
--- src/sys/arch/mac68k/dev/aed.c:1.33 Fri Jul 25 08:10:33 2014
+++ src/sys/arch/mac68k/dev/aed.c Wed Oct 25 08:12:37 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: aed.c,v 1.33 2014/07/25 08:10:33 dholland Exp $ */
+/* $NetBSD: aed.c,v 1.34 2017/10/25 08:12:37 maya Exp $ */
/*
* Copyright (C) 1994 Bradley A. Grantham
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: aed.c,v 1.33 2014/07/25 08:10:33 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: aed.c,v 1.34 2017/10/25 08:12:37 maya Exp $");
#include "opt_adb.h"
@@ -597,11 +597,19 @@ filt_aedread(struct knote *kn, long hint
return (kn->kn_data > 0);
}
-static const struct filterops aedread_filtops =
- { 1, NULL, filt_aedrdetach, filt_aedread };
+static const struct filterops aedread_filtops = {
+ .f_isfd = 1,
+ .f_attach = NULL,
+ .f_detach = filt_aedrdetach,
+ .f_event = filt_aedread,
+};
-static const struct filterops aed_seltrue_filtops =
- { 1, NULL, filt_aedrdetach, filt_seltrue };
+static const struct filterops aed_seltrue_filtops = {
+ .f_isfd = 1,
+ .f_attach = NULL,
+ .f_detach = filt_aedrdetach,
+ .f_event = filt_seltrue,
+};
int
aedkqfilter(dev_t dev, struct knote *kn)
Index: src/sys/arch/macppc/dev/aed.c
diff -u src/sys/arch/macppc/dev/aed.c:1.29 src/sys/arch/macppc/dev/aed.c:1.30
--- src/sys/arch/macppc/dev/aed.c:1.29 Fri Jul 25 08:10:34 2014
+++ src/sys/arch/macppc/dev/aed.c Wed Oct 25 08:12:37 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: aed.c,v 1.29 2014/07/25 08:10:34 dholland Exp $ */
+/* $NetBSD: aed.c,v 1.30 2017/10/25 08:12:37 maya Exp $ */
/*
* Copyright (C) 1994 Bradley A. Grantham
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: aed.c,v 1.29 2014/07/25 08:10:34 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: aed.c,v 1.30 2017/10/25 08:12:37 maya Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -602,11 +602,19 @@ filt_aedread(struct knote *kn, long hint
return (kn->kn_data > 0);
}
-static const struct filterops aedread_filtops =
- { 1, NULL, filt_aedrdetach, filt_aedread };
+static const struct filterops aedread_filtops = {
+ .f_isfd = 1,
+ .f_attach = NULL,
+ .f_detach = filt_aedrdetach,
+ .f_event = filt_aedread
+};
-static const struct filterops aed_seltrue_filtops =
- { 1, NULL, filt_aedrdetach, filt_seltrue };
+static const struct filterops aed_seltrue_filtops = {
+ .f_isfd = 1,
+ .f_attach = NULL,
+ .f_detach = filt_aedrdetach,
+ .f_event = filt_seltrue
+};
int
aedkqfilter(dev_t dev, struct knote *kn)
Index: src/sys/arch/sandpoint/sandpoint/satmgr.c
diff -u src/sys/arch/sandpoint/sandpoint/satmgr.c:1.26 src/sys/arch/sandpoint/sandpoint/satmgr.c:1.27
--- src/sys/arch/sandpoint/sandpoint/satmgr.c:1.26 Fri Jul 25 08:10:34 2014
+++ src/sys/arch/sandpoint/sandpoint/satmgr.c Wed Oct 25 08:12:37 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: satmgr.c,v 1.26 2014/07/25 08:10:34 dholland Exp $ */
+/* $NetBSD: satmgr.c,v 1.27 2017/10/25 08:12:37 maya Exp $ */
/*-
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -602,8 +602,11 @@ filt_read(struct knote *kn, long hint)
return (kn->kn_data > 0);
}
-static const struct filterops read_filtops = {
- 1, NULL, filt_rdetach, filt_read
+static const struct filterops read_filtops ={
+ .f_isfd = 1,
+ .f_attach = NULL,
+ .f_detach = filt_rdetach,
+ .f_event = filt_read,
};
static int
Index: src/sys/arch/shark/shark/opms.c
diff -u src/sys/arch/shark/shark/opms.c:1.28 src/sys/arch/shark/shark/opms.c:1.29
--- src/sys/arch/shark/shark/opms.c:1.28 Thu Jul 7 06:55:38 2016
+++ src/sys/arch/shark/shark/opms.c Wed Oct 25 08:12:37 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: opms.c,v 1.28 2016/07/07 06:55:38 msaitoh Exp $ */
+/* $NetBSD: opms.c,v 1.29 2017/10/25 08:12:37 maya Exp $ */
/*
* Copyright 1997
@@ -91,7 +91,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: opms.c,v 1.28 2016/07/07 06:55:38 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: opms.c,v 1.29 2017/10/25 08:12:37 maya Exp $");
#include "opms.h"
#if NOPMS > 1
@@ -979,8 +979,12 @@ filt_opmsread(struct knote *kn, long hin
return (kn->kn_data > 0);
}
-static const struct filterops opmsread_filtops =
- { 1, NULL, filt_opmsrdetach, filt_opmsread };
+static const struct filterops opmsread_filtops = {
+ .f_isfd = 1,
+ .f_attach = NULL,
+ .f_detach = filt_opmsrdetach,
+ .f_event = filt_opmsread,
+};
int
opmskqfilter(dev_t dev, struct knote *kn)
Index: src/sys/arch/sparc/dev/tctrl.c
diff -u src/sys/arch/sparc/dev/tctrl.c:1.60 src/sys/arch/sparc/dev/tctrl.c:1.61
--- src/sys/arch/sparc/dev/tctrl.c:1.60 Sun Dec 11 16:25:54 2016
+++ src/sys/arch/sparc/dev/tctrl.c Wed Oct 25 08:12:37 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: tctrl.c,v 1.60 2016/12/11 16:25:54 christos Exp $ */
+/* $NetBSD: tctrl.c,v 1.61 2017/10/25 08:12:37 maya Exp $ */
/*-
* Copyright (c) 1998, 2005, 2006 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tctrl.c,v 1.60 2016/12/11 16:25:54 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tctrl.c,v 1.61 2017/10/25 08:12:37 maya Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -1230,8 +1230,12 @@ filt_tctrlread(struct knote *kn, long hi
return (kn->kn_data > 0);
}
-static const struct filterops tctrlread_filtops =
- { 1, NULL, filt_tctrlrdetach, filt_tctrlread };
+static const struct filterops tctrlread_filtops = {
+ .f_isfd = 1,
+ .f_attach = NULL,
+ .f_detach = filt_tctrlrdetach,
+ .f_event = filt_tctrlread,
+};
int
tctrlkqfilter(dev_t dev, struct knote *kn)
Index: src/sys/arch/x68k/dev/event.c
diff -u src/sys/arch/x68k/dev/event.c:1.14 src/sys/arch/x68k/dev/event.c:1.15
--- src/sys/arch/x68k/dev/event.c:1.14 Fri Mar 21 16:58:54 2014
+++ src/sys/arch/x68k/dev/event.c Wed Oct 25 08:12:38 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: event.c,v 1.14 2014/03/21 16:58:54 tsutsui Exp $ */
+/* $NetBSD: event.c,v 1.15 2017/10/25 08:12:38 maya Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -45,7 +45,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: event.c,v 1.14 2014/03/21 16:58:54 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: event.c,v 1.15 2017/10/25 08:12:38 maya Exp $");
#include <sys/param.h>
#include <sys/fcntl.h>
@@ -216,8 +216,12 @@ filt_evread(struct knote *kn, long hint)
return rv;
}
-static const struct filterops ev_filtops =
- { 1, NULL, filt_evrdetach, filt_evread };
+static const struct filterops ev_filtops = {
+ .f_isfd = 1,
+ .f_attach = NULL,
+ .f_detach = filt_evrdetach,
+ .f_event = filt_evread,
+};
int
ev_kqfilter(struct evvar *ev, struct knote *kn)
Index: src/sys/coda/coda_psdev.c
diff -u src/sys/coda/coda_psdev.c:1.57 src/sys/coda/coda_psdev.c:1.58
--- src/sys/coda/coda_psdev.c:1.57 Thu Jul 7 06:55:40 2016
+++ src/sys/coda/coda_psdev.c Wed Oct 25 08:12:38 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: coda_psdev.c,v 1.57 2016/07/07 06:55:40 msaitoh Exp $ */
+/* $NetBSD: coda_psdev.c,v 1.58 2017/10/25 08:12:38 maya Exp $ */
/*
*
@@ -54,7 +54,7 @@
/* These routines are the device entry points for Venus. */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: coda_psdev.c,v 1.57 2016/07/07 06:55:40 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: coda_psdev.c,v 1.58 2017/10/25 08:12:38 maya Exp $");
extern int coda_nc_initialized; /* Set if cache has been initialized */
@@ -486,8 +486,12 @@ filt_vc_nb_read(struct knote *kn, long h
return (1);
}
-static const struct filterops vc_nb_read_filtops =
- { 1, NULL, filt_vc_nb_detach, filt_vc_nb_read };
+static const struct filterops vc_nb_read_filtops = {
+ .f_isfd = 1,
+ .f_attach = NULL,
+ .f_detach = filt_vc_nb_detach,
+ .f_event = filt_vc_nb_read,
+};
int
vc_nb_kqfilter(dev_t dev, struct knote *kn)
Index: src/sys/dev/audio.c
diff -u src/sys/dev/audio.c:1.413 src/sys/dev/audio.c:1.414
--- src/sys/dev/audio.c:1.413 Sat Oct 21 09:58:56 2017
+++ src/sys/dev/audio.c Wed Oct 25 08:12:38 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: audio.c,v 1.413 2017/10/21 09:58:56 isaki Exp $ */
+/* $NetBSD: audio.c,v 1.414 2017/10/25 08:12:38 maya Exp $ */
/*-
* Copyright (c) 2016 Nathanial Sloss <nathanialsl...@yahoo.com.au>
@@ -148,7 +148,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: audio.c,v 1.413 2017/10/21 09:58:56 isaki Exp $");
+__KERNEL_RCSID(0, "$NetBSD: audio.c,v 1.414 2017/10/25 08:12:38 maya Exp $");
#ifdef _KERNEL_OPT
#include "audio.h"
@@ -3260,8 +3260,12 @@ filt_audioread(struct knote *kn, long hi
return kn->kn_data > 0;
}
-static const struct filterops audioread_filtops =
- { 1, NULL, filt_audiordetach, filt_audioread };
+static const struct filterops audioread_filtops = {
+ .f_isfd = 1,
+ .f_attach = NULL,
+ .f_detach = filt_audiordetach,
+ .f_event = filt_audioread,
+};
static void
filt_audiowdetach(struct knote *kn)
@@ -3305,8 +3309,12 @@ filt_audiowrite(struct knote *kn, long h
return kn->kn_data > 0;
}
-static const struct filterops audiowrite_filtops =
- { 1, NULL, filt_audiowdetach, filt_audiowrite };
+static const struct filterops audiowrite_filtops = {
+ .f_isfd = 1,
+ .f_attach = NULL,
+ .f_detach = filt_audiowdetach,
+ .f_event = filt_audiowrite,
+};
int
audio_kqfilter(struct audio_chan *chan, struct knote *kn)
Index: src/sys/dev/midi.c
diff -u src/sys/dev/midi.c:1.86 src/sys/dev/midi.c:1.87
--- src/sys/dev/midi.c:1.86 Thu Jun 1 09:44:30 2017
+++ src/sys/dev/midi.c Wed Oct 25 08:12:38 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: midi.c,v 1.86 2017/06/01 09:44:30 pgoyette Exp $ */
+/* $NetBSD: midi.c,v 1.87 2017/10/25 08:12:38 maya Exp $ */
/*
* Copyright (c) 1998, 2008 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: midi.c,v 1.86 2017/06/01 09:44:30 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: midi.c,v 1.87 2017/10/25 08:12:38 maya Exp $");
#ifdef _KERNEL_OPT
#include "midi.h"
@@ -1763,8 +1763,12 @@ filt_midiread(struct knote *kn, long hin
return (kn->kn_data > 0);
}
-static const struct filterops midiread_filtops =
- { 1, NULL, filt_midirdetach, filt_midiread };
+static const struct filterops midiread_filtops = {
+ .f_isfd = 1,
+ .f_attach = NULL,
+ .f_detach = filt_midirdetach,
+ .f_event = filt_midiread,
+};
static void
filt_midiwdetach(struct knote *kn)
@@ -1807,8 +1811,12 @@ filt_midiwrite(struct knote *kn, long hi
return (kn->kn_data > 0);
}
-static const struct filterops midiwrite_filtops =
- { 1, NULL, filt_midiwdetach, filt_midiwrite };
+static const struct filterops midiwrite_filtops = {
+ .f_isfd = 1,
+ .f_attach = NULL,
+ .f_detach = filt_midiwdetach,
+ .f_event = filt_midiwrite,
+};
int
midikqfilter(dev_t dev, struct knote *kn)
Index: src/sys/dev/sequencer.c
diff -u src/sys/dev/sequencer.c:1.66 src/sys/dev/sequencer.c:1.67
--- src/sys/dev/sequencer.c:1.66 Thu Jun 1 09:44:30 2017
+++ src/sys/dev/sequencer.c Wed Oct 25 08:12:38 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: sequencer.c,v 1.66 2017/06/01 09:44:30 pgoyette Exp $ */
+/* $NetBSD: sequencer.c,v 1.67 2017/10/25 08:12:38 maya Exp $ */
/*
* Copyright (c) 1998, 2008 The NetBSD Foundation, Inc.
@@ -55,7 +55,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sequencer.c,v 1.66 2017/06/01 09:44:30 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sequencer.c,v 1.67 2017/10/25 08:12:38 maya Exp $");
#ifdef _KERNEL_OPT
#include "sequencer.h"
@@ -912,8 +912,12 @@ filt_sequencerread(struct knote *kn, lon
return rv;
}
-static const struct filterops sequencerread_filtops =
- { 1, NULL, filt_sequencerrdetach, filt_sequencerread };
+static const struct filterops sequencerread_filtops = {
+ .f_isfd = 1,
+ .f_attach = NULL,
+ .f_detach = filt_sequencerrdetach,
+ .f_event = filt_sequencerread,
+};
static void
filt_sequencerwdetach(struct knote *kn)
@@ -946,8 +950,12 @@ filt_sequencerwrite(struct knote *kn, lo
return rv;
}
-static const struct filterops sequencerwrite_filtops =
- { 1, NULL, filt_sequencerwdetach, filt_sequencerwrite };
+static const struct filterops sequencerwrite_filtops = {
+ .f_isfd = 1,
+ .f_attach = NULL,
+ .f_detach = filt_sequencerwdetach,
+ .f_event = filt_sequencerwrite,
+};
static int
sequencerkqfilter(dev_t dev, struct knote *kn)
Index: src/sys/dev/apm/apm.c
diff -u src/sys/dev/apm/apm.c:1.31 src/sys/dev/apm/apm.c:1.32
--- src/sys/dev/apm/apm.c:1.31 Fri Jul 25 08:10:36 2014
+++ src/sys/dev/apm/apm.c Wed Oct 25 08:12:38 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: apm.c,v 1.31 2014/07/25 08:10:36 dholland Exp $ */
+/* $NetBSD: apm.c,v 1.32 2017/10/25 08:12:38 maya Exp $ */
/*-
* Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: apm.c,v 1.31 2014/07/25 08:10:36 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: apm.c,v 1.32 2017/10/25 08:12:38 maya Exp $");
#include "opt_apm.h"
@@ -883,8 +883,12 @@ filt_apmread(struct knote *kn, long hint
return (kn->kn_data > 0);
}
-static const struct filterops apmread_filtops =
- { 1, NULL, filt_apmrdetach, filt_apmread };
+static const struct filterops apmread_filtops = {
+ .f_isfd = 1,
+ .f_attach = NULL,
+ .f_detach = filt_apmrdetach,
+ .f_event = filt_apmread,
+};
int
apmkqfilter(dev_t dev, struct knote *kn)
Index: src/sys/dev/hpc/apm/apmdev.c
diff -u src/sys/dev/hpc/apm/apmdev.c:1.30 src/sys/dev/hpc/apm/apmdev.c:1.31
--- src/sys/dev/hpc/apm/apmdev.c:1.30 Fri Jul 25 08:10:37 2014
+++ src/sys/dev/hpc/apm/apmdev.c Wed Oct 25 08:12:38 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: apmdev.c,v 1.30 2014/07/25 08:10:37 dholland Exp $ */
+/* $NetBSD: apmdev.c,v 1.31 2017/10/25 08:12:38 maya Exp $ */
/*-
* Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: apmdev.c,v 1.30 2014/07/25 08:10:37 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: apmdev.c,v 1.31 2017/10/25 08:12:38 maya Exp $");
#ifdef _KERNEL_OPT
#include "opt_apm.h"
@@ -925,8 +925,12 @@ filt_apmread(struct knote *kn, long hint
return (kn->kn_data > 0);
}
-static const struct filterops apmread_filtops =
- { 1, NULL, filt_apmrdetach, filt_apmread };
+static const struct filterops apmread_filtops = {
+ .f_isfd = 1,
+ .f_attach = NULL,
+ .f_detach = filt_apmrdetach,
+ .f_event = filt_apmread,
+};
int
apmdevkqfilter(dev_t dev, struct knote *kn)
Index: src/sys/dev/ir/irframe_tty.c
diff -u src/sys/dev/ir/irframe_tty.c:1.61 src/sys/dev/ir/irframe_tty.c:1.62
--- src/sys/dev/ir/irframe_tty.c:1.61 Thu Aug 20 14:40:18 2015
+++ src/sys/dev/ir/irframe_tty.c Wed Oct 25 08:12:38 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: irframe_tty.c,v 1.61 2015/08/20 14:40:18 christos Exp $ */
+/* $NetBSD: irframe_tty.c,v 1.62 2017/10/25 08:12:38 maya Exp $ */
/*
* TODO
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: irframe_tty.c,v 1.61 2015/08/20 14:40:18 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: irframe_tty.c,v 1.62 2017/10/25 08:12:38 maya Exp $");
#include <sys/param.h>
#include <sys/proc.h>
@@ -823,10 +823,19 @@ filt_irframetwrite(struct knote *kn, lon
return (0);
}
-static const struct filterops irframetread_filtops =
- { 1, NULL, filt_irframetrdetach, filt_irframetread };
-static const struct filterops irframetwrite_filtops =
- { 1, NULL, filt_irframetwdetach, filt_irframetwrite };
+static const struct filterops irframetread_filtops = {
+ .f_isfd = 1,
+ .f_attach = NULL,
+ .f_detach = filt_irframetrdetach,
+ .f_event = filt_irframetread,
+};
+
+static const struct filterops irframetwrite_filtops = {
+ .f_isfd = 1,
+ .f_attach = NULL,
+ .f_detach = filt_irframetwdetach,
+ .f_event = filt_irframetwrite,
+};
int
irframet_kqfilter(void *h, struct knote *kn)
Index: src/sys/dev/isa/satlink.c
diff -u src/sys/dev/isa/satlink.c:1.45 src/sys/dev/isa/satlink.c:1.46
--- src/sys/dev/isa/satlink.c:1.45 Fri Jul 25 08:10:37 2014
+++ src/sys/dev/isa/satlink.c Wed Oct 25 08:12:38 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: satlink.c,v 1.45 2014/07/25 08:10:37 dholland Exp $ */
+/* $NetBSD: satlink.c,v 1.46 2017/10/25 08:12:38 maya Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: satlink.c,v 1.45 2014/07/25 08:10:37 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: satlink.c,v 1.46 2017/10/25 08:12:38 maya Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -456,11 +456,19 @@ filt_satlinkread(struct knote *kn, long
return (1);
}
-static const struct filterops satlinkread_filtops =
- { 1, NULL, filt_satlinkrdetach, filt_satlinkread };
+static const struct filterops satlinkread_filtops = {
+ .f_isfd = 1,
+ .f_attach = NULL,
+ .f_detach = filt_satlinkrdetach,
+ .f_event = filt_satlinkread,
+};
-static const struct filterops satlink_seltrue_filtops =
- { 1, NULL, filt_satlinkrdetach, filt_seltrue };
+static const struct filterops satlink_seltrue_filtops = {
+ .f_isfd = 1,
+ .f_attach = NULL,
+ .f_detach = filt_satlinkrdetach,
+ .f_event = filt_seltrue,
+};
int
satlinkkqfilter(dev_t dev, struct knote *kn)
Index: src/sys/dev/pci/oboe.c
diff -u src/sys/dev/pci/oboe.c:1.44 src/sys/dev/pci/oboe.c:1.45
--- src/sys/dev/pci/oboe.c:1.44 Sun Aug 20 10:55:37 2017
+++ src/sys/dev/pci/oboe.c Wed Oct 25 08:12:38 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: oboe.c,v 1.44 2017/08/20 10:55:37 maxv Exp $ */
+/* $NetBSD: oboe.c,v 1.45 2017/10/25 08:12:38 maya Exp $ */
/* XXXXFVDL THIS DRIVER IS BROKEN FOR NON-i386 -- vtophys() usage */
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: oboe.c,v 1.44 2017/08/20 10:55:37 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: oboe.c,v 1.45 2017/10/25 08:12:38 maya Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -493,10 +493,19 @@ filt_oboewdetach(struct knote *kn)
splx(s);
}
-static const struct filterops oboeread_filtops =
- { 1, NULL, filt_oboerdetach, filt_oboeread };
-static const struct filterops oboewrite_filtops =
- { 1, NULL, filt_oboewdetach, filt_seltrue };
+static const struct filterops oboeread_filtops = {
+ .f_isfd = 1,
+ .f_attach = NULL,
+ .f_detach = filt_oboerdetach,
+ .f_event = filt_oboeread,
+};
+
+static const struct filterops oboewrite_filtops = {
+ .f_isfd = 1,
+ .f_attach = NULL,
+ .f_detach = filt_oboewdetach,
+ .f_event = filt_seltrue,
+};
static int
oboe_kqfilter(void *h, struct knote *kn)
Index: src/sys/dev/putter/putter.c
diff -u src/sys/dev/putter/putter.c:1.35 src/sys/dev/putter/putter.c:1.36
--- src/sys/dev/putter/putter.c:1.35 Fri Jul 25 08:10:38 2014
+++ src/sys/dev/putter/putter.c Wed Oct 25 08:12:38 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: putter.c,v 1.35 2014/07/25 08:10:38 dholland Exp $ */
+/* $NetBSD: putter.c,v 1.36 2017/10/25 08:12:38 maya Exp $ */
/*
* Copyright (c) 2006, 2007 Antti Kantee. All Rights Reserved.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: putter.c,v 1.35 2014/07/25 08:10:38 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: putter.c,v 1.36 2017/10/25 08:12:38 maya Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -490,8 +490,12 @@ filt_putter(struct knote *kn, long hint)
return rv;
}
-static const struct filterops putter_filtops =
- { 1, NULL, filt_putterdetach, filt_putter };
+static const struct filterops putter_filtops = {
+ .f_isfd = 1,
+ .f_attach = NULL,
+ .f_detach = filt_putterdetach,
+ .f_event = filt_putter,
+};
static int
putter_fop_kqfilter(file_t *fp, struct knote *kn)
Index: src/sys/dev/qbus/qd.c
diff -u src/sys/dev/qbus/qd.c:1.56 src/sys/dev/qbus/qd.c:1.57
--- src/sys/dev/qbus/qd.c:1.56 Sat Oct 18 08:33:28 2014
+++ src/sys/dev/qbus/qd.c Wed Oct 25 08:12:38 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: qd.c,v 1.56 2014/10/18 08:33:28 snj Exp $ */
+/* $NetBSD: qd.c,v 1.57 2017/10/25 08:12:38 maya Exp $ */
/*-
* Copyright (c) 1988 Regents of the University of California.
@@ -58,7 +58,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: qd.c,v 1.56 2014/10/18 08:33:28 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: qd.c,v 1.57 2017/10/25 08:12:38 maya Exp $");
#include "opt_ddb.h"
@@ -1580,11 +1580,19 @@ filt_qdwrite(struct knote *kn, long hint
return (1);
}
-static const struct filterops qdread_filtops =
- { 1, NULL, filt_qdrdetach, filt_qdread };
+static const struct filterops qdread_filtops = {
+ .f_isfd = 1,
+ .f_attach = NULL,
+ .f_detach = filt_qdrdetach,
+ .f_event = filt_qdread,
+};
-static const struct filterops qdwrite_filtops =
- { 1, NULL, filt_qdrdetach, filt_qdwrite };
+static const struct filterops qdwrite_filtops = {
+ .f_isfd = 1,
+ .f_attach = NULL,
+ .f_detach = filt_qdrdetach,
+ .f_event = filt_qdwrite,
+};
int
qdkqfilter(dev_t dev, struct knote *kn)
Index: src/sys/dev/sbus/bpp.c
diff -u src/sys/dev/sbus/bpp.c:1.41 src/sys/dev/sbus/bpp.c:1.42
--- src/sys/dev/sbus/bpp.c:1.41 Fri Jul 25 08:10:38 2014
+++ src/sys/dev/sbus/bpp.c Wed Oct 25 08:12:38 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: bpp.c,v 1.41 2014/07/25 08:10:38 dholland Exp $ */
+/* $NetBSD: bpp.c,v 1.42 2017/10/25 08:12:38 maya Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bpp.c,v 1.41 2014/07/25 08:10:38 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bpp.c,v 1.42 2017/10/25 08:12:38 maya Exp $");
#include <sys/param.h>
#include <sys/ioctl.h>
@@ -520,8 +520,12 @@ filt_bppread(struct knote *kn, long hint
return 0;
}
-static const struct filterops bppread_filtops =
- { 1, NULL, filt_bpprdetach, filt_bppread };
+static const struct filterops bppread_filtops = {
+ .f_isfd = 1,
+ .f_attach = NULL,
+ .f_detach = filt_bpprdetach,
+ .f_event = filt_bppread,
+};
static void
filt_bppwdetach(struct knote *kn)
@@ -546,8 +550,12 @@ filt_bpfwrite(struct knote *kn, long hin
return 1;
}
-static const struct filterops bppwrite_filtops =
- { 1, NULL, filt_bppwdetach, filt_bpfwrite };
+static const struct filterops bppwrite_filtops = {
+ .f_isfd = 1,
+ .f_attach = NULL,
+ .f_detach = filt_bppwdetach,
+ .f_event = filt_bpfwrite,
+};
int
bppkqfilter(dev_t dev, struct knote *kn)
Index: src/sys/dev/scsipi/ch.c
diff -u src/sys/dev/scsipi/ch.c:1.91 src/sys/dev/scsipi/ch.c:1.92
--- src/sys/dev/scsipi/ch.c:1.91 Sun Nov 20 15:37:19 2016
+++ src/sys/dev/scsipi/ch.c Wed Oct 25 08:12:39 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: ch.c,v 1.91 2016/11/20 15:37:19 mlelstv Exp $ */
+/* $NetBSD: ch.c,v 1.92 2017/10/25 08:12:39 maya Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 1999, 2004 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ch.c,v 1.91 2016/11/20 15:37:19 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ch.c,v 1.92 2017/10/25 08:12:39 maya Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -487,11 +487,19 @@ filt_chread(struct knote *kn, long hint)
return (1);
}
-static const struct filterops chread_filtops =
- { 1, NULL, filt_chdetach, filt_chread };
+static const struct filterops chread_filtops = {
+ .f_isfd = 1,
+ .f_attach = NULL,
+ .f_detach = filt_chdetach,
+ .f_event = filt_chread,
+};
-static const struct filterops chwrite_filtops =
- { 1, NULL, filt_chdetach, filt_seltrue };
+static const struct filterops chwrite_filtops = {
+ .f_isfd = 1,
+ .f_attach = NULL,
+ .f_detach = filt_chdetach,
+ .f_event = filt_seltrue,
+};
static int
chkqfilter(dev_t dev, struct knote *kn)
Index: src/sys/dev/sun/event.c
diff -u src/sys/dev/sun/event.c:1.23 src/sys/dev/sun/event.c:1.24
--- src/sys/dev/sun/event.c:1.23 Sat Mar 14 15:36:21 2009
+++ src/sys/dev/sun/event.c Wed Oct 25 08:12:39 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: event.c,v 1.23 2009/03/14 15:36:21 dsl Exp $ */
+/* $NetBSD: event.c,v 1.24 2017/10/25 08:12:39 maya Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -45,7 +45,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: event.c,v 1.23 2009/03/14 15:36:21 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: event.c,v 1.24 2017/10/25 08:12:39 maya Exp $");
#include <sys/param.h>
#include <sys/fcntl.h>
@@ -196,8 +196,12 @@ filt_evread(struct knote *kn, long hint)
return (1);
}
-static const struct filterops ev_filtops =
- { 1, NULL, filt_evrdetach, filt_evread };
+static const struct filterops ev_filtops = {
+ .f_isfd = 1,
+ .f_attach = NULL,
+ .f_detach = filt_evrdetach,
+ .f_event = filt_evread,
+};
int
ev_kqfilter(struct evvar *ev, struct knote *kn)
Index: src/sys/dev/sysmon/sysmon_power.c
diff -u src/sys/dev/sysmon/sysmon_power.c:1.57 src/sys/dev/sysmon/sysmon_power.c:1.58
--- src/sys/dev/sysmon/sysmon_power.c:1.57 Mon Dec 14 01:08:47 2015
+++ src/sys/dev/sysmon/sysmon_power.c Wed Oct 25 08:12:39 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: sysmon_power.c,v 1.57 2015/12/14 01:08:47 pgoyette Exp $ */
+/* $NetBSD: sysmon_power.c,v 1.58 2017/10/25 08:12:39 maya Exp $ */
/*-
* Copyright (c) 2007 Juan Romero Pardines.
@@ -69,7 +69,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sysmon_power.c,v 1.57 2015/12/14 01:08:47 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sysmon_power.c,v 1.58 2017/10/25 08:12:39 maya Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
@@ -557,11 +557,19 @@ filt_sysmon_power_read(struct knote *kn,
return kn->kn_data > 0;
}
-static const struct filterops sysmon_power_read_filtops =
- { 1, NULL, filt_sysmon_power_rdetach, filt_sysmon_power_read };
+static const struct filterops sysmon_power_read_filtops = {
+ .f_isfd = 1,
+ .f_attach = NULL,
+ .f_detach = filt_sysmon_power_rdetach,
+ .f_event = filt_sysmon_power_read,
+};
-static const struct filterops sysmon_power_write_filtops =
- { 1, NULL, filt_sysmon_power_rdetach, filt_seltrue };
+static const struct filterops sysmon_power_write_filtops = {
+ .f_isfd = 1,
+ .f_attach = NULL,
+ .f_detach = filt_sysmon_power_rdetach,
+ .f_event = filt_seltrue,
+};
/*
* sysmonkqfilter_power:
Index: src/sys/dev/usb/udsir.c
diff -u src/sys/dev/usb/udsir.c:1.4 src/sys/dev/usb/udsir.c:1.5
--- src/sys/dev/usb/udsir.c:1.4 Thu Jun 1 02:45:12 2017
+++ src/sys/dev/usb/udsir.c Wed Oct 25 08:12:39 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: udsir.c,v 1.4 2017/06/01 02:45:12 chs Exp $ */
+/* $NetBSD: udsir.c,v 1.5 2017/10/25 08:12:39 maya Exp $ */
/*
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: udsir.c,v 1.4 2017/06/01 02:45:12 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: udsir.c,v 1.5 2017/10/25 08:12:39 maya Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -662,10 +662,19 @@ udsir_poll(void *h, int events, struct l
return revents;
}
-static const struct filterops udsirread_filtops =
- { 1, NULL, filt_udsirrdetach, filt_udsirread };
-static const struct filterops udsirwrite_filtops =
- { 1, NULL, filt_udsirwdetach, filt_udsirwrite };
+static const struct filterops udsirread_filtops = {
+ .f_isfd = 1,
+ .f_attach = NULL,
+ .f_detach = filt_udsirrdetach,
+ .f_event = filt_udsirread,
+};
+
+static const struct filterops udsirwrite_filtops = {
+ .f_isfd = 1,
+ .f_attach = NULL,
+ .f_detach = filt_udsirwdetach,
+ .f_event = filt_udsirwrite,
+};
static int
udsir_kqfilter(void *h, struct knote *kn)
Index: src/sys/dev/usb/ugen.c
diff -u src/sys/dev/usb/ugen.c:1.135 src/sys/dev/usb/ugen.c:1.136
--- src/sys/dev/usb/ugen.c:1.135 Tue Sep 5 05:03:02 2017
+++ src/sys/dev/usb/ugen.c Wed Oct 25 08:12:39 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: ugen.c,v 1.135 2017/09/05 05:03:02 mrg Exp $ */
+/* $NetBSD: ugen.c,v 1.136 2017/10/25 08:12:39 maya Exp $ */
/*
* Copyright (c) 1998, 2004 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ugen.c,v 1.135 2017/09/05 05:03:02 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ugen.c,v 1.136 2017/10/25 08:12:39 maya Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
@@ -2025,17 +2025,33 @@ filt_ugenwrite_bulk(struct knote *kn, lo
return 1;
}
-static const struct filterops ugenread_intr_filtops =
- { 1, NULL, filt_ugenrdetach, filt_ugenread_intr };
+static const struct filterops ugenread_intr_filtops = {
+ .f_isfd = 1,
+ .f_attach = NULL,
+ .f_detach = filt_ugenrdetach,
+ .f_event = filt_ugenread_intr,
+};
-static const struct filterops ugenread_isoc_filtops =
- { 1, NULL, filt_ugenrdetach, filt_ugenread_isoc };
+static const struct filterops ugenread_isoc_filtops = {
+ .f_isfd = 1,
+ .f_attach = NULL,
+ .f_detach = filt_ugenrdetach,
+ .f_event = filt_ugenread_isoc,
+};
-static const struct filterops ugenread_bulk_filtops =
- { 1, NULL, filt_ugenrdetach, filt_ugenread_bulk };
+static const struct filterops ugenread_bulk_filtops = {
+ .f_isfd = 1,
+ .f_attach = NULL,
+ .f_detach = filt_ugenrdetach,
+ .f_event = filt_ugenread_bulk,
+};
-static const struct filterops ugenwrite_bulk_filtops =
- { 1, NULL, filt_ugenrdetach, filt_ugenwrite_bulk };
+static const struct filterops ugenwrite_bulk_filtops = {
+ .f_isfd = 1,
+ .f_attach = NULL,
+ .f_detach = filt_ugenrdetach,
+ .f_event = filt_ugenwrite_bulk,
+};
int
ugenkqfilter(dev_t dev, struct knote *kn)
Index: src/sys/dev/usb/uhid.c
diff -u src/sys/dev/usb/uhid.c:1.99 src/sys/dev/usb/uhid.c:1.100
--- src/sys/dev/usb/uhid.c:1.99 Sat Mar 11 12:41:14 2017
+++ src/sys/dev/usb/uhid.c Wed Oct 25 08:12:39 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: uhid.c,v 1.99 2017/03/11 12:41:14 maya Exp $ */
+/* $NetBSD: uhid.c,v 1.100 2017/10/25 08:12:39 maya Exp $ */
/*
* Copyright (c) 1998, 2004, 2008, 2012 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uhid.c,v 1.99 2017/03/11 12:41:14 maya Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uhid.c,v 1.100 2017/10/25 08:12:39 maya Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
@@ -750,11 +750,19 @@ filt_uhidread(struct knote *kn, long hin
return kn->kn_data > 0;
}
-static const struct filterops uhidread_filtops =
- { 1, NULL, filt_uhidrdetach, filt_uhidread };
+static const struct filterops uhidread_filtops = {
+ .f_isfd = 1,
+ .f_attach = NULL,
+ .f_detach = filt_uhidrdetach,
+ .f_event = filt_uhidread,
+};
-static const struct filterops uhid_seltrue_filtops =
- { 1, NULL, filt_uhidrdetach, filt_seltrue };
+static const struct filterops uhid_seltrue_filtops = {
+ .f_isfd = 1,
+ .f_attach = NULL,
+ .f_detach = filt_uhidrdetach,
+ .f_event = filt_seltrue,
+};
int
uhidkqfilter(dev_t dev, struct knote *kn)
Index: src/sys/dev/usb/uirda.c
diff -u src/sys/dev/usb/uirda.c:1.41 src/sys/dev/usb/uirda.c:1.42
--- src/sys/dev/usb/uirda.c:1.41 Fri Nov 25 12:56:29 2016
+++ src/sys/dev/usb/uirda.c Wed Oct 25 08:12:39 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: uirda.c,v 1.41 2016/11/25 12:56:29 skrll Exp $ */
+/* $NetBSD: uirda.c,v 1.42 2017/10/25 08:12:39 maya Exp $ */
/*
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uirda.c,v 1.41 2016/11/25 12:56:29 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uirda.c,v 1.42 2017/10/25 08:12:39 maya Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -640,10 +640,19 @@ filt_uirdawdetach(struct knote *kn)
splx(s);
}
-static const struct filterops uirdaread_filtops =
- { 1, NULL, filt_uirdardetach, filt_uirdaread };
-static const struct filterops uirdawrite_filtops =
- { 1, NULL, filt_uirdawdetach, filt_seltrue };
+static const struct filterops uirdaread_filtops = {
+ .f_isfd = 1,
+ .f_attach = NULL,
+ .f_detach = filt_uirdardetach,
+ .f_event = filt_uirdaread,
+};
+
+static const struct filterops uirdawrite_filtops = {
+ .f_isfd = 1,
+ .f_attach = NULL,
+ .f_detach = filt_uirdawdetach,
+ .f_event = filt_seltrue,
+};
int
uirda_kqfilter(void *h, struct knote *kn)
Index: src/sys/dev/usb/usb.c
diff -u src/sys/dev/usb/usb.c:1.166 src/sys/dev/usb/usb.c:1.167
--- src/sys/dev/usb/usb.c:1.166 Fri Sep 1 15:19:59 2017
+++ src/sys/dev/usb/usb.c Wed Oct 25 08:12:39 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: usb.c,v 1.166 2017/09/01 15:19:59 skrll Exp $ */
+/* $NetBSD: usb.c,v 1.167 2017/10/25 08:12:39 maya Exp $ */
/*
* Copyright (c) 1998, 2002, 2008, 2012 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: usb.c,v 1.166 2017/09/01 15:19:59 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: usb.c,v 1.167 2017/10/25 08:12:39 maya Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -875,8 +875,12 @@ filt_usbread(struct knote *kn, long hint
return 1;
}
-static const struct filterops usbread_filtops =
- { 1, NULL, filt_usbrdetach, filt_usbread };
+static const struct filterops usbread_filtops = {
+ .f_isfd = 1,
+ .f_attach = NULL,
+ .f_detach = filt_usbrdetach,
+ .f_event = filt_usbread,
+};
int
usbkqfilter(dev_t dev, struct knote *kn)
Index: src/sys/dev/usb/uscanner.c
diff -u src/sys/dev/usb/uscanner.c:1.80 src/sys/dev/usb/uscanner.c:1.81
--- src/sys/dev/usb/uscanner.c:1.80 Sun Dec 4 10:12:35 2016
+++ src/sys/dev/usb/uscanner.c Wed Oct 25 08:12:39 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: uscanner.c,v 1.80 2016/12/04 10:12:35 skrll Exp $ */
+/* $NetBSD: uscanner.c,v 1.81 2017/10/25 08:12:39 maya Exp $ */
/*
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uscanner.c,v 1.80 2016/12/04 10:12:35 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uscanner.c,v 1.81 2017/10/25 08:12:39 maya Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -676,8 +676,12 @@ filt_uscannerdetach(struct knote *kn)
SLIST_REMOVE(&sc->sc_selq.sel_klist, kn, knote, kn_selnext);
}
-static const struct filterops uscanner_seltrue_filtops =
- { 1, NULL, filt_uscannerdetach, filt_seltrue };
+static const struct filterops uscanner_seltrue_filtops = {
+ .f_isfd = 1,
+ .f_attach = NULL,
+ .f_detach = filt_uscannerdetach,
+ .f_event = filt_seltrue,
+};
int
uscannerkqfilter(dev_t dev, struct knote *kn)
Index: src/sys/dev/usb/ustir.c
diff -u src/sys/dev/usb/ustir.c:1.37 src/sys/dev/usb/ustir.c:1.38
--- src/sys/dev/usb/ustir.c:1.37 Thu Jun 1 02:45:12 2017
+++ src/sys/dev/usb/ustir.c Wed Oct 25 08:12:39 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: ustir.c,v 1.37 2017/06/01 02:45:12 chs Exp $ */
+/* $NetBSD: ustir.c,v 1.38 2017/10/25 08:12:39 maya Exp $ */
/*
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ustir.c,v 1.37 2017/06/01 02:45:12 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ustir.c,v 1.38 2017/10/25 08:12:39 maya Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -1087,10 +1087,19 @@ filt_ustirwrite(struct knote *kn, long h
return sc->sc_direction != udir_input;
}
-static const struct filterops ustirread_filtops =
- { 1, NULL, filt_ustirrdetach, filt_ustirread };
-static const struct filterops ustirwrite_filtops =
- { 1, NULL, filt_ustirwdetach, filt_ustirwrite };
+static const struct filterops ustirread_filtops = {
+ .f_isfd = 1,
+ .f_attach = NULL,
+ .f_detach = filt_ustirrdetach,
+ .f_event = filt_ustirread,
+};
+
+static const struct filterops ustirwrite_filtops = {
+ .f_isfd = 1,
+ .f_attach = NULL,
+ .f_detach = filt_ustirwdetach,
+ .f_event = filt_ustirwrite,
+};
Static int
ustir_kqfilter(void *h, struct knote *kn)
Index: src/sys/dev/wscons/wsevent.c
diff -u src/sys/dev/wscons/wsevent.c:1.36 src/sys/dev/wscons/wsevent.c:1.37
--- src/sys/dev/wscons/wsevent.c:1.36 Mon Aug 24 22:50:33 2015
+++ src/sys/dev/wscons/wsevent.c Wed Oct 25 08:12:39 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: wsevent.c,v 1.36 2015/08/24 22:50:33 pooka Exp $ */
+/* $NetBSD: wsevent.c,v 1.37 2017/10/25 08:12:39 maya Exp $ */
/*-
* Copyright (c) 2006, 2008 The NetBSD Foundation, Inc.
@@ -104,7 +104,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wsevent.c,v 1.36 2015/08/24 22:50:33 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wsevent.c,v 1.37 2017/10/25 08:12:39 maya Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
@@ -340,8 +340,12 @@ filt_wseventread(struct knote *kn, long
return (1);
}
-static const struct filterops wsevent_filtops =
- { 1, NULL, filt_wseventrdetach, filt_wseventread };
+static const struct filterops wsevent_filtops = {
+ .f_isfd = 1,
+ .f_attach = NULL,
+ .f_detach = filt_wseventrdetach,
+ .f_event = filt_wseventread,
+};
int
wsevent_kqfilter(struct wseventvar *ev, struct knote *kn)
Index: src/sys/external/bsd/drm2/drm/drm_drv.c
diff -u src/sys/external/bsd/drm2/drm/drm_drv.c:1.17 src/sys/external/bsd/drm2/drm/drm_drv.c:1.18
--- src/sys/external/bsd/drm2/drm/drm_drv.c:1.17 Mon Nov 9 22:04:53 2015
+++ src/sys/external/bsd/drm2/drm/drm_drv.c Wed Oct 25 08:12:39 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: drm_drv.c,v 1.17 2015/11/09 22:04:53 jmcneill Exp $ */
+/* $NetBSD: drm_drv.c,v 1.18 2017/10/25 08:12:39 maya Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: drm_drv.c,v 1.17 2015/11/09 22:04:53 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_drv.c,v 1.18 2017/10/25 08:12:39 maya Exp $");
#include <sys/param.h>
#include <sys/types.h>
@@ -510,8 +510,12 @@ drm_poll(struct file *fp __unused, int e
static void filt_drm_detach(struct knote *);
static int filt_drm_event(struct knote *, long);
-static const struct filterops drm_filtops =
- { 1, NULL, filt_drm_detach, filt_drm_event };
+static const struct filterops drm_filtops = {
+ .f_isfd = 1,
+ .f_attach = NULL,
+ .f_detach = filt_drm_detach,
+ .f_event = filt_drm_event,
+};
static int
drm_kqfilter(struct file *fp, struct knote *kn)
Index: src/sys/fs/smbfs/smbfs_kq.c
diff -u src/sys/fs/smbfs/smbfs_kq.c:1.26 src/sys/fs/smbfs/smbfs_kq.c:1.27
--- src/sys/fs/smbfs/smbfs_kq.c:1.26 Thu Oct 17 21:04:44 2013
+++ src/sys/fs/smbfs/smbfs_kq.c Wed Oct 25 08:12:39 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: smbfs_kq.c,v 1.26 2013/10/17 21:04:44 christos Exp $ */
+/* $NetBSD: smbfs_kq.c,v 1.27 2017/10/25 08:12:39 maya Exp $ */
/*-
* Copyright (c) 2003, 2008 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: smbfs_kq.c,v 1.26 2013/10/17 21:04:44 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: smbfs_kq.c,v 1.27 2017/10/25 08:12:39 maya Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -409,10 +409,19 @@ filt_smbfsvnode(struct knote *kn, long h
return (kn->kn_fflags != 0);
}
-static const struct filterops smbfsread_filtops =
- { 1, NULL, filt_smbfsdetach, filt_smbfsread };
-static const struct filterops smbfsvnode_filtops =
- { 1, NULL, filt_smbfsdetach, filt_smbfsvnode };
+static const struct filterops smbfsread_filtops = {
+ .f_isfd = 1,
+ .f_attach = NULL,
+ .f_detach = filt_smbfsdetach,
+ .f_event = filt_smbfsread,
+};
+
+static const struct filterops smbfsvnode_filtops = {
+ .f_isfd = 1,
+ .f_attach = NULL,
+ .f_detach = filt_smbfsdetach,
+ .f_event = filt_smbfsvnode,
+};
int
smbfs_kqfilter(void *v)
Index: src/sys/kern/kern_event.c
diff -u src/sys/kern/kern_event.c:1.95 src/sys/kern/kern_event.c:1.96
--- src/sys/kern/kern_event.c:1.95 Wed Oct 25 06:02:40 2017
+++ src/sys/kern/kern_event.c Wed Oct 25 08:12:39 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_event.c,v 1.95 2017/10/25 06:02:40 riastradh Exp $ */
+/* $NetBSD: kern_event.c,v 1.96 2017/10/25 08:12:39 maya Exp $ */
/*-
* Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
@@ -58,7 +58,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_event.c,v 1.95 2017/10/25 06:02:40 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_event.c,v 1.96 2017/10/25 08:12:39 maya Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -119,14 +119,33 @@ static const struct fileops kqueueops =
.fo_restart = fnullop_restart,
};
-static const struct filterops kqread_filtops =
- { 1, NULL, filt_kqdetach, filt_kqueue };
-static const struct filterops proc_filtops =
- { 0, filt_procattach, filt_procdetach, filt_proc };
-static const struct filterops file_filtops =
- { 1, filt_fileattach, NULL, NULL };
-static const struct filterops timer_filtops =
- { 0, filt_timerattach, filt_timerdetach, filt_timer };
+static const struct filterops kqread_filtops = {
+ .f_isfd = 1,
+ .f_attach = NULL,
+ .f_detach = filt_kqdetach,
+ .f_event = filt_kqueue,
+};
+
+static const struct filterops proc_filtops = {
+ .f_isfd = 0,
+ .f_attach = filt_procattach,
+ .f_detach = filt_procdetach,
+ .f_event = filt_proc,
+};
+
+static const struct filterops file_filtops = {
+ .f_isfd = 1,
+ .f_attach = filt_fileattach,
+ .f_detach = NULL,
+ .f_event = NULL,
+};
+
+static const struct filterops timer_filtops = {
+ .f_isfd = 0,
+ .f_attach = filt_timerattach,
+ .f_detach = filt_timerdetach,
+ .f_event = filt_timer,
+};
static u_int kq_ncallouts = 0;
static int kq_calloutmax = (4 * 1024);
@@ -729,8 +748,12 @@ filt_seltruedetach(struct knote *kn)
/* Nothing to do */
}
-const struct filterops seltrue_filtops =
- { 1, NULL, filt_seltruedetach, filt_seltrue };
+const struct filterops seltrue_filtops = {
+ .f_isfd = 1,
+ .f_attach = NULL,
+ .f_detach = filt_seltruedetach,
+ .f_event = filt_seltrue,
+};
int
seltrue_kqfilter(dev_t dev, struct knote *kn)
Index: src/sys/kern/kern_sig.c
diff -u src/sys/kern/kern_sig.c:1.337 src/sys/kern/kern_sig.c:1.338
--- src/sys/kern/kern_sig.c:1.337 Mon Aug 28 00:46:07 2017
+++ src/sys/kern/kern_sig.c Wed Oct 25 08:12:39 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_sig.c,v 1.337 2017/08/28 00:46:07 kamil Exp $ */
+/* $NetBSD: kern_sig.c,v 1.338 2017/10/25 08:12:39 maya Exp $ */
/*-
* Copyright (c) 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -70,7 +70,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_sig.c,v 1.337 2017/08/28 00:46:07 kamil Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_sig.c,v 1.338 2017/10/25 08:12:39 maya Exp $");
#include "opt_ptrace.h"
#include "opt_dtrace.h"
@@ -2328,5 +2328,8 @@ filt_signal(struct knote *kn, long hint)
}
const struct filterops sig_filtops = {
- 0, filt_sigattach, filt_sigdetach, filt_signal
+ .f_isfd = 0,
+ .f_attach = filt_sigattach,
+ .f_detach = filt_sigdetach,
+ .f_event = filt_signal,
};
Index: src/sys/kern/subr_cprng.c
diff -u src/sys/kern/subr_cprng.c:1.27 src/sys/kern/subr_cprng.c:1.28
--- src/sys/kern/subr_cprng.c:1.27 Mon Apr 13 22:43:41 2015
+++ src/sys/kern/subr_cprng.c Wed Oct 25 08:12:39 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: subr_cprng.c,v 1.27 2015/04/13 22:43:41 riastradh Exp $ */
+/* $NetBSD: subr_cprng.c,v 1.28 2017/10/25 08:12:39 maya Exp $ */
/*-
* Copyright (c) 2011-2013 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: subr_cprng.c,v 1.27 2015/04/13 22:43:41 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_cprng.c,v 1.28 2017/10/25 08:12:39 maya Exp $");
#include <sys/param.h>
#include <sys/types.h>
@@ -256,8 +256,12 @@ out: mutex_exit(&cprng->cs_lock);
static void filt_cprng_detach(struct knote *);
static int filt_cprng_event(struct knote *, long);
-static const struct filterops cprng_filtops =
- { 1, NULL, filt_cprng_detach, filt_cprng_event };
+static const struct filterops cprng_filtops = {
+ .f_isfd = 1,
+ .f_attach = NULL,
+ .f_detach = filt_cprng_detach,
+ .f_event = filt_cprng_event,
+};
int
cprng_strong_kqfilter(struct cprng_strong *cprng, struct knote *kn)
Index: src/sys/kern/subr_log.c
diff -u src/sys/kern/subr_log.c:1.55 src/sys/kern/subr_log.c:1.56
--- src/sys/kern/subr_log.c:1.55 Wed May 20 11:18:36 2015
+++ src/sys/kern/subr_log.c Wed Oct 25 08:12:39 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: subr_log.c,v 1.55 2015/05/20 11:18:36 pooka Exp $ */
+/* $NetBSD: subr_log.c,v 1.56 2017/10/25 08:12:39 maya Exp $ */
/*-
* Copyright (c) 2007, 2008 The NetBSD Foundation, Inc.
@@ -65,7 +65,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: subr_log.c,v 1.55 2015/05/20 11:18:36 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_log.c,v 1.56 2017/10/25 08:12:39 maya Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -289,8 +289,12 @@ filt_logread(struct knote *kn, long hint
return rv;
}
-static const struct filterops logread_filtops =
- { 1, NULL, filt_logrdetach, filt_logread };
+static const struct filterops logread_filtops = {
+ .f_isfd = 1,
+ .f_attach = NULL,
+ .f_detach = filt_logrdetach,
+ .f_event = filt_logread,
+};
static int
logkqfilter(dev_t dev, struct knote *kn)
Index: src/sys/kern/sys_pipe.c
diff -u src/sys/kern/sys_pipe.c:1.140 src/sys/kern/sys_pipe.c:1.141
--- src/sys/kern/sys_pipe.c:1.140 Fri Sep 5 09:20:59 2014
+++ src/sys/kern/sys_pipe.c Wed Oct 25 08:12:39 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: sys_pipe.c,v 1.140 2014/09/05 09:20:59 matt Exp $ */
+/* $NetBSD: sys_pipe.c,v 1.141 2017/10/25 08:12:39 maya Exp $ */
/*-
* Copyright (c) 2003, 2007, 2008, 2009 The NetBSD Foundation, Inc.
@@ -68,7 +68,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sys_pipe.c,v 1.140 2014/09/05 09:20:59 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sys_pipe.c,v 1.141 2017/10/25 08:12:39 maya Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -1446,10 +1446,19 @@ filt_pipewrite(struct knote *kn, long hi
return (kn->kn_data >= PIPE_BUF);
}
-static const struct filterops pipe_rfiltops =
- { 1, NULL, filt_pipedetach, filt_piperead };
-static const struct filterops pipe_wfiltops =
- { 1, NULL, filt_pipedetach, filt_pipewrite };
+static const struct filterops pipe_rfiltops = {
+ .f_isfd = 1,
+ .f_attach = NULL,
+ .f_detach = filt_pipedetach,
+ .f_event = filt_piperead,
+};
+
+static const struct filterops pipe_wfiltops = {
+ .f_isfd = 1,
+ .f_attach = NULL,
+ .f_detach = filt_pipedetach,
+ .f_event = filt_pipewrite,
+};
static int
pipe_kqfilter(file_t *fp, struct knote *kn)
Index: src/sys/kern/tty.c
diff -u src/sys/kern/tty.c:1.274 src/sys/kern/tty.c:1.275
--- src/sys/kern/tty.c:1.274 Sat Oct 1 04:42:54 2016
+++ src/sys/kern/tty.c Wed Oct 25 08:12:39 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: tty.c,v 1.274 2016/10/01 04:42:54 christos Exp $ */
+/* $NetBSD: tty.c,v 1.275 2017/10/25 08:12:39 maya Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -63,7 +63,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tty.c,v 1.274 2016/10/01 04:42:54 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tty.c,v 1.275 2017/10/25 08:12:39 maya Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
@@ -1516,10 +1516,19 @@ filt_ttywrite(struct knote *kn, long hin
return (canwrite);
}
-static const struct filterops ttyread_filtops =
- { 1, NULL, filt_ttyrdetach, filt_ttyread };
-static const struct filterops ttywrite_filtops =
- { 1, NULL, filt_ttywdetach, filt_ttywrite };
+static const struct filterops ttyread_filtops = {
+ .f_isfd = 1,
+ .f_attach = NULL,
+ .f_detach = filt_ttyrdetach,
+ .f_event = filt_ttyread,
+};
+
+static const struct filterops ttywrite_filtops = {
+ .f_isfd = 1,
+ .f_attach = NULL,
+ .f_detach = filt_ttywdetach,
+ .f_event = filt_ttywrite,
+};
int
ttykqfilter(dev_t dev, struct knote *kn)
Index: src/sys/kern/tty_pty.c
diff -u src/sys/kern/tty_pty.c:1.142 src/sys/kern/tty_pty.c:1.143
--- src/sys/kern/tty_pty.c:1.142 Thu Aug 20 09:45:45 2015
+++ src/sys/kern/tty_pty.c Wed Oct 25 08:12:39 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: tty_pty.c,v 1.142 2015/08/20 09:45:45 christos Exp $ */
+/* $NetBSD: tty_pty.c,v 1.143 2017/10/25 08:12:39 maya Exp $ */
/*
* Copyright (c) 1982, 1986, 1989, 1993
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tty_pty.c,v 1.142 2015/08/20 09:45:45 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tty_pty.c,v 1.143 2017/10/25 08:12:39 maya Exp $");
#include "opt_ptm.h"
@@ -997,10 +997,19 @@ filt_ptcwrite(struct knote *kn, long hin
return canwrite;
}
-static const struct filterops ptcread_filtops =
- { 1, NULL, filt_ptcrdetach, filt_ptcread };
-static const struct filterops ptcwrite_filtops =
- { 1, NULL, filt_ptcwdetach, filt_ptcwrite };
+static const struct filterops ptcread_filtops = {
+ .f_isfd = 1,
+ .f_attach = NULL,
+ .f_detach = filt_ptcrdetach,
+ .f_event = filt_ptcread,
+};
+
+static const struct filterops ptcwrite_filtops = {
+ .f_isfd = 1,
+ .f_attach = NULL,
+ .f_detach = filt_ptcwdetach,
+ .f_event = filt_ptcwrite,
+};
int
ptckqfilter(dev_t dev, struct knote *kn)
Index: src/sys/kern/uipc_socket.c
diff -u src/sys/kern/uipc_socket.c:1.256 src/sys/kern/uipc_socket.c:1.257
--- src/sys/kern/uipc_socket.c:1.256 Thu Jul 6 17:42:39 2017
+++ src/sys/kern/uipc_socket.c Wed Oct 25 08:12:39 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: uipc_socket.c,v 1.256 2017/07/06 17:42:39 christos Exp $ */
+/* $NetBSD: uipc_socket.c,v 1.257 2017/10/25 08:12:39 maya Exp $ */
/*-
* Copyright (c) 2002, 2007, 2008, 2009 The NetBSD Foundation, Inc.
@@ -71,7 +71,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uipc_socket.c,v 1.256 2017/07/06 17:42:39 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uipc_socket.c,v 1.257 2017/10/25 08:12:39 maya Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
@@ -2319,12 +2319,26 @@ filt_solisten(struct knote *kn, long hin
return rv;
}
-static const struct filterops solisten_filtops =
- { 1, NULL, filt_sordetach, filt_solisten };
-static const struct filterops soread_filtops =
- { 1, NULL, filt_sordetach, filt_soread };
-static const struct filterops sowrite_filtops =
- { 1, NULL, filt_sowdetach, filt_sowrite };
+static const struct filterops solisten_filtops = {
+ .f_isfd = 1,
+ .f_attach = NULL,
+ .f_detach = filt_sordetach,
+ .f_event = filt_solisten,
+};
+
+static const struct filterops soread_filtops = {
+ .f_isfd = 1,
+ .f_attach = NULL,
+ .f_detach = filt_sordetach,
+ .f_event = filt_soread,
+};
+
+static const struct filterops sowrite_filtops = {
+ .f_isfd = 1,
+ .f_attach = NULL,
+ .f_detach = filt_sowdetach,
+ .f_event = filt_sowrite,
+};
int
soo_kqfilter(struct file *fp, struct knote *kn)
Index: src/sys/miscfs/fifofs/fifo_vnops.c
diff -u src/sys/miscfs/fifofs/fifo_vnops.c:1.78 src/sys/miscfs/fifofs/fifo_vnops.c:1.79
--- src/sys/miscfs/fifofs/fifo_vnops.c:1.78 Tue Apr 11 14:25:00 2017
+++ src/sys/miscfs/fifofs/fifo_vnops.c Wed Oct 25 08:12:39 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: fifo_vnops.c,v 1.78 2017/04/11 14:25:00 riastradh Exp $ */
+/* $NetBSD: fifo_vnops.c,v 1.79 2017/10/25 08:12:39 maya Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -58,7 +58,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fifo_vnops.c,v 1.78 2017/04/11 14:25:00 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fifo_vnops.c,v 1.79 2017/10/25 08:12:39 maya Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -579,10 +579,19 @@ filt_fifowrite(struct knote *kn, long hi
return rv;
}
-static const struct filterops fiforead_filtops =
- { 1, NULL, filt_fifordetach, filt_fiforead };
-static const struct filterops fifowrite_filtops =
- { 1, NULL, filt_fifowdetach, filt_fifowrite };
+static const struct filterops fiforead_filtops = {
+ .f_isfd = 1,
+ .f_attach = NULL,
+ .f_detach = filt_fifordetach,
+ .f_event = filt_fiforead,
+};
+
+static const struct filterops fifowrite_filtops = {
+ .f_isfd = 1,
+ .f_attach = NULL,
+ .f_detach = filt_fifowdetach,
+ .f_event = filt_fifowrite,
+};
/* ARGSUSED */
static int
Index: src/sys/miscfs/genfs/genfs_vnops.c
diff -u src/sys/miscfs/genfs/genfs_vnops.c:1.198 src/sys/miscfs/genfs/genfs_vnops.c:1.199
--- src/sys/miscfs/genfs/genfs_vnops.c:1.198 Sat Jul 1 20:07:00 2017
+++ src/sys/miscfs/genfs/genfs_vnops.c Wed Oct 25 08:12:39 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: genfs_vnops.c,v 1.198 2017/07/01 20:07:00 christos Exp $ */
+/* $NetBSD: genfs_vnops.c,v 1.199 2017/10/25 08:12:39 maya Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -57,7 +57,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: genfs_vnops.c,v 1.198 2017/07/01 20:07:00 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: genfs_vnops.c,v 1.199 2017/10/25 08:12:39 maya Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -554,12 +554,26 @@ filt_genfsvnode(struct knote *kn, long h
return (fflags != 0);
}
-static const struct filterops genfsread_filtops =
- { 1, NULL, filt_genfsdetach, filt_genfsread };
-static const struct filterops genfswrite_filtops =
- { 1, NULL, filt_genfsdetach, filt_genfswrite };
-static const struct filterops genfsvnode_filtops =
- { 1, NULL, filt_genfsdetach, filt_genfsvnode };
+static const struct filterops genfsread_filtops = {
+ .f_isfd = 1,
+ .f_attach = NULL,
+ .f_detach = filt_genfsdetach,
+ .f_event = filt_genfsread,
+};
+
+static const struct filterops genfswrite_filtops = {
+ .f_isfd = 1,
+ .f_attach = NULL,
+ .f_detach = filt_genfsdetach,
+ .f_event = filt_genfswrite,
+};
+
+static const struct filterops genfsvnode_filtops = {
+ .f_isfd = 1,
+ .f_attach = NULL,
+ .f_detach = filt_genfsdetach,
+ .f_event = filt_genfsvnode,
+};
int
genfs_kqfilter(void *v)
Index: src/sys/net/bpf.c
diff -u src/sys/net/bpf.c:1.217 src/sys/net/bpf.c:1.218
--- src/sys/net/bpf.c:1.217 Thu Oct 19 01:57:15 2017
+++ src/sys/net/bpf.c Wed Oct 25 08:12:40 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: bpf.c,v 1.217 2017/10/19 01:57:15 ozaki-r Exp $ */
+/* $NetBSD: bpf.c,v 1.218 2017/10/25 08:12:40 maya Exp $ */
/*
* Copyright (c) 1990, 1991, 1993
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bpf.c,v 1.217 2017/10/19 01:57:15 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bpf.c,v 1.218 2017/10/25 08:12:40 maya Exp $");
#if defined(_KERNEL_OPT)
#include "opt_bpf.h"
@@ -1496,8 +1496,12 @@ filt_bpfread(struct knote *kn, long hint
return rv;
}
-static const struct filterops bpfread_filtops =
- { 1, NULL, filt_bpfrdetach, filt_bpfread };
+static const struct filterops bpfread_filtops = {
+ .f_isfd = 1,
+ .f_attach = NULL,
+ .f_detach = filt_bpfrdetach,
+ .f_event = filt_bpfread,
+};
static int
bpf_kqfilter(struct file *fp, struct knote *kn)
Index: src/sys/net/if_tun.c
diff -u src/sys/net/if_tun.c:1.139 src/sys/net/if_tun.c:1.140
--- src/sys/net/if_tun.c:1.139 Wed May 24 06:52:14 2017
+++ src/sys/net/if_tun.c Wed Oct 25 08:12:40 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: if_tun.c,v 1.139 2017/05/24 06:52:14 pgoyette Exp $ */
+/* $NetBSD: if_tun.c,v 1.140 2017/10/25 08:12:40 maya Exp $ */
/*
* Copyright (c) 1988, Julian Onions <j...@cs.nott.ac.uk>
@@ -19,7 +19,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_tun.c,v 1.139 2017/05/24 06:52:14 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_tun.c,v 1.140 2017/10/25 08:12:40 maya Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -1063,11 +1063,19 @@ filt_tunread(struct knote *kn, long hint
return 1;
}
-static const struct filterops tunread_filtops =
- { 1, NULL, filt_tunrdetach, filt_tunread };
+static const struct filterops tunread_filtops = {
+ .f_isfd = 1,
+ .f_attach = NULL,
+ .f_detach = filt_tunrdetach,
+ .f_event = filt_tunread,
+};
-static const struct filterops tun_seltrue_filtops =
- { 1, NULL, filt_tunrdetach, filt_seltrue };
+static const struct filterops tun_seltrue_filtops = {
+ .f_isfd = 1,
+ .f_attach = NULL,
+ .f_detach = filt_tunrdetach,
+ .f_event = filt_seltrue,
+};
int
tunkqfilter(dev_t dev, struct knote *kn)
Index: src/sys/netisdn/i4b_i4bdrv.c
diff -u src/sys/netisdn/i4b_i4bdrv.c:1.39 src/sys/netisdn/i4b_i4bdrv.c:1.40
--- src/sys/netisdn/i4b_i4bdrv.c:1.39 Fri Jul 25 08:10:40 2014
+++ src/sys/netisdn/i4b_i4bdrv.c Wed Oct 25 08:12:40 2017
@@ -27,7 +27,7 @@
* i4b_i4bdrv.c - i4b userland interface driver
* --------------------------------------------
*
- * $Id: i4b_i4bdrv.c,v 1.39 2014/07/25 08:10:40 dholland Exp $
+ * $Id: i4b_i4bdrv.c,v 1.40 2017/10/25 08:12:40 maya Exp $
*
* $FreeBSD$
*
@@ -36,7 +36,7 @@
*---------------------------------------------------------------------------*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: i4b_i4bdrv.c,v 1.39 2014/07/25 08:10:40 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i4b_i4bdrv.c,v 1.40 2017/10/25 08:12:40 maya Exp $");
#include "isdn.h"
@@ -991,11 +991,19 @@ filt_i4bread(struct knote *kn, long hint
return (1);
}
-static const struct filterops i4bread_filtops =
- { 1, NULL, filt_i4brdetach, filt_i4bread };
+static const struct filterops i4bread_filtops = {
+ .f_isfd = 1,
+ .f_attach = NULL,
+ .f_detach = filt_i4brdetach,
+ .f_event = filt_i4bread,
+};
-static const struct filterops i4b_seltrue_filtops =
- { 1, NULL, filt_i4brdetach, filt_seltrue };
+static const struct filterops i4b_seltrue_filtops = {
+ .f_isfd = 1,
+ .f_attach = NULL,
+ .f_detach = filt_i4brdetach,
+ .f_event = filt_seltrue,
+};
int
isdnkqfilter(dev_t dev, struct knote *kn)
Index: src/sys/netisdn/i4b_rbch.c
diff -u src/sys/netisdn/i4b_rbch.c:1.28 src/sys/netisdn/i4b_rbch.c:1.29
--- src/sys/netisdn/i4b_rbch.c:1.28 Fri Jul 25 08:10:40 2014
+++ src/sys/netisdn/i4b_rbch.c Wed Oct 25 08:12:40 2017
@@ -27,7 +27,7 @@
* i4b_rbch.c - device driver for raw B channel data
* ---------------------------------------------------
*
- * $Id: i4b_rbch.c,v 1.28 2014/07/25 08:10:40 dholland Exp $
+ * $Id: i4b_rbch.c,v 1.29 2017/10/25 08:12:40 maya Exp $
*
* $FreeBSD$
*
@@ -36,7 +36,7 @@
*---------------------------------------------------------------------------*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: i4b_rbch.c,v 1.28 2014/07/25 08:10:40 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i4b_rbch.c,v 1.29 2017/10/25 08:12:40 maya Exp $");
#include "isdnbchan.h"
@@ -842,8 +842,12 @@ filt_i4brbchread(struct knote *kn, long
return (1);
}
-static const struct filterops i4brbchread_filtops =
- { 1, NULL, filt_i4brbchdetach, filt_i4brbchread };
+static const struct filterops i4brbchread_filtops = {
+ .f_isfd = 1,
+ .f_attach = NULL,
+ .f_detach = filt_i4brbchdetach,
+ .f_event = filt_i4brbchread,
+};
static int
filt_i4brbchwrite(struct knote *kn, long hint)
@@ -860,8 +864,12 @@ filt_i4brbchwrite(struct knote *kn, long
return (1);
}
-static const struct filterops i4brbchwrite_filtops =
- { 1, NULL, filt_i4brbchdetach, filt_i4brbchwrite };
+static const struct filterops i4brbchwrite_filtops = {
+ .f_isfd = 1,
+ .f_attach = NULL,
+ .f_detach = filt_i4brbchdetach,
+ .f_event = filt_i4brbchwrite,
+};
int
isdnbchankqfilter(dev_t dev, struct knote *kn)
Index: src/sys/netisdn/i4b_tel.c
diff -u src/sys/netisdn/i4b_tel.c:1.27 src/sys/netisdn/i4b_tel.c:1.28
--- src/sys/netisdn/i4b_tel.c:1.27 Fri Jul 25 08:10:40 2014
+++ src/sys/netisdn/i4b_tel.c Wed Oct 25 08:12:40 2017
@@ -27,7 +27,7 @@
* i4b_tel.c - device driver for ISDN telephony
* --------------------------------------------
*
- * $Id: i4b_tel.c,v 1.27 2014/07/25 08:10:40 dholland Exp $
+ * $Id: i4b_tel.c,v 1.28 2017/10/25 08:12:40 maya Exp $
*
* $FreeBSD$
*
@@ -36,7 +36,7 @@
*---------------------------------------------------------------------------*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: i4b_tel.c,v 1.27 2014/07/25 08:10:40 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i4b_tel.c,v 1.28 2017/10/25 08:12:40 maya Exp $");
#include "isdntel.h"
@@ -984,8 +984,12 @@ filt_i4btel_telread(struct knote *kn, lo
return (1);
}
-static const struct filterops i4btel_telread_filtops =
- { 1, NULL, filt_i4btel_detach, filt_i4btel_telread };
+static const struct filterops i4btel_telread_filtops = {
+ .f_isfd = 1,
+ .f_attach = NULL,
+ .f_detach = filt_i4btel_detach,
+ .f_event = filt_i4btel_telread,
+};
static int
filt_i4btel_telwrite(struct knote *kn, long hint)
@@ -1003,8 +1007,12 @@ filt_i4btel_telwrite(struct knote *kn, l
return (1);
}
-static const struct filterops i4btel_telwrite_filtops =
- { 1, NULL, filt_i4btel_detach, filt_i4btel_telwrite };
+static const struct filterops i4btel_telwrite_filtops = {
+ .f_isfd = 1,
+ .f_attach = NULL,
+ .f_detach = filt_i4btel_detach,
+ .f_event = filt_i4btel_telwrite,
+};
static int
filt_i4btel_dialread(struct knote *kn, long hint)
@@ -1018,11 +1026,19 @@ filt_i4btel_dialread(struct knote *kn, l
return (1);
}
-static const struct filterops i4btel_dialread_filtops =
- { 1, NULL, filt_i4btel_detach, filt_i4btel_dialread };
+static const struct filterops i4btel_dialread_filtops = {
+ .f_isfd = 1,
+ .f_attach = NULL,
+ .f_detach = filt_i4btel_detach,
+ .f_event = filt_i4btel_dialread,
+};
-static const struct filterops i4btel_seltrue_filtops =
- { 1, NULL, filt_i4btel_detach, filt_seltrue };
+static const struct filterops i4btel_seltrue_filtops = {
+ .f_isfd = 1,
+ .f_attach = NULL,
+ .f_detach = filt_i4btel_detach,
+ .f_event = filt_seltrue,
+};
int
isdntelkqfilter(dev_t dev, struct knote *kn)
Index: src/sys/nfs/nfs_kq.c
diff -u src/sys/nfs/nfs_kq.c:1.25 src/sys/nfs/nfs_kq.c:1.26
--- src/sys/nfs/nfs_kq.c:1.25 Mon Oct 24 11:43:30 2011
+++ src/sys/nfs/nfs_kq.c Wed Oct 25 08:12:40 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: nfs_kq.c,v 1.25 2011/10/24 11:43:30 hannken Exp $ */
+/* $NetBSD: nfs_kq.c,v 1.26 2017/10/25 08:12:40 maya Exp $ */
/*-
* Copyright (c) 2002, 2008 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nfs_kq.c,v 1.25 2011/10/24 11:43:30 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nfs_kq.c,v 1.26 2017/10/25 08:12:40 maya Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -279,10 +279,19 @@ filt_nfsvnode(struct knote *kn, long hin
}
-static const struct filterops nfsread_filtops =
- { 1, NULL, filt_nfsdetach, filt_nfsread };
-static const struct filterops nfsvnode_filtops =
- { 1, NULL, filt_nfsdetach, filt_nfsvnode };
+static const struct filterops nfsread_filtops = {
+ .f_isfd = 1,
+ .f_attach = NULL,
+ .f_detach = filt_nfsdetach,
+ .f_event = filt_nfsread,
+};
+
+static const struct filterops nfsvnode_filtops = {
+ .f_isfd = 1,
+ .f_attach = NULL,
+ .f_detach = filt_nfsdetach,
+ .f_event = filt_nfsvnode,
+};
int
nfs_kqfilter(void *v)
