[src/trunk]: src/lib/libcurses wbkgrnd - do not duplicate code that's already...

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

details:   https://anonhg.NetBSD.org/src/rev/1092962a2d21
branches:  trunk
changeset: 445971:1092962a2d21
user:      uwe <uwe%NetBSD.org@localhost>
date:      Sun Nov 18 22:53:22 2018 +0000

description:
wbkgrnd - do not duplicate code that's already in wbkgrndset()

diffstat:

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

diffs (40 lines):

diff -r 7c503af8743c -r 1092962a2d21 lib/libcurses/background.c
--- a/lib/libcurses/background.c        Sun Nov 18 22:34:32 2018 +0000
+++ b/lib/libcurses/background.c        Sun Nov 18 22:53:22 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: background.c,v 1.23 2018/11/18 22:34:32 uwe Exp $      */
+/*     $NetBSD: background.c,v 1.24 2018/11/18 22:53:22 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.23 2018/11/18 22:34:32 uwe Exp $");
+__RCSID("$NetBSD: background.c,v 1.24 2018/11/18 22:53:22 uwe Exp $");
 #endif                         /* not lint */
 
 #include <stdlib.h>
@@ -227,8 +227,6 @@
 int
 wbkgrnd(WINDOW *win, const cchar_t *wch)
 {
-       attr_t battr;
-
 #ifdef DEBUG
        __CTRACE(__CTRACE_ATTR, "wbkgrnd: (%p), '%s', %x\n",
                win, (const char *) wunctrl(wch), wch->attributes);
@@ -238,12 +236,6 @@
        if (!wch->elements || wcwidth( wch->vals[ 0 ]) > 1)
                return ERR;
 
-       /* Background attributes (check colour). */
-       battr = wch->attributes & WA_ATTRIBUTES;
-       if (__using_color && !( battr & __COLOR))
-               battr |= __default_color;
-
-       win->battr = battr;
        wbkgrndset(win, wch);
        __touchwin(win);
        return OK;