[src/trunk]: src/lib/libcurses Kill stray refs to __virtscr and _cursesi_scre...

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

details:   https://anonhg.NetBSD.org/src/rev/5d00ee16ea7e
branches:  trunk
changeset: 350414:5d00ee16ea7e
user:      roy <roy%NetBSD.org@localhost>
date:      Wed Jan 11 10:06:32 2017 +0000

description:
Kill stray refs to __virtscr and _cursesi_screen missed in prior commit.

diffstat:

 lib/libcurses/refresh.c |  14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

diffs (49 lines):

diff -r 398272fa5019 -r 5d00ee16ea7e lib/libcurses/refresh.c
--- a/lib/libcurses/refresh.c   Wed Jan 11 09:54:54 2017 +0000
+++ b/lib/libcurses/refresh.c   Wed Jan 11 10:06:32 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: refresh.c,v 1.86 2017/01/11 09:54:54 roy Exp $ */
+/*     $NetBSD: refresh.c,v 1.87 2017/01/11 10:06:32 roy Exp $ */
 
 /*
  * Copyright (c) 1981, 1993, 1994
@@ -34,7 +34,7 @@
 #if 0
 static char sccsid[] = "@(#)refresh.c  8.7 (Berkeley) 8/13/94";
 #else
-__RCSID("$NetBSD: refresh.c,v 1.86 2017/01/11 09:54:54 roy Exp $");
+__RCSID("$NetBSD: refresh.c,v 1.87 2017/01/11 10:06:32 roy Exp $");
 #endif
 #endif                         /* not lint */
 
@@ -270,8 +270,9 @@
                                mx = maxx;
                                if (mx > *wlp->lastchp - swin->ch_off + 1)
                                        mx = *dwlp->lastchp - dwin->ch_off + 1;
-                               if (x_off + (mx - wx) > __virtscr->maxx)
-                                       mx -= (x_off + maxx) - __virtscr->maxx;
+                               if (x_off + (mx - wx) > screen->__virtscr->maxx)
+                                       mx -= (x_off + maxx) -
+                                           screen->__virtscr->maxx;
                        }
 
                        /* Copy line from "win" to "__virtscr". */
@@ -290,8 +291,7 @@
                                vlp->line[x_off].attr = wlp->line[wx].attr;
                                /* Check for nca conflict with colour */
                                if ((vlp->line[x_off].attr & __COLOR) &&
-                                   (vlp->line[x_off].attr &
-                                   _cursesi_screen->nca))
+                                   (vlp->line[x_off].attr & screen->nca))
                                        vlp->line[x_off].attr &= ~__COLOR;
                                if (win->flags & __ISDERWIN) {
                                        dwlp->line[dx_off].ch =
@@ -304,7 +304,7 @@
                                if (wlp->line[wx].ch
                                    == (wchar_t)btowc((int) win->bch)) {
                                        vlp->line[x_off].ch = win->bch;
-                                       SET_WCOL( vlp->line[x_off], 1 );
+                                       SET_WCOL(vlp->line[x_off], 1);
                                        if (_cursesi_copy_nsp(win->bnsp,
                                                              &vlp->line[x_off])
                                            == ERR)