Module Name: src
Committed By: uwe
Date: Sun Nov 18 22:11:39 UTC 2018
Modified Files:
src/lib/libcurses: background.c
Log Message:
Don't fuse HAVE_WCHAR and (trivial) !HAVE_WCHAR bodies into single
function definition. Instead provide two sets of definitions under
single #ifdef. Same object code is generated for both HAVE_WCHAR and
!HAVE_WCHAR.
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/lib/libcurses/background.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libcurses/background.c
diff -u src/lib/libcurses/background.c:1.20 src/lib/libcurses/background.c:1.21
--- src/lib/libcurses/background.c:1.20 Sun Nov 18 21:01:16 2018
+++ src/lib/libcurses/background.c Sun Nov 18 22:11:38 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: background.c,v 1.20 2018/11/18 21:01:16 uwe Exp $ */
+/* $NetBSD: background.c,v 1.21 2018/11/18 22:11:38 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.20 2018/11/18 21:01:16 uwe Exp $");
+__RCSID("$NetBSD: background.c,v 1.21 2018/11/18 22:11:38 uwe Exp $");
#endif /* not lint */
#include <stdlib.h>
@@ -134,39 +134,34 @@ getbkgd(WINDOW *win)
return ((chtype) ((win->bch & A_CHARTEXT) | battr));
}
-int bkgrnd(const cchar_t *wch)
+
+#ifdef HAVE_WCHAR
+
+int
+bkgrnd(const cchar_t *wch)
{
-#ifndef HAVE_WCHAR
- return ERR;
-#else
return wbkgrnd( stdscr, wch );
-#endif /* HAVE_WCHAR */
}
-void bkgrndset(const cchar_t *wch)
+
+void
+bkgrndset(const cchar_t *wch)
{
-#ifdef HAVE_WCHAR
wbkgrndset( stdscr, wch );
-#endif /* HAVE_WCHAR */
}
-int getbkgrnd(cchar_t *wch)
+
+int
+getbkgrnd(cchar_t *wch)
{
-#ifndef HAVE_WCHAR
- return ERR;
-#else
return wgetbkgrnd( stdscr, wch );
-#endif /* HAVE_WCHAR */
}
-int wbkgrnd(WINDOW *win, const cchar_t *wch)
+
+int
+wbkgrnd(WINDOW *win, const cchar_t *wch)
{
-#ifndef HAVE_WCHAR
- return ERR;
-#else
-/* int y, x, i; */
attr_t battr;
-/* nschar_t *np, *tnp, *pnp; */
#ifdef DEBUG
__CTRACE(__CTRACE_ATTR, "wbkgrnd: (%p), '%s', %x\n",
@@ -186,12 +181,12 @@ int wbkgrnd(WINDOW *win, const cchar_t *
wbkgrndset(win, wch);
__touchwin(win);
return OK;
-#endif /* HAVE_WCHAR */
}
-void wbkgrndset(WINDOW *win, const cchar_t *wch)
+
+void
+wbkgrndset(WINDOW *win, const cchar_t *wch)
{
-#ifdef HAVE_WCHAR
attr_t battr;
nschar_t *np, *tnp;
int i;
@@ -252,14 +247,12 @@ void wbkgrndset(WINDOW *win, const cchar
battr |= __default_color;
win->battr = battr;
SET_BGWCOL((*win), 1);
-#endif /* HAVE_WCHAR */
}
-int wgetbkgrnd(WINDOW *win, cchar_t *wch)
+
+int
+wgetbkgrnd(WINDOW *win, cchar_t *wch)
{
-#ifndef HAVE_WCHAR
- return ERR;
-#else
nschar_t *np;
/* Background attributes (check colour). */
@@ -278,5 +271,48 @@ int wgetbkgrnd(WINDOW *win, cchar_t *wch
}
return OK;
-#endif /* HAVE_WCHAR */
}
+
+#else /* !HAVE_WCHAR */
+
+int
+bkgrnd(const cchar_t *wch)
+{
+ return ERR;
+}
+
+
+void
+bkgrndset(const cchar_t *wch)
+{
+ return;
+}
+
+int
+getbkgrnd(cchar_t *wch)
+{
+ return ERR;
+}
+
+
+int
+wbkgrnd(WINDOW *win, const cchar_t *wch)
+{
+ return ERR;
+}
+
+
+void
+wbkgrndset(WINDOW *win, const cchar_t *wch)
+{
+ return;
+}
+
+
+int
+wgetbkgrnd(WINDOW *win, cchar_t *wch)
+{
+ return ERR;
+}
+
+#endif /* !HAVE_WCHAR */
