CVS commit: src/sys/net
Module Name:src Committed By: cube Date: Wed May 7 22:53:34 UTC 2014 Modified Files: src/sys/net: if_tap.c Log Message: Prevent a race between tap_dev_poll() and tap_start() by making sure the call to selrecord() happens at splnet(). Fixes kern/47506 and kern/46199. To generate a diff of this commit: cvs rdiff -u -r1.75 -r1.76 src/sys/net/if_tap.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/net/if_tap.c diff -u src/sys/net/if_tap.c:1.75 src/sys/net/if_tap.c:1.76 --- src/sys/net/if_tap.c:1.75 Sun Apr 20 22:39:51 2014 +++ src/sys/net/if_tap.c Wed May 7 22:53:34 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: if_tap.c,v 1.75 2014/04/20 22:39:51 aymeric Exp $ */ +/* $NetBSD: if_tap.c,v 1.76 2014/05/07 22:53:34 cube Exp $ */ /* * Copyright (c) 2003, 2004, 2008, 2009 The NetBSD Foundation. @@ -33,7 +33,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: if_tap.c,v 1.75 2014/04/20 22:39:51 aymeric Exp $); +__KERNEL_RCSID(0, $NetBSD: if_tap.c,v 1.76 2014/05/07 22:53:34 cube Exp $); #if defined(_KERNEL_OPT) @@ -1182,7 +1182,6 @@ tap_dev_poll(int unit, int events, struc s = splnet(); IFQ_POLL(ifp-if_snd, m); - splx(s); if (m != NULL) revents |= events (POLLIN|POLLRDNORM); @@ -1191,6 +1190,7 @@ tap_dev_poll(int unit, int events, struc selrecord(l, sc-sc_rsel); mutex_spin_exit(sc-sc_kqlock); } + splx(s); } revents |= events (POLLOUT|POLLWRNORM);
CVS commit: src/usr.bin/config
Module Name:src
Committed By: cube
Date: Fri Jul 30 16:23:49 UTC 2010
Modified Files:
src/usr.bin/config: mkdevsw.c
Log Message:
Emit compatible struct devsw_conv when version is older than 20100430.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/usr.bin/config/mkdevsw.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/config/mkdevsw.c
diff -u src/usr.bin/config/mkdevsw.c:1.9 src/usr.bin/config/mkdevsw.c:1.10
--- src/usr.bin/config/mkdevsw.c:1.9 Fri Apr 30 20:47:18 2010
+++ src/usr.bin/config/mkdevsw.c Fri Jul 30 16:23:49 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: mkdevsw.c,v 1.9 2010/04/30 20:47:18 pooka Exp $ */
+/* $NetBSD: mkdevsw.c,v 1.10 2010/07/30 16:23:49 cube Exp $ */
/*
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -162,6 +162,12 @@
fputs(\n/* device conversion table */\n
struct devsw_conv devsw_conv0[] = {\n, fp);
TAILQ_FOREACH(dm, alldevms, dm_next) {
+ if (version 20100430) {
+ /* Emit compatible structure */
+ fprintf(fp, \t{ \%s\, %d, %d },\n, dm-dm_name,
+ dm-dm_bmajor, dm-dm_cmajor);
+ continue;
+ }
struct nvlist *nv;
const char *d_class, *d_flags = 0;
int d_vec[2] = { 0, 0 };
CVS commit: src/sys
Module Name:src
Committed By: cube
Date: Sat Feb 6 04:50:19 UTC 2010
Modified Files:
src/sys/kern: kern_mutex.c kern_rwlock.c
src/sys/sys: mutex.h rwlock.h
Log Message:
Revert commit from Fri Feb 5 06:43:17 UTC 2010 by skrll:
Invert the sense of the bit to mark if LOCKDEBUG is enabled to disabled.
This will help my fellow developers spot use before initialised problems
that hppa picks up very well.
It has to be done differently, because the semantics of mtx_owner in the non-
LOCKDEBUG case can vary significantly between archs, and thus it is not
possible to simply flip a bit to 1.
Ok core@, as at least i386 is unbootable right now.
To generate a diff of this commit:
cvs rdiff -u -r1.47 -r1.48 src/sys/kern/kern_mutex.c
cvs rdiff -u -r1.34 -r1.35 src/sys/kern/kern_rwlock.c
cvs rdiff -u -r1.18 -r1.19 src/sys/sys/mutex.h
cvs rdiff -u -r1.8 -r1.9 src/sys/sys/rwlock.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/kern_mutex.c
diff -u src/sys/kern/kern_mutex.c:1.47 src/sys/kern/kern_mutex.c:1.48
--- src/sys/kern/kern_mutex.c:1.47 Fri Feb 5 06:43:16 2010
+++ src/sys/kern/kern_mutex.c Sat Feb 6 04:50:19 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_mutex.c,v 1.47 2010/02/05 06:43:16 skrll Exp $ */
+/* $NetBSD: kern_mutex.c,v 1.48 2010/02/06 04:50:19 cube Exp $ */
/*-
* Copyright (c) 2002, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -40,7 +40,7 @@
#define __MUTEX_PRIVATE
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: kern_mutex.c,v 1.47 2010/02/05 06:43:16 skrll Exp $);
+__KERNEL_RCSID(0, $NetBSD: kern_mutex.c,v 1.48 2010/02/06 04:50:19 cube Exp $);
#include sys/param.h
#include sys/atomic.h
@@ -157,15 +157,15 @@
#define MUTEX_INITIALIZE_ADAPTIVE(mtx, dodebug)\
do { \
- if (!dodebug) \
- (mtx)-mtx_owner |= MUTEX_BIT_NODEBUG; \
+ if (dodebug) \
+ (mtx)-mtx_owner |= MUTEX_BIT_DEBUG; \
} while (/* CONSTCOND */ 0);
#define MUTEX_INITIALIZE_SPIN(mtx, dodebug, ipl) \
do { \
(mtx)-mtx_owner = MUTEX_BIT_SPIN;\
- if (!dodebug) \
- (mtx)-mtx_owner |= MUTEX_BIT_NODEBUG; \
+ if (dodebug) \
+ (mtx)-mtx_owner |= MUTEX_BIT_DEBUG; \
(mtx)-mtx_ipl = makeiplcookie((ipl));\
__cpu_simple_lock_init((mtx)-mtx_lock); \
} while (/* CONSTCOND */ 0)
@@ -180,10 +180,10 @@
#define MUTEX_ADAPTIVE_P(mtx) \
(((mtx)-mtx_owner MUTEX_BIT_SPIN) == 0)
-#define MUTEX_DEBUG_P(mtx) (((mtx)-mtx_owner MUTEX_BIT_NODEBUG) == 0)
+#define MUTEX_DEBUG_P(mtx) (((mtx)-mtx_owner MUTEX_BIT_DEBUG) != 0)
#if defined(LOCKDEBUG)
-#define MUTEX_OWNED(owner) (((owner) ~MUTEX_BIT_NODEBUG) != 0)
-#define MUTEX_INHERITDEBUG(new, old) (new) |= (old) MUTEX_BIT_NODEBUG
+#define MUTEX_OWNED(owner) (((owner) ~MUTEX_BIT_DEBUG) != 0)
+#define MUTEX_INHERITDEBUG(new, old) (new) |= (old) MUTEX_BIT_DEBUG
#else /* defined(LOCKDEBUG) */
#define MUTEX_OWNED(owner) ((owner) != 0)
#define MUTEX_INHERITDEBUG(new, old) /* nothing */
Index: src/sys/kern/kern_rwlock.c
diff -u src/sys/kern/kern_rwlock.c:1.34 src/sys/kern/kern_rwlock.c:1.35
--- src/sys/kern/kern_rwlock.c:1.34 Fri Feb 5 06:43:16 2010
+++ src/sys/kern/kern_rwlock.c Sat Feb 6 04:50:19 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_rwlock.c,v 1.34 2010/02/05 06:43:16 skrll Exp $ */
+/* $NetBSD: kern_rwlock.c,v 1.35 2010/02/06 04:50:19 cube Exp $ */
/*-
* Copyright (c) 2002, 2006, 2007, 2008, 2009 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: kern_rwlock.c,v 1.34 2010/02/05 06:43:16 skrll Exp $);
+__KERNEL_RCSID(0, $NetBSD: kern_rwlock.c,v 1.35 2010/02/06 04:50:19 cube Exp $);
#define __RWLOCK_PRIVATE
@@ -103,10 +103,10 @@
#endif /* DIAGNOSTIC */
-#define RW_SETDEBUG(rw, on) ((rw)-rw_owner |= (on) ? 0 : RW_NODEBUG)
-#define RW_DEBUG_P(rw) (((rw)-rw_owner RW_NODEBUG) == 0)
+#define RW_SETDEBUG(rw, on) ((rw)-rw_owner |= (on) ? RW_DEBUG : 0)
+#define RW_DEBUG_P(rw) (((rw)-rw_owner RW_DEBUG) != 0)
#if defined(LOCKDEBUG)
-#define RW_INHERITDEBUG(new, old) (new) |= (old) RW_NODEBUG
+#define RW_INHERITDEBUG(new, old) (new) |= (old) RW_DEBUG
#else /* defined(LOCKDEBUG) */
#define RW_INHERITDEBUG(new, old) /* nothing */
#endif /* defined(LOCKDEBUG) */
@@ -218,7 +218,7 @@
rw_destroy(krwlock_t *rw)
{
- RW_ASSERT(rw, (rw-rw_owner ~RW_NODEBUG) == 0);
+ RW_ASSERT(rw, (rw-rw_owner ~RW_DEBUG) == 0);
LOCKDEBUG_FREE(RW_DEBUG_P(rw), rw);
}
Index: src/sys/sys/mutex.h
diff -u src/sys/sys/mutex.h:1.18 src/sys/sys/mutex.h:1.19
--- src/sys/sys/mutex.h:1.18 Fri Feb 5 06:43:17 2010
+++ src/sys/sys/mutex.h Sat Feb 6 04:50:19 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: mutex.h,v 1.18 2010/02/05 06:43:17 skrll Exp $ */
+/* $NetBSD: mutex.h,v 1.19 2010/02/06 04:50:19 cube Exp $ */
/*-
* Copyright (c) 2002, 2006, 2007, 2008, 2009 The NetBSD Foundation, Inc.
@@ -160,7 +160,7 @@
#define
CVS commit: src/sys/arch/i386/pnpbios
Module Name:src Committed By: cube Date: Wed Nov 25 13:15:17 UTC 2009 Modified Files: src/sys/arch/i386/pnpbios: fdc_pnpbios.c Log Message: Properly fix f...@pnpbios as shown by Brian Buhrow in PR#42374. I think it tells a lot about the relevancy of that attachment when it took 20 months for someone to experience the issue and even then, acpi had to be disabled. To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 src/sys/arch/i386/pnpbios/fdc_pnpbios.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/i386/pnpbios/fdc_pnpbios.c diff -u src/sys/arch/i386/pnpbios/fdc_pnpbios.c:1.14 src/sys/arch/i386/pnpbios/fdc_pnpbios.c:1.15 --- src/sys/arch/i386/pnpbios/fdc_pnpbios.c:1.14 Mon Apr 28 20:23:25 2008 +++ src/sys/arch/i386/pnpbios/fdc_pnpbios.c Wed Nov 25 13:15:17 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: fdc_pnpbios.c,v 1.14 2008/04/28 20:23:25 martin Exp $ */ +/* $NetBSD: fdc_pnpbios.c,v 1.15 2009/11/25 13:15:17 cube Exp $ */ /*- * Copyright (c) 2000 The NetBSD Foundation, Inc. @@ -34,7 +34,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: fdc_pnpbios.c,v 1.14 2008/04/28 20:23:25 martin Exp $); +__KERNEL_RCSID(0, $NetBSD: fdc_pnpbios.c,v 1.15 2009/11/25 13:15:17 cube Exp $); #include rnd.h @@ -92,6 +92,7 @@ aprint_normal(\n); + fdc-sc_dev = self; fdc-sc_ic = aa-ic; if (pnpbios_io_map(aa-pbt, aa-resc, 0, fdc-sc_iot,
CVS commit: src/doc
Module Name:src Committed By: cube Date: Thu Sep 17 16:42:50 UTC 2009 Modified Files: src/doc: BRANCHES Log Message: Reflect actual status of cube-autoconf. To generate a diff of this commit: cvs rdiff -u -r1.284 -r1.285 src/doc/BRANCHES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/BRANCHES diff -u src/doc/BRANCHES:1.284 src/doc/BRANCHES:1.285 --- src/doc/BRANCHES:1.284 Mon Aug 10 21:27:46 2009 +++ src/doc/BRANCHES Thu Sep 17 16:42:50 2009 @@ -1,4 +1,4 @@ -# $NetBSD: BRANCHES,v 1.284 2009/08/10 21:27:46 matt Exp $ +# $NetBSD: BRANCHES,v 1.285 2009/09/17 16:42:50 cube Exp $ # # This file contains a list of branches that exist in the NetBSD CVS # tree and their current state. @@ -297,16 +297,6 @@ routines, and allow improvements to be shared across all arm based hardware. -Branch: cube-autoconf -Description: Renovate autoconf(9) API -Status: Active -Start Date: 11 Dec 2007 -End Date: -Base Tag: cube-autoconf-base -Maintainer: Quentin Garnier c...@netbsd.org -Scope: kernel usr.bin/config (and some other userland bits) -Notes: Address a number of issues the current autoconf(9) API has. - Branch: gmcgarry_ctxsw Description: Separate scheduler from context-switch code Status: Dormant @@ -797,6 +787,16 @@ Scope: Entire tree. Notes: +Branch: cube-autoconf +Description: Renovate autoconf(9) API +Status: Terminated; abandoned +Start Date: 11 Dec 2007 +End Date: +Base Tag: cube-autoconf-base +Maintainer: Quentin Garnier c...@netbsd.org +Scope: kernel usr.bin/config (and some other userland bits) +Notes: Address a number of issues the current autoconf(9) API has. + Branch: eeh-paddr_t Description: use separate types for virtual vs. physical addresses Status: Terminated; merged to -current
CVS commit: src/sys/dev/acpi
Module Name:src Committed By: cube Date: Mon Aug 31 14:48:41 UTC 2009 Modified Files: src/sys/dev/acpi: files.acpi Log Message: Don't reference files that don't exist, and cvs diff before commit. To generate a diff of this commit: cvs rdiff -u -r1.57 -r1.58 src/sys/dev/acpi/files.acpi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/acpi/files.acpi diff -u src/sys/dev/acpi/files.acpi:1.57 src/sys/dev/acpi/files.acpi:1.58 --- src/sys/dev/acpi/files.acpi:1.57 Tue Aug 18 16:41:02 2009 +++ src/sys/dev/acpi/files.acpi Mon Aug 31 14:48:41 2009 @@ -1,4 +1,4 @@ -# $NetBSD: files.acpi,v 1.57 2009/08/18 16:41:02 jmcneill Exp $ +# $NetBSD: files.acpi,v 1.58 2009/08/31 14:48:41 cube Exp $ include dev/acpi/acpica/files.acpica @@ -52,11 +52,6 @@ attach acpibat at acpinodebus file dev/acpi/acpi_bat.c acpibat -# ACPI Display Device -device acpidisplay -attach acpidisplay at acpinodebus -file dev/acpi/acpi_display.c acpidisplay - # ACPI Thermal Zone device acpitz: sysmon_envsys attach acpitz at acpinodebus
CVS commit: src/usr.bin/config
Module Name:src
Committed By: cube
Date: Sun Aug 30 21:07:41 UTC 2009
Modified Files:
src/usr.bin/config: lint.c
Log Message:
For {pseudo-,}devices, check if an instance of the pseudo or the considered
attachment of the device has already been done by the template config file.
If so, don't emit a line. Reported by John Nemeth.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/usr.bin/config/lint.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/config/lint.c
diff -u src/usr.bin/config/lint.c:1.7 src/usr.bin/config/lint.c:1.8
--- src/usr.bin/config/lint.c:1.7 Sun Dec 28 01:23:46 2008
+++ src/usr.bin/config/lint.c Sun Aug 30 21:07:41 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: lint.c,v 1.7 2008/12/28 01:23:46 christos Exp $ */
+/* $NetBSD: lint.c,v 1.8 2009/08/30 21:07:41 cube Exp $ */
/*
* Copyright (c) 2007 The NetBSD Foundation.
@@ -124,9 +124,9 @@
da-d_isdef = 2;
}
- if (at == NULL !d-d_ispseudo)
+ if (at == NULL !d-d_ispseudo d-d_ihead == NULL)
printf(%s0\tat\troot\n, d-d_name);
- else if (!d-d_ispseudo) {
+ else if (at != NULL !d-d_ispseudo da-d_ihead == NULL) {
printf(%s0\tat\t%s?, d-d_name, at-a_name);
for (nv = at-a_locs; nv != NULL; nv = nv-nv_next) {
@@ -165,7 +165,7 @@
{
struct devbase *d = value;
- if (d-d_ispseudo)
+ if (d-d_ispseudo d-d_ihead == NULL)
printf(pseudo-device\t%s\n, d-d_name);
return 0;
}
CVS commit: src/usr.bin/config
Module Name:src Committed By: cube Date: Mon Aug 31 03:39:01 UTC 2009 Modified Files: src/usr.bin/config: config.1 Log Message: .Sx to refer to a section, and add one ref to the lint stuff for clarity. To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/usr.bin/config/config.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.bin/config/config.1 diff -u src/usr.bin/config/config.1:1.8 src/usr.bin/config/config.1:1.9 --- src/usr.bin/config/config.1:1.8 Mon May 4 21:11:53 2009 +++ src/usr.bin/config/config.1 Mon Aug 31 03:39:00 2009 @@ -1,4 +1,4 @@ -.\ $NetBSD: config.1,v 1.8 2009/05/04 21:11:53 wiz Exp $ +.\ $NetBSD: config.1,v 1.9 2009/08/31 03:39:00 cube Exp $ .\ .\ Copyright (c) 1980, 1991, 1993 .\ The Regents of the University of California. All rights reserved. @@ -86,7 +86,9 @@ is a tool for the kernel developer and generates a .Dq lint configuration file to be used during regression testing. -Refer to section LINT CONFIGURATION for the details of that use of +Refer to section +.Sx LINT CONFIGURATION +for the details of that use of .Nm . .Pp .Nm @@ -98,7 +100,9 @@ as the kernel build directory, instead of computing and creating one automatically. .It Fl L -Generate a lint configuration. +Generate a lint configuration. See section +.Sx LINT CONFIGURATION +for details. .It Fl P Pack locators to save space in the resulting kernel binary. The amount of space saved that way is so small that this option should
CVS commit: src/sys/conf
Module Name:src
Committed By: cube
Date: Wed May 13 18:06:26 UTC 2009
Modified Files:
src/sys/conf: Makefile.kern.inc
Log Message:
Nothing has used config_time.h since 1/8/2008.
To generate a diff of this commit:
cvs rdiff -u -r1.123 -r1.124 src/sys/conf/Makefile.kern.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/conf/Makefile.kern.inc
diff -u src/sys/conf/Makefile.kern.inc:1.123 src/sys/conf/Makefile.kern.inc:1.124
--- src/sys/conf/Makefile.kern.inc:1.123 Mon Mar 30 16:34:19 2009
+++ src/sys/conf/Makefile.kern.inc Wed May 13 18:06:26 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.kern.inc,v 1.123 2009/03/30 16:34:19 perry Exp $
+# $NetBSD: Makefile.kern.inc,v 1.124 2009/05/13 18:06:26 cube Exp $
#
# This file contains common `MI' targets and definitions and it is included
# at the bottom of each `MD' ${MACHINE}/conf/Makefile.${MACHINE}.
@@ -271,10 +271,6 @@
${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} -c vers.c
.endif
-.if !target(config_time.h)
-BUILDSYMLINKS+= config_time.src config_time.h
-.endif
-
.if defined(MEMORY_DISK_IMAGE)
md_root_image.h: ${MEMORY_DISK_IMAGE}
${_MKTARGET_CREATE}
CVS commit: src/sys/conf
Module Name:src Committed By: cube Date: Wed May 6 02:52:13 UTC 2009 Modified Files: src/sys/conf: files Log Message: Bump required config(1) version after files.drm changes [hi mrg!]. To generate a diff of this commit: cvs rdiff -u -r1.945 -r1.946 src/sys/conf/files Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/conf/files diff -u src/sys/conf/files:1.945 src/sys/conf/files:1.946 --- src/sys/conf/files:1.945 Tue Apr 21 03:00:29 2009 +++ src/sys/conf/files Wed May 6 02:52:13 2009 @@ -1,7 +1,7 @@ -# $NetBSD: files,v 1.945 2009/04/21 03:00:29 nonaka Exp $ +# $NetBSD: files,v 1.946 2009/05/06 02:52:13 cube Exp $ # @(#)files.newconf 7.5 (Berkeley) 5/10/93 -version 20090214 +version 20090313 # # device classes
CVS commit: src/external/lib
Module Name:src
Committed By: cube
Date: Tue Apr 14 20:26:52 UTC 2009
Modified Files:
src/external/lib: Makefile
Log Message:
Give previous commit a chance to work [hi christos!].
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/external/lib/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/lib/Makefile
diff -u src/external/lib/Makefile:1.8 src/external/lib/Makefile:1.9
--- src/external/lib/Makefile:1.8 Tue Apr 14 17:47:16 2009
+++ src/external/lib/Makefile Tue Apr 14 20:26:52 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2009/04/14 17:47:16 christos Exp $
+# $NetBSD: Makefile,v 1.9 2009/04/14 20:26:52 cube Exp $
#
# This Makefile exists to provide a single point to build
@@ -15,7 +15,7 @@
.if (${MKCRYPTO} != no)
SUBDIR+= ../../crypto/external/lib .WAIT
-if (${MKLDAP} != no)
+.if (${MKLDAP} != no)
SUBDIR+= ../bsd/openldap/lib
.endif
.endif
CVS commit: src/lib/libcurses
Module Name:src
Committed By: cube
Date: Wed Apr 1 20:59:15 UTC 2009
Modified Files:
src/lib/libcurses: curses.h keypad.c
Log Message:
Make keypad return an int instead of nothing, as the SUS and even
curses_input(3) [!] say it should.
OK'd j...@. ABI lawyers say this doesn't need major bump.
To generate a diff of this commit:
cvs rdiff -u -r1.93 -r1.94 src/lib/libcurses/curses.h
cvs rdiff -u -r1.10 -r1.11 src/lib/libcurses/keypad.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libcurses/curses.h
diff -u src/lib/libcurses/curses.h:1.93 src/lib/libcurses/curses.h:1.94
--- src/lib/libcurses/curses.h:1.93 Mon Apr 14 20:40:54 2008
+++ src/lib/libcurses/curses.h Wed Apr 1 20:59:15 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: curses.h,v 1.93 2008/04/14 20:40:54 jdc Exp $ */
+/* $NetBSD: curses.h,v 1.94 2009/04/01 20:59:15 cube Exp $ */
/*
* Copyright (c) 1981, 1993, 1994
@@ -665,7 +665,7 @@
bool is_linetouched(WINDOW *, int);
bool is_wintouched(WINDOW *);
int keyok(int, bool);
-void keypad(WINDOW *, bool);
+int keypad(WINDOW *, bool);
char *keyname(int);
char killchar(void);
int leaveok(WINDOW *, bool);
Index: src/lib/libcurses/keypad.c
diff -u src/lib/libcurses/keypad.c:1.10 src/lib/libcurses/keypad.c:1.11
--- src/lib/libcurses/keypad.c:1.10 Sun Jan 21 13:25:36 2007
+++ src/lib/libcurses/keypad.c Wed Apr 1 20:59:15 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: keypad.c,v 1.10 2007/01/21 13:25:36 jdc Exp $ */
+/* $NetBSD: keypad.c,v 1.11 2009/04/01 20:59:15 cube Exp $ */
/*-
* Copyright (c) 1998-1999 Brett Lymn (bl...@baea.com.au, brett_l...@yahoo.com)
@@ -28,7 +28,7 @@
#include sys/cdefs.h
#ifndef lint
-__RCSID($NetBSD: keypad.c,v 1.10 2007/01/21 13:25:36 jdc Exp $);
+__RCSID($NetBSD: keypad.c,v 1.11 2009/04/01 20:59:15 cube Exp $);
#endif/* not lint */
#include curses.h
@@ -39,7 +39,7 @@
* Turn on and off interpretation of function/keypad keys in the
* given window.
*/
-void
+int
keypad(WINDOW *win, bool bf)
{
#ifdef DEBUG
@@ -54,4 +54,6 @@
}
} else
win-flags = ~__KEYPAD;
+
+ return OK;
}
