summaryrefslogtreecommitdiff
path: root/lib/libcurses
diff options
context:
space:
mode:
authoruwe <uwe@NetBSD.org>2018-11-18 22:53:22 +0000
committeruwe <uwe@NetBSD.org>2018-11-18 22:53:22 +0000
commitff6d09cd69b6d46b212f99a0fb612391d8a9ad78 (patch)
tree44a0ddcbbd75f72ea72578a5263ccbcbc3bf328d /lib/libcurses
parent9454a500f2d12e595fd8ef1b66d04753ba0ef0c0 (diff)
wbkgrnd - do not duplicate code that's already in wbkgrndset()
Diffstat (limited to 'lib/libcurses')
-rw-r--r--lib/libcurses/background.c12
1 files changed, 2 insertions, 10 deletions
diff --git a/lib/libcurses/background.c b/lib/libcurses/background.c
index 271ae9a0c78..ec697e1e036 100644
--- a/lib/libcurses/background.c
+++ b/lib/libcurses/background.c
@@ -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 @@ wbkgrndset(WINDOW *win, const cchar_t *wch)
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 @@ wbkgrnd(WINDOW *win, const cchar_t *wch)
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;