Module Name: src Committed By: thorpej Date: Sun Sep 26 16:36:19 UTC 2021
Modified Files: src/sys/arch/amiga/dev: event.c src/sys/arch/arc/dev: opms.c src/sys/arch/arm/xscale: pxa2x0_apm.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 apm.c src/sys/arch/sparc/dev: tctrl.c src/sys/arch/x68k/dev: event.c Log Message: Driver "kqfilter" entry points return an error code, so if an invalid filter is requested, return EINVAL rather than 1. To generate a diff of this commit: cvs rdiff -u -r1.16 -r1.17 src/sys/arch/amiga/dev/event.c cvs rdiff -u -r1.25 -r1.26 src/sys/arch/arc/dev/opms.c cvs rdiff -u -r1.6 -r1.7 src/sys/arch/arm/xscale/pxa2x0_apm.c cvs rdiff -u -r1.16 -r1.17 src/sys/arch/atari/dev/event.c cvs rdiff -u -r1.13 -r1.14 src/sys/arch/landisk/dev/button.c cvs rdiff -u -r1.37 -r1.38 src/sys/arch/mac68k/dev/aed.c cvs rdiff -u -r1.33 -r1.34 src/sys/arch/macppc/dev/aed.c cvs rdiff -u -r1.30 -r1.31 src/sys/arch/macppc/dev/apm.c cvs rdiff -u -r1.64 -r1.65 src/sys/arch/sparc/dev/tctrl.c cvs rdiff -u -r1.18 -r1.19 src/sys/arch/x68k/dev/event.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.16 src/sys/arch/amiga/dev/event.c:1.17 --- src/sys/arch/amiga/dev/event.c:1.16 Sun Sep 26 01:16:07 2021 +++ src/sys/arch/amiga/dev/event.c Sun Sep 26 16:36:18 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: event.c,v 1.16 2021/09/26 01:16:07 thorpej Exp $ */ +/* $NetBSD: event.c,v 1.17 2021/09/26 16:36:18 thorpej Exp $ */ /* * Copyright (c) 1992, 1993 @@ -43,7 +43,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: event.c,v 1.16 2021/09/26 01:16:07 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: event.c,v 1.17 2021/09/26 16:36:18 thorpej Exp $"); /* * Internal `Firm_event' interface for the keyboard and mouse drivers. @@ -208,7 +208,7 @@ ev_kqfilter(struct evvar *ev, struct kno break; default: - return (1); + return (EINVAL); } kn->kn_hook = ev; Index: src/sys/arch/arc/dev/opms.c diff -u src/sys/arch/arc/dev/opms.c:1.25 src/sys/arch/arc/dev/opms.c:1.26 --- src/sys/arch/arc/dev/opms.c:1.25 Sun Sep 26 01:16:07 2021 +++ src/sys/arch/arc/dev/opms.c Sun Sep 26 16:36:18 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: opms.c,v 1.25 2021/09/26 01:16:07 thorpej Exp $ */ +/* $NetBSD: opms.c,v 1.26 2021/09/26 16:36:18 thorpej 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.25 2021/09/26 01:16:07 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: opms.c,v 1.26 2021/09/26 16:36:18 thorpej Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -491,7 +491,7 @@ opmskqfilter(dev_t dev, struct knote *kn break; default: - return 1; + return EINVAL; } kn->kn_hook = sc; Index: src/sys/arch/arm/xscale/pxa2x0_apm.c diff -u src/sys/arch/arm/xscale/pxa2x0_apm.c:1.6 src/sys/arch/arm/xscale/pxa2x0_apm.c:1.7 --- src/sys/arch/arm/xscale/pxa2x0_apm.c:1.6 Sun Sep 26 01:16:07 2021 +++ src/sys/arch/arm/xscale/pxa2x0_apm.c Sun Sep 26 16:36:18 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: pxa2x0_apm.c,v 1.6 2021/09/26 01:16:07 thorpej Exp $ */ +/* $NetBSD: pxa2x0_apm.c,v 1.7 2021/09/26 16:36:18 thorpej Exp $ */ /* $OpenBSD: pxa2x0_apm.c,v 1.28 2007/03/29 18:42:38 uwe Exp $ */ /*- @@ -629,7 +629,7 @@ apmkqfilter(dev_t dev, struct knote *kn) kn->kn_fop = &apmread_filtops; break; default: - return (1); + return (EINVAL); } kn->kn_hook = (caddr_t)sc; Index: src/sys/arch/atari/dev/event.c diff -u src/sys/arch/atari/dev/event.c:1.16 src/sys/arch/atari/dev/event.c:1.17 --- src/sys/arch/atari/dev/event.c:1.16 Sun Sep 26 01:16:07 2021 +++ src/sys/arch/atari/dev/event.c Sun Sep 26 16:36:18 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: event.c,v 1.16 2021/09/26 01:16:07 thorpej Exp $ */ +/* $NetBSD: event.c,v 1.17 2021/09/26 16:36:18 thorpej Exp $ */ /* * Copyright (c) 1992, 1993 @@ -47,7 +47,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: event.c,v 1.16 2021/09/26 01:16:07 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: event.c,v 1.17 2021/09/26 16:36:18 thorpej Exp $"); #include <sys/param.h> #include <sys/fcntl.h> @@ -208,7 +208,7 @@ ev_kqfilter(struct evvar *ev, struct kno break; default: - return (1); + return (EINVAL); } kn->kn_hook = ev; Index: src/sys/arch/landisk/dev/button.c diff -u src/sys/arch/landisk/dev/button.c:1.13 src/sys/arch/landisk/dev/button.c:1.14 --- src/sys/arch/landisk/dev/button.c:1.13 Sun Sep 26 14:32:02 2021 +++ src/sys/arch/landisk/dev/button.c Sun Sep 26 16:36:18 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: button.c,v 1.13 2021/09/26 14:32:02 thorpej Exp $ */ +/* $NetBSD: button.c,v 1.14 2021/09/26 16:36:18 thorpej Exp $ */ /* * Copyright (c) 2003 Wasabi Systems, Inc. @@ -36,7 +36,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: button.c,v 1.13 2021/09/26 14:32:02 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: button.c,v 1.14 2021/09/26 16:36:18 thorpej Exp $"); #include <sys/param.h> #include <sys/conf.h> @@ -333,7 +333,7 @@ btnkqfilter(dev_t dev, struct knote *kn) break; default: - return (1); + return (EINVAL); } return (0); Index: src/sys/arch/mac68k/dev/aed.c diff -u src/sys/arch/mac68k/dev/aed.c:1.37 src/sys/arch/mac68k/dev/aed.c:1.38 --- src/sys/arch/mac68k/dev/aed.c:1.37 Sun Sep 26 14:36:48 2021 +++ src/sys/arch/mac68k/dev/aed.c Sun Sep 26 16:36:18 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: aed.c,v 1.37 2021/09/26 14:36:48 thorpej Exp $ */ +/* $NetBSD: aed.c,v 1.38 2021/09/26 16:36:18 thorpej Exp $ */ /* * Copyright (C) 1994 Bradley A. Grantham @@ -26,7 +26,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: aed.c,v 1.37 2021/09/26 14:36:48 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: aed.c,v 1.38 2021/09/26 16:36:18 thorpej Exp $"); #include "opt_adb.h" @@ -622,7 +622,7 @@ aedkqfilter(dev_t dev, struct knote *kn) break; default: - return (1); + return (EINVAL); } return (0); Index: src/sys/arch/macppc/dev/aed.c diff -u src/sys/arch/macppc/dev/aed.c:1.33 src/sys/arch/macppc/dev/aed.c:1.34 --- src/sys/arch/macppc/dev/aed.c:1.33 Sun Sep 26 14:36:48 2021 +++ src/sys/arch/macppc/dev/aed.c Sun Sep 26 16:36:19 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: aed.c,v 1.33 2021/09/26 14:36:48 thorpej Exp $ */ +/* $NetBSD: aed.c,v 1.34 2021/09/26 16:36:19 thorpej Exp $ */ /* * Copyright (C) 1994 Bradley A. Grantham @@ -26,7 +26,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: aed.c,v 1.33 2021/09/26 14:36:48 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: aed.c,v 1.34 2021/09/26 16:36:19 thorpej Exp $"); #include <sys/param.h> #include <sys/device.h> @@ -627,7 +627,7 @@ aedkqfilter(dev_t dev, struct knote *kn) break; default: - return (1); + return (EINVAL); } return (0); Index: src/sys/arch/macppc/dev/apm.c diff -u src/sys/arch/macppc/dev/apm.c:1.30 src/sys/arch/macppc/dev/apm.c:1.31 --- src/sys/arch/macppc/dev/apm.c:1.30 Sun Sep 26 01:16:07 2021 +++ src/sys/arch/macppc/dev/apm.c Sun Sep 26 16:36:19 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: apm.c,v 1.30 2021/09/26 01:16:07 thorpej Exp $ */ +/* $NetBSD: apm.c,v 1.31 2021/09/26 16:36:19 thorpej Exp $ */ /* $OpenBSD: apm.c,v 1.5 2002/06/07 07:13:59 miod Exp $ */ /*- @@ -33,7 +33,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: apm.c,v 1.30 2021/09/26 01:16:07 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: apm.c,v 1.31 2021/09/26 16:36:19 thorpej Exp $"); #include "apm.h" @@ -448,7 +448,7 @@ apmkqfilter(dev_t dev, struct knote *kn) kn->kn_fop = &apmread_filtops; break; default: - return (1); + return (EINVAL); } kn->kn_hook = sc; Index: src/sys/arch/sparc/dev/tctrl.c diff -u src/sys/arch/sparc/dev/tctrl.c:1.64 src/sys/arch/sparc/dev/tctrl.c:1.65 --- src/sys/arch/sparc/dev/tctrl.c:1.64 Sun Sep 26 01:16:08 2021 +++ src/sys/arch/sparc/dev/tctrl.c Sun Sep 26 16:36:19 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: tctrl.c,v 1.64 2021/09/26 01:16:08 thorpej Exp $ */ +/* $NetBSD: tctrl.c,v 1.65 2021/09/26 16:36:19 thorpej 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.64 2021/09/26 01:16:08 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: tctrl.c,v 1.65 2021/09/26 16:36:19 thorpej Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -1251,7 +1251,7 @@ tctrlkqfilter(dev_t dev, struct knote *k break; default: - return (1); + return (EINVAL); } kn->kn_hook = sc; Index: src/sys/arch/x68k/dev/event.c diff -u src/sys/arch/x68k/dev/event.c:1.18 src/sys/arch/x68k/dev/event.c:1.19 --- src/sys/arch/x68k/dev/event.c:1.18 Sun Sep 26 01:16:08 2021 +++ src/sys/arch/x68k/dev/event.c Sun Sep 26 16:36:19 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: event.c,v 1.18 2021/09/26 01:16:08 thorpej Exp $ */ +/* $NetBSD: event.c,v 1.19 2021/09/26 16:36:19 thorpej Exp $ */ /* * Copyright (c) 1992, 1993 @@ -45,7 +45,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: event.c,v 1.18 2021/09/26 01:16:08 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: event.c,v 1.19 2021/09/26 16:36:19 thorpej Exp $"); #include <sys/param.h> #include <sys/fcntl.h> @@ -233,7 +233,7 @@ ev_kqfilter(struct evvar *ev, struct kno break; default: - return (1); + return (EINVAL); } kn->kn_hook = ev;