Module Name: src
Committed By: roy
Date: Tue Oct 15 22:15:17 UTC 2013
Modified Files:
src/lib/libcurses: curses_window.3 delwin.c
Log Message:
Note that delwin(3) is a null-op if win is NULL.
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/lib/libcurses/curses_window.3
cvs rdiff -u -r1.17 -r1.18 src/lib/libcurses/delwin.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_window.3
diff -u src/lib/libcurses/curses_window.3:1.15 src/lib/libcurses/curses_window.3:1.16
--- src/lib/libcurses/curses_window.3:1.15 Thu Sep 15 12:01:18 2011
+++ src/lib/libcurses/curses_window.3 Tue Oct 15 22:15:17 2013
@@ -1,4 +1,4 @@
-.\" $NetBSD: curses_window.3,v 1.15 2011/09/15 12:01:18 wiz Exp $
+.\" $NetBSD: curses_window.3,v 1.16 2013/10/15 22:15:17 roy Exp $
.\"
.\" Copyright (c) 2002
.\" Brett Lymn ([email protected], [email protected])
@@ -30,7 +30,7 @@
.\" SUCH DAMAGE.
.\"
.\"
-.Dd September 15, 2011
+.Dd October 15, 2013
.Dt CURSES_WINDOW 3
.Os
.Sh NAME
@@ -143,6 +143,11 @@ A window may deleted and all resources f
.Fn delwin
function with the pointer to the window to be deleted in
.Fa win .
+If
+.Fa win
+is
+.Dv NULL ,
+then no action occurs.
.Pp
A window can be moved to a new position by calling the
.Fn mvwin
Index: src/lib/libcurses/delwin.c
diff -u src/lib/libcurses/delwin.c:1.17 src/lib/libcurses/delwin.c:1.18
--- src/lib/libcurses/delwin.c:1.17 Wed Jul 22 16:57:14 2009
+++ src/lib/libcurses/delwin.c Tue Oct 15 22:15:17 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: delwin.c,v 1.17 2009/07/22 16:57:14 roy Exp $ */
+/* $NetBSD: delwin.c,v 1.18 2013/10/15 22:15:17 roy Exp $ */
/*
* Copyright (c) 1981, 1993, 1994
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)delwin.c 8.2 (Berkeley) 5/4/94";
#else
-__RCSID("$NetBSD: delwin.c,v 1.17 2009/07/22 16:57:14 roy Exp $");
+__RCSID("$NetBSD: delwin.c,v 1.18 2013/10/15 22:15:17 roy Exp $");
#endif
#endif /* not lint */
@@ -57,6 +57,10 @@ delwin(WINDOW *win)
#ifdef DEBUG
__CTRACE(__CTRACE_WINDOW, "delwin(%p)\n", win);
#endif
+
+ if (win == NULL)
+ return (OK);
+
/*
* Free any storage used by non-spacing characters in the window.
*/
