[src/trunk]: src/lib/libcurses Don't mix private and public names for the sam...

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

details:   https://anonhg.NetBSD.org/src/rev/055761747539
branches:  trunk
changeset: 445951:055761747539
user:      uwe <uwe%NetBSD.org@localhost>
date:      Sun Nov 18 18:52:29 2018 +0000

description:
Don't mix private and public names for the same thing in one statement.
While here, fix harmless edito in a debug call.

diffstat:

 lib/libcurses/background.c |  10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diffs (45 lines):

diff -r 23128bfba167 -r 055761747539 lib/libcurses/background.c
--- a/lib/libcurses/background.c        Sun Nov 18 17:23:37 2018 +0000
+++ b/lib/libcurses/background.c        Sun Nov 18 18:52:29 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: background.c,v 1.17 2017/01/06 13:53:18 roy Exp $      */
+/*     $NetBSD: background.c,v 1.18 2018/11/18 18:52:29 uwe Exp $      */
 
 /*-
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: background.c,v 1.17 2017/01/06 13:53:18 roy Exp $");
+__RCSID("$NetBSD: background.c,v 1.18 2018/11/18 18:52:29 uwe Exp $");
 #endif                         /* not lint */
 
 #include <stdlib.h>
@@ -67,7 +67,7 @@
 {
 #ifdef DEBUG
        __CTRACE(__CTRACE_ATTR, "wbkgdset: (%p), '%s', %08x\n",
-           win, unctrl(ch & +__CHARTEXT), ch & __ATTRIBUTES);
+           win, unctrl(ch & __CHARTEXT), ch & __ATTRIBUTES);
 #endif
 
        /* Background character. */
@@ -91,7 +91,7 @@
 
 #ifdef DEBUG
        __CTRACE(__CTRACE_ATTR, "wbkgd: (%p), '%s', %08x\n",
-           win, unctrl(ch & +__CHARTEXT), ch & __ATTRIBUTES);
+           win, unctrl(ch & __CHARTEXT), ch & __ATTRIBUTES);
 #endif
 
        /* Background attributes (check colour). */
@@ -103,7 +103,7 @@
        for (y = 0; y < win->maxy; y++)
                for (x = 0; x < win->maxx; x++) {
                        /* Copy character if space */
-                       if (ch & A_CHARTEXT && win->alines[y]->line[x].ch == ' ')
+                       if (ch & __CHARTEXT && win->alines[y]->line[x].ch == ' ')
                                win->alines[y]->line[x].ch = ch & __CHARTEXT;
                        /* Merge attributes */
                        if (win->alines[y]->line[x].attr & __ALTCHARSET)