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;
}
