[src/netbsd-9]: src/lib/libcurses Pull up following revision(s) (requested by...

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/b3a21b95eda1
branches:  netbsd-9
changeset: 935644:b3a21b95eda1
user:      martin <martin%NetBSD.org@localhost>
date:      Tue Jul 07 12:43:51 2020 +0000

description:
Pull up following revision(s) (requested by uwe in ticket #986):

        lib/libcurses/insch.c: revision 1.26
        lib/libcurses/ins_wch.c: revision 1.15
        lib/libcurses/ins_wstr.c: revision 1.15
        lib/libcurses/insstr.c: revision 1.8

mvwins*(WINDOW *win, ...) functions - call wins* on win, not stdscr.
>From Naman Jain in PR lib/55460.

diffstat:

 lib/libcurses/ins_wch.c  |  6 +++---
 lib/libcurses/ins_wstr.c |  8 ++++----
 lib/libcurses/insch.c    |  6 +++---
 lib/libcurses/insstr.c   |  8 ++++----
 4 files changed, 14 insertions(+), 14 deletions(-)

diffs (126 lines):

diff -r bd8ea4581112 -r b3a21b95eda1 lib/libcurses/ins_wch.c
--- a/lib/libcurses/ins_wch.c   Tue Jul 07 12:02:29 2020 +0000
+++ b/lib/libcurses/ins_wch.c   Tue Jul 07 12:43:51 2020 +0000
@@ -1,4 +1,4 @@
-/*   $NetBSD: ins_wch.c,v 1.14 2019/06/09 07:40:14 blymn Exp $ */
+/*   $NetBSD: ins_wch.c,v 1.14.2.1 2020/07/07 12:43:51 martin Exp $ */
 
 /*
  * Copyright (c) 2005 The NetBSD Foundation Inc.
@@ -36,7 +36,7 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: ins_wch.c,v 1.14 2019/06/09 07:40:14 blymn Exp $");
+__RCSID("$NetBSD: ins_wch.c,v 1.14.2.1 2020/07/07 12:43:51 martin Exp $");
 #endif                                           /* not lint */
 
 #include <string.h>
@@ -75,7 +75,7 @@
        if (wmove(win, y, x) == ERR)
                return ERR;
 
-       return wins_wch(stdscr, wch);
+       return wins_wch(win, wch);
 }
 
 /*
diff -r bd8ea4581112 -r b3a21b95eda1 lib/libcurses/ins_wstr.c
--- a/lib/libcurses/ins_wstr.c  Tue Jul 07 12:02:29 2020 +0000
+++ b/lib/libcurses/ins_wstr.c  Tue Jul 07 12:43:51 2020 +0000
@@ -1,4 +1,4 @@
-/*   $NetBSD: ins_wstr.c,v 1.14 2019/06/09 07:40:14 blymn Exp $ */
+/*   $NetBSD: ins_wstr.c,v 1.14.2.1 2020/07/07 12:43:51 martin Exp $ */
 
 /*
  * Copyright (c) 2005 The NetBSD Foundation Inc.
@@ -36,7 +36,7 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: ins_wstr.c,v 1.14 2019/06/09 07:40:14 blymn Exp $");
+__RCSID("$NetBSD: ins_wstr.c,v 1.14.2.1 2020/07/07 12:43:51 martin Exp $");
 #endif                                           /* not lint */
 
 #include <string.h>
@@ -96,7 +96,7 @@
        if (wmove(win, y, x) == ERR)
                return ERR;
 
-       return wins_wstr(stdscr, wstr);
+       return wins_wstr(win, wstr);
 }
 
 /*
@@ -109,7 +109,7 @@
        if (wmove(win, y, x) == ERR)
                return ERR;
 
-       return wins_nwstr(stdscr, wstr, n);
+       return wins_nwstr(win, wstr, n);
 }
 
 
diff -r bd8ea4581112 -r b3a21b95eda1 lib/libcurses/insch.c
--- a/lib/libcurses/insch.c     Tue Jul 07 12:02:29 2020 +0000
+++ b/lib/libcurses/insch.c     Tue Jul 07 12:43:51 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: insch.c,v 1.25 2019/06/09 07:40:14 blymn Exp $ */
+/*     $NetBSD: insch.c,v 1.25.2.1 2020/07/07 12:43:51 martin Exp $    */
 
 /*
  * Copyright (c) 1981, 1993, 1994
@@ -34,7 +34,7 @@
 #if 0
 static char sccsid[] = "@(#)insch.c    8.2 (Berkeley) 5/4/94";
 #else
-__RCSID("$NetBSD: insch.c,v 1.25 2019/06/09 07:40:14 blymn Exp $");
+__RCSID("$NetBSD: insch.c,v 1.25.2.1 2020/07/07 12:43:51 martin Exp $");
 #endif
 #endif                         /* not lint */
 
@@ -79,7 +79,7 @@
        if (wmove(win, y, x) == ERR)
                return ERR;
 
-       return winsch(stdscr, ch);
+       return winsch(win, ch);
 }
 
 #endif
diff -r bd8ea4581112 -r b3a21b95eda1 lib/libcurses/insstr.c
--- a/lib/libcurses/insstr.c    Tue Jul 07 12:02:29 2020 +0000
+++ b/lib/libcurses/insstr.c    Tue Jul 07 12:43:51 2020 +0000
@@ -1,4 +1,4 @@
-/*   $NetBSD: insstr.c,v 1.7 2019/06/09 07:40:14 blymn Exp $ */
+/*   $NetBSD: insstr.c,v 1.7.2.1 2020/07/07 12:43:51 martin Exp $ */
 
 /*
  * Copyright (c) 2005 The NetBSD Foundation Inc.
@@ -36,7 +36,7 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: insstr.c,v 1.7 2019/06/09 07:40:14 blymn Exp $");
+__RCSID("$NetBSD: insstr.c,v 1.7.2.1 2020/07/07 12:43:51 martin Exp $");
 #endif                                           /* not lint */
 
 #include <string.h>
@@ -103,7 +103,7 @@
        if (wmove(win, y, x) == ERR)
                return ERR;
 
-       return winsstr(stdscr, str);
+       return winsstr(win, str);
 }
 
 /*
@@ -117,7 +117,7 @@
        if (wmove(win, y, x) == ERR)
                return ERR;
 
-       return winsnstr(stdscr, str, n);
+       return winsnstr(win, str, n);
 }
 
 #endif