Module Name: src
Committed By: rin
Date: Mon Sep 6 07:45:48 UTC 2021
Modified Files:
src/lib/libcurses: add_wchstr.c addbytes.c addch.c addnstr.c addwstr.c
background.c border.c chgat.c color.c cr_put.c curs_set.c get_wch.c
getch.c ins_wstr.c mvwin.c refresh.c setterm.c slk.c
Log Message:
Style fixes most for __CTRACE().
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/lib/libcurses/add_wchstr.c
cvs rdiff -u -r1.58 -r1.59 src/lib/libcurses/addbytes.c
cvs rdiff -u -r1.22 -r1.23 src/lib/libcurses/addch.c \
src/lib/libcurses/mvwin.c
cvs rdiff -u -r1.18 -r1.19 src/lib/libcurses/addnstr.c
cvs rdiff -u -r1.7 -r1.8 src/lib/libcurses/addwstr.c
cvs rdiff -u -r1.26 -r1.27 src/lib/libcurses/background.c
cvs rdiff -u -r1.19 -r1.20 src/lib/libcurses/border.c
cvs rdiff -u -r1.6 -r1.7 src/lib/libcurses/chgat.c
cvs rdiff -u -r1.43 -r1.44 src/lib/libcurses/color.c
cvs rdiff -u -r1.36 -r1.37 src/lib/libcurses/cr_put.c
cvs rdiff -u -r1.11 -r1.12 src/lib/libcurses/curs_set.c
cvs rdiff -u -r1.25 -r1.26 src/lib/libcurses/get_wch.c
cvs rdiff -u -r1.76 -r1.77 src/lib/libcurses/getch.c
cvs rdiff -u -r1.16 -r1.17 src/lib/libcurses/ins_wstr.c
cvs rdiff -u -r1.114 -r1.115 src/lib/libcurses/refresh.c
cvs rdiff -u -r1.70 -r1.71 src/lib/libcurses/setterm.c
cvs rdiff -u -r1.15 -r1.16 src/lib/libcurses/slk.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/add_wchstr.c
diff -u src/lib/libcurses/add_wchstr.c:1.9 src/lib/libcurses/add_wchstr.c:1.10
--- src/lib/libcurses/add_wchstr.c:1.9 Mon Sep 6 07:03:49 2021
+++ src/lib/libcurses/add_wchstr.c Mon Sep 6 07:45:48 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: add_wchstr.c,v 1.9 2021/09/06 07:03:49 rin Exp $ */
+/* $NetBSD: add_wchstr.c,v 1.10 2021/09/06 07:45:48 rin Exp $ */
/*
* Copyright (c) 2005 The NetBSD Foundation Inc.
@@ -36,7 +36,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: add_wchstr.c,v 1.9 2021/09/06 07:03:49 rin Exp $");
+__RCSID("$NetBSD: add_wchstr.c,v 1.10 2021/09/06 07:45:48 rin Exp $");
#endif /* not lint */
#include <stdlib.h>
@@ -244,8 +244,8 @@ wadd_wchnstr(WINDOW *win, const cchar_t
}
lp++, ex++;
__CTRACE(__CTRACE_INPUT,
- "wadd_wchnstr: ex = %d, x = %d, cw = %d\n",
- ex, x, cw);
+ "wadd_wchnstr: ex = %d, x = %d, cw = %d\n",
+ ex, x, cw);
while (ex - x <= cw - 1) {
np = lp->nsp;
if (np) {
@@ -264,7 +264,7 @@ wadd_wchnstr(WINDOW *win, const cchar_t
} else {
/* non-spacing character */
__CTRACE(__CTRACE_INPUT,
- "wadd_wchnstr: as non-spacing char");
+ "wadd_wchnstr: as non-spacing char");
for (i = 0; i < chp->elements; i++) {
np = malloc(sizeof(nschar_t));
if (!np)
Index: src/lib/libcurses/addbytes.c
diff -u src/lib/libcurses/addbytes.c:1.58 src/lib/libcurses/addbytes.c:1.59
--- src/lib/libcurses/addbytes.c:1.58 Mon Sep 6 07:08:25 2021
+++ src/lib/libcurses/addbytes.c Mon Sep 6 07:45:48 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: addbytes.c,v 1.58 2021/09/06 07:08:25 rin Exp $ */
+/* $NetBSD: addbytes.c,v 1.59 2021/09/06 07:45:48 rin Exp $ */
/*
* Copyright (c) 1987, 1993, 1994
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)addbytes.c 8.4 (Berkeley) 5/4/94";
#else
-__RCSID("$NetBSD: addbytes.c,v 1.58 2021/09/06 07:08:25 rin Exp $");
+__RCSID("$NetBSD: addbytes.c,v 1.59 2021/09/06 07:45:48 rin Exp $");
#endif
#endif /* not lint */
@@ -253,8 +253,7 @@ _cursesi_addbyte(WINDOW *win, __LINE **l
(*lp)->flags &= ~__ISPASTEOL;
if (*y == win->scr_b) {
__CTRACE(__CTRACE_INPUT,
- "ADDBYTES - on bottom "
- "of scrolling region\n");
+ "ADDBYTES - on bottom of scrolling region\n");
if (!(win->flags & __SCROLLOK))
return ERR;
scroll(win);
@@ -267,9 +266,8 @@ _cursesi_addbyte(WINDOW *win, __LINE **l
}
__CTRACE(__CTRACE_INPUT,
- "ADDBYTES: 1: y = %d, x = %d, firstch = %d, lastch = %d\n",
- *y, *x, *win->alines[*y]->firstchp,
- *win->alines[*y]->lastchp);
+ "ADDBYTES: 1: y = %d, x = %d, firstch = %d, lastch = %d\n",
+ *y, *x, *win->alines[*y]->firstchp, *win->alines[*y]->lastchp);
attributes = (win->wattr | attr) & (__ATTRIBUTES & ~__COLOR);
if (attr & __COLOR)
@@ -293,9 +291,9 @@ _cursesi_addbyte(WINDOW *win, __LINE **l
if (newx > *(*lp)->lastchp)
*(*lp)->lastchp = newx;
__CTRACE(__CTRACE_INPUT, "ADDBYTES: change gives f/l: %d/%d [%d/%d]\n",
- *(*lp)->firstchp, *(*lp)->lastchp,
- *(*lp)->firstchp - win->ch_off,
- *(*lp)->lastchp - win->ch_off);
+ *(*lp)->firstchp, *(*lp)->lastchp,
+ *(*lp)->firstchp - win->ch_off,
+ *(*lp)->lastchp - win->ch_off);
if (win->bch != ' ' && c == ' ')
(*lp)->line[*x].ch = win->bch;
else
@@ -313,9 +311,8 @@ _cursesi_addbyte(WINDOW *win, __LINE **l
(*x)++;
__CTRACE(__CTRACE_INPUT,
- "ADDBYTES: 2: y = %d, x = %d, firstch = %d, lastch = %d\n",
- *y, *x, *win->alines[*y]->firstchp,
- *win->alines[*y]->lastchp);
+ "ADDBYTES: 2: y = %d, x = %d, firstch = %d, lastch = %d\n",
+ *y, *x, *win->alines[*y]->firstchp, *win->alines[*y]->lastchp);
__sync(win);
return OK;
}
@@ -392,8 +389,8 @@ _cursesi_addwchar(WINDOW *win, __LINE **
/* check for non-spacing character */
if (!wcwidth(wch->vals[0])) {
__CTRACE(__CTRACE_INPUT,
- "_cursesi_addwchar: char '%c' is non-spacing\n",
- wch->vals[0]);
+ "_cursesi_addwchar: char '%c' is non-spacing\n",
+ wch->vals[0]);
cw = WCOL(*lp);
if (cw < 0) {
lp += cw;
@@ -436,8 +433,8 @@ _cursesi_addwchar(WINDOW *win, __LINE **
} else {
for (sx = *x - 1; sx >= max(*x + cw, 0); sx--) {
__CTRACE(__CTRACE_INPUT,
- "_cursesi_addwchar: clear current char (%d,%d)\n",
- *y, sx);
+ "_cursesi_addwchar: clear current char (%d,%d)\n",
+ *y, sx);
tp = &win->alines[*y]->line[sx];
tp->ch = (wchar_t) btowc((int) win->bch);
if (_cursesi_copy_nsp(win->bnsp, tp) == ERR)
@@ -460,8 +457,7 @@ _cursesi_addwchar(WINDOW *win, __LINE **
if (cw > win->maxx - *x) {
__CTRACE(__CTRACE_INPUT,
- "_cursesi_addwchar: clear EOL (%d,%d)\n",
- *y, *x);
+ "_cursesi_addwchar: clear EOL (%d,%d)\n", *y, *x);
if (*y == win->scr_b) {
if (!(win->flags & __SCROLLOK))
return ERR;
@@ -493,8 +489,8 @@ _cursesi_addwchar(WINDOW *win, __LINE **
/* add spacing character */
__CTRACE(__CTRACE_INPUT,
- "_cursesi_addwchar: add character (%d,%d) 0x%x\n",
- *y, *x, wch->vals[0]);
+ "_cursesi_addwchar: add character (%d,%d) 0x%x\n",
+ *y, *x, wch->vals[0]);
(*lnp)->flags |= __ISDIRTY;
newx = *x + win->ch_off;
if (newx < *(*lnp)->firstchp)
@@ -520,8 +516,8 @@ _cursesi_addwchar(WINDOW *win, __LINE **
SET_WCOL(*lp, cw);
__CTRACE(__CTRACE_INPUT,
- "_cursesi_addwchar: add spacing char 0x%x, attr 0x%x\n",
- lp->ch, lp->attr);
+ "_cursesi_addwchar: add spacing char 0x%x, attr 0x%x\n",
+ lp->ch, lp->attr);
if (wch->elements > 1) {
for (i = 1; i < wch->elements; i++) {
@@ -531,15 +527,18 @@ _cursesi_addwchar(WINDOW *win, __LINE **
np->ch = wch->vals[i];
np->next = lp->nsp;
__CTRACE(__CTRACE_INPUT,
- "_cursesi_addwchar: add non-spacing char 0x%x\n", np->ch);
+ "_cursesi_addwchar: add non-spacing char 0x%x\n",
+ np->ch);
lp->nsp = np;
}
}
- __CTRACE(__CTRACE_INPUT, "_cursesi_addwchar: non-spacing list header: %p\n",
- lp->nsp);
- __CTRACE(__CTRACE_INPUT, "_cursesi_addwchar: add rest columns (%d:%d)\n",
- sx + 1, sx + cw - 1);
- __CTRACE(__CTRACE_INPUT, "_cursesi_addwchar: *x = %d, win->maxx = %d\n", *x, win->maxx);
+ __CTRACE(__CTRACE_INPUT,
+ "_cursesi_addwchar: non-spacing list header: %p\n", lp->nsp);
+ __CTRACE(__CTRACE_INPUT,
+ "_cursesi_addwchar: add rest columns (%d:%d)\n",
+ sx + 1, sx + cw - 1);
+ __CTRACE(__CTRACE_INPUT, "_cursesi_addwchar: *x = %d, win->maxx = %d\n",
+ *x, win->maxx);
for (tp = lp + 1, *x = sx + 1; *x - sx <= cw - 1; tp++, (*x)++) {
if (tp->nsp) {
__cursesi_free_nsp(tp->nsp);
@@ -552,12 +551,14 @@ _cursesi_addwchar(WINDOW *win, __LINE **
}
if (*x == win->maxx) {
- __CTRACE(__CTRACE_INPUT, "_cursesi_addwchar: do line wrap\n");
+ __CTRACE(__CTRACE_INPUT, "_cursesi_addwchar: do line wrap\n");
if (*y == win->scr_b) {
- __CTRACE(__CTRACE_INPUT, "_cursesi_addwchar: at bottom of screen\n");
+ __CTRACE(__CTRACE_INPUT,
+ "_cursesi_addwchar: at bottom of screen\n");
if (!(win->flags & __SCROLLOK))
return ERR;
- __CTRACE(__CTRACE_INPUT, "_cursesi_addwchar: do a scroll\n");
+ __CTRACE(__CTRACE_INPUT,
+ "_cursesi_addwchar: do a scroll\n");
scroll(win);
}
newx = win->maxx - 1 + win->ch_off;
@@ -595,8 +596,11 @@ _cursesi_addwchar(WINDOW *win, __LINE **
}
}
- __CTRACE(__CTRACE_INPUT, "_cursesi_addwchar: %d : 0x%x\n", lp->ch, lp->attr);
- __CTRACE(__CTRACE_INPUT, "_cursesi_addwchar: *x = %d, *y = %d, win->maxx = %d\n", *x, *y, win->maxx);
+ __CTRACE(__CTRACE_INPUT, "_cursesi_addwchar: %d : 0x%x\n",
+ lp->ch, lp->attr);
+ __CTRACE(__CTRACE_INPUT,
+ "_cursesi_addwchar: *x = %d, *y = %d, win->maxx = %d\n",
+ *x, *y, win->maxx);
__sync(win);
return OK;
#endif
Index: src/lib/libcurses/addch.c
diff -u src/lib/libcurses/addch.c:1.22 src/lib/libcurses/addch.c:1.23
--- src/lib/libcurses/addch.c:1.22 Mon Sep 6 07:03:49 2021
+++ src/lib/libcurses/addch.c Mon Sep 6 07:45:48 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: addch.c,v 1.22 2021/09/06 07:03:49 rin Exp $ */
+/* $NetBSD: addch.c,v 1.23 2021/09/06 07:45:48 rin Exp $ */
/*
* Copyright (c) 1981, 1993, 1994
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)addch.c 8.2 (Berkeley) 5/4/94";
#else
-__RCSID("$NetBSD: addch.c,v 1.22 2021/09/06 07:03:49 rin Exp $");
+__RCSID("$NetBSD: addch.c,v 1.23 2021/09/06 07:45:48 rin Exp $");
#endif
#endif /* not lint */
@@ -94,8 +94,8 @@ waddch(WINDOW *win, chtype ch)
__cursesi_chtype_to_cchar(ch, &cc);
__CTRACE(__CTRACE_INPUT,
- "addch: %d : 0x%x (adding char as wide char)\n",
- cc.vals[0], cc.attributes);
+ "addch: %d : 0x%x (adding char as wide char)\n",
+ cc.vals[0], cc.attributes);
return wadd_wch(win, &cc);
}
Index: src/lib/libcurses/mvwin.c
diff -u src/lib/libcurses/mvwin.c:1.22 src/lib/libcurses/mvwin.c:1.23
--- src/lib/libcurses/mvwin.c:1.22 Mon Sep 6 07:03:50 2021
+++ src/lib/libcurses/mvwin.c Mon Sep 6 07:45:48 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: mvwin.c,v 1.22 2021/09/06 07:03:50 rin Exp $ */
+/* $NetBSD: mvwin.c,v 1.23 2021/09/06 07:45:48 rin Exp $ */
/*
* Copyright (c) 1981, 1993, 1994
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)mvwin.c 8.2 (Berkeley) 5/4/94";
#else
-__RCSID("$NetBSD: mvwin.c,v 1.22 2021/09/06 07:03:50 rin Exp $");
+__RCSID("$NetBSD: mvwin.c,v 1.23 2021/09/06 07:45:48 rin Exp $");
#endif
#endif /* not lint */
@@ -84,7 +84,9 @@ mvderwin(WINDOW *win, int dy, int dx)
*plp->firstchp = x;
if (*plp->lastchp < x + win->maxx)
*plp->lastchp = x + win->maxx;
- __CTRACE(__CTRACE_REFRESH, "mvderwin: firstchp = %d, lastchp = %d\n", *plp->firstchp, *plp->lastchp);
+ __CTRACE(__CTRACE_REFRESH,
+ "mvderwin: firstchp = %d, lastchp = %d\n",
+ *plp->firstchp, *plp->lastchp);
}
return OK;
Index: src/lib/libcurses/addnstr.c
diff -u src/lib/libcurses/addnstr.c:1.18 src/lib/libcurses/addnstr.c:1.19
--- src/lib/libcurses/addnstr.c:1.18 Mon Sep 6 07:03:49 2021
+++ src/lib/libcurses/addnstr.c Mon Sep 6 07:45:48 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: addnstr.c,v 1.18 2021/09/06 07:03:49 rin Exp $ */
+/* $NetBSD: addnstr.c,v 1.19 2021/09/06 07:45:48 rin Exp $ */
/*
* Copyright (c) 1993, 1994
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)addnstr.c 8.2 (Berkeley) 5/4/94";
#else
-__RCSID("$NetBSD: addnstr.c,v 1.18 2021/09/06 07:03:49 rin Exp $");
+__RCSID("$NetBSD: addnstr.c,v 1.19 2021/09/06 07:45:48 rin Exp $");
#endif
#endif /* not lint */
@@ -135,8 +135,7 @@ waddnstr(WINDOW *win, const char *s, int
size_t len;
const char *p;
- __CTRACE(__CTRACE_INPUT, "ADDNSTR: win %p, length %d\n",
- win, n);
+ __CTRACE(__CTRACE_INPUT, "ADDNSTR: win %p, length %d\n", win, n);
/*
* behavior changed from traditional BSD curses, for better XCURSES
* conformance.
Index: src/lib/libcurses/addwstr.c
diff -u src/lib/libcurses/addwstr.c:1.7 src/lib/libcurses/addwstr.c:1.8
--- src/lib/libcurses/addwstr.c:1.7 Mon Sep 6 07:03:49 2021
+++ src/lib/libcurses/addwstr.c Mon Sep 6 07:45:48 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: addwstr.c,v 1.7 2021/09/06 07:03:49 rin Exp $ */
+/* $NetBSD: addwstr.c,v 1.8 2021/09/06 07:45:48 rin Exp $ */
/*
* Copyright (c) 2005 The NetBSD Foundation Inc.
@@ -36,7 +36,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: addwstr.c,v 1.7 2021/09/06 07:03:49 rin Exp $");
+__RCSID("$NetBSD: addwstr.c,v 1.8 2021/09/06 07:45:48 rin Exp $");
#endif /* not lint */
#include <string.h>
@@ -146,7 +146,7 @@ waddnwstr(WINDOW *win, const wchar_t *s,
for (p = s, len = 0; n-- && *p++; ++len);
else
len = wcslen(s);
- __CTRACE(__CTRACE_INPUT, "waddnwstr: string len=%ld\n", (long) len);
+ __CTRACE(__CTRACE_INPUT, "waddnwstr: string len=%zu\n", len);
p = s;
while (len) {
@@ -157,7 +157,7 @@ waddnwstr(WINDOW *win, const wchar_t *s,
if (wadd_wch( win, &cc ) == ERR)
return ERR;
__CTRACE(__CTRACE_INPUT, "waddnwstr: (%x,%x,%d) added\n",
- cc.vals[ 0 ], cc.attributes, cc.elements );
+ cc.vals[0], cc.attributes, cc.elements);
p++, len--;
}
Index: src/lib/libcurses/background.c
diff -u src/lib/libcurses/background.c:1.26 src/lib/libcurses/background.c:1.27
--- src/lib/libcurses/background.c:1.26 Mon Sep 6 07:03:49 2021
+++ src/lib/libcurses/background.c Mon Sep 6 07:45:48 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: background.c,v 1.26 2021/09/06 07:03:49 rin Exp $ */
+/* $NetBSD: background.c,v 1.27 2021/09/06 07:45:48 rin Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: background.c,v 1.26 2021/09/06 07:03:49 rin Exp $");
+__RCSID("$NetBSD: background.c,v 1.27 2021/09/06 07:45:48 rin Exp $");
#endif /* not lint */
#include <stdlib.h>
@@ -163,7 +163,7 @@ wbkgrndset(WINDOW *win, const cchar_t *w
int i;
__CTRACE(__CTRACE_ATTR, "wbkgrndset: (%p), '%s', %x\n",
- win, (const char *) wunctrl(wch), wch->attributes);
+ win, (const char *)wunctrl(wch), wch->attributes);
/* ignore multi-column characters */
if (!wch->elements || wcwidth(wch->vals[0]) > 1)
@@ -223,7 +223,7 @@ int
wbkgrnd(WINDOW *win, const cchar_t *wch)
{
__CTRACE(__CTRACE_ATTR, "wbkgrnd: (%p), '%s', %x\n",
- win, (const char *) wunctrl(wch), wch->attributes);
+ win, (const char *)wunctrl(wch), wch->attributes);
/* ignore multi-column characters */
if (!wch->elements || wcwidth( wch->vals[ 0 ]) > 1)
Index: src/lib/libcurses/border.c
diff -u src/lib/libcurses/border.c:1.19 src/lib/libcurses/border.c:1.20
--- src/lib/libcurses/border.c:1.19 Mon Sep 6 07:03:49 2021
+++ src/lib/libcurses/border.c Mon Sep 6 07:45:48 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: border.c,v 1.19 2021/09/06 07:03:49 rin Exp $ */
+/* $NetBSD: border.c,v 1.20 2021/09/06 07:45:48 rin Exp $ */
/*
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: border.c,v 1.19 2021/09/06 07:03:49 rin Exp $");
+__RCSID("$NetBSD: border.c,v 1.20 2021/09/06 07:45:48 rin Exp $");
#endif /* not lint */
#include <stdlib.h>
@@ -372,7 +372,7 @@ int wborder_set(WINDOW *win, const cchar
if (pcw != 1) {
__CTRACE(__CTRACE_INPUT,
"wborder_set: clean out partial chars[%d:%d]",
- endx - cw + pcw, endx - cw );
+ endx - cw + pcw, endx - cw);
k = pcw < 0 ? endx -cw + pcw : endx - cw;
for (j = endx - cw; j >= k; j--) {
win->alines[i]->line[j].ch
Index: src/lib/libcurses/chgat.c
diff -u src/lib/libcurses/chgat.c:1.6 src/lib/libcurses/chgat.c:1.7
--- src/lib/libcurses/chgat.c:1.6 Mon Sep 6 07:03:49 2021
+++ src/lib/libcurses/chgat.c Mon Sep 6 07:45:48 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: chgat.c,v 1.6 2021/09/06 07:03:49 rin Exp $ */
+/* $NetBSD: chgat.c,v 1.7 2021/09/06 07:45:48 rin Exp $ */
/*
* Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: chgat.c,v 1.6 2021/09/06 07:03:49 rin Exp $");
+__RCSID("$NetBSD: chgat.c,v 1.7 2021/09/06 07:45:48 rin Exp $");
#include "curses.h"
#include "curses_private.h"
@@ -72,8 +72,8 @@ mvwchgat(WINDOW *win , int y, int x, int
count = win->maxx - x;
__CTRACE(__CTRACE_ATTR, "mvwchgat: x: %d y: %d count: %d attr: 0x%x "
- "color pair %d\n", x, y, count, (attr & ~__COLOR),
- PAIR_NUMBER(color));
+ "color pair %d\n", x, y, count, (attr & ~__COLOR),
+ PAIR_NUMBER(color));
lp = win->alines[y];
lc = &lp->line[x];
Index: src/lib/libcurses/color.c
diff -u src/lib/libcurses/color.c:1.43 src/lib/libcurses/color.c:1.44
--- src/lib/libcurses/color.c:1.43 Mon Sep 6 07:03:49 2021
+++ src/lib/libcurses/color.c Mon Sep 6 07:45:48 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: color.c,v 1.43 2021/09/06 07:03:49 rin Exp $ */
+/* $NetBSD: color.c,v 1.44 2021/09/06 07:45:48 rin Exp $ */
/*
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: color.c,v 1.43 2021/09/06 07:03:49 rin Exp $");
+__RCSID("$NetBSD: color.c,v 1.44 2021/09/06 07:45:48 rin Exp $");
#endif /* not lint */
#include "curses.h"
@@ -449,7 +449,9 @@ assume_default_colors(short fore, short
{
__CTRACE(__CTRACE_COLOR, "assume_default_colors: %d, %d\n",
fore, back);
- __CTRACE(__CTRACE_COLOR, "assume_default_colors: default_colour = %d, pair_number = %d\n", __default_color, PAIR_NUMBER(__default_color));
+ __CTRACE(__CTRACE_COLOR,
+ "assume_default_colors: default_colour = %d, pair_number = %d\n",
+ __default_color, PAIR_NUMBER(__default_color));
/* Swap red/blue and yellow/cyan */
if (_cursesi_screen->color_type == COLOR_OTHER) {
@@ -531,8 +533,8 @@ __set_color( /*ARGSUSED*/ WINDOW *win, a
pair = PAIR_NUMBER((uint32_t)attr);
__CTRACE(__CTRACE_COLOR, "__set_color: %d, %d, %d\n", pair,
- _cursesi_screen->colour_pairs[pair].fore,
- _cursesi_screen->colour_pairs[pair].back);
+ _cursesi_screen->colour_pairs[pair].fore,
+ _cursesi_screen->colour_pairs[pair].back);
switch (_cursesi_screen->color_type) {
/* Set ANSI forground and background colours */
case COLOR_ANSI:
Index: src/lib/libcurses/cr_put.c
diff -u src/lib/libcurses/cr_put.c:1.36 src/lib/libcurses/cr_put.c:1.37
--- src/lib/libcurses/cr_put.c:1.36 Mon Sep 6 07:03:49 2021
+++ src/lib/libcurses/cr_put.c Mon Sep 6 07:45:48 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: cr_put.c,v 1.36 2021/09/06 07:03:49 rin Exp $ */
+/* $NetBSD: cr_put.c,v 1.37 2021/09/06 07:45:48 rin Exp $ */
/*
* Copyright (c) 1981, 1993, 1994
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)cr_put.c 8.3 (Berkeley) 5/4/94";
#else
-__RCSID("$NetBSD: cr_put.c,v 1.36 2021/09/06 07:03:49 rin Exp $");
+__RCSID("$NetBSD: cr_put.c,v 1.37 2021/09/06 07:45:48 rin Exp $");
#endif
#endif /* not lint */
@@ -74,7 +74,8 @@ int
__mvcur(int ly, int lx, int y, int x, int in_refresh)
{
__CTRACE(__CTRACE_OUTPUT,
- "mvcur: moving cursor from (%d, %d) to (%d, %d) in refresh %d\n", ly, lx, y, x, in_refresh);
+ "mvcur: moving cursor from (%d, %d) to (%d, %d) in refresh %d\n",
+ ly, lx, y, x, in_refresh);
destcol = x;
destline = y;
outcol = lx;
@@ -90,8 +91,9 @@ fgoto(int in_refresh)
char *cgp;
__CTRACE(__CTRACE_OUTPUT, "fgoto: in_refresh=%d\n", in_refresh);
- __CTRACE(__CTRACE_OUTPUT, "fgoto: outcol=%d, outline=%d, destcol=%d, destline=%d\n",
- outcol, outline, destcol, destline);
+ __CTRACE(__CTRACE_OUTPUT,
+ "fgoto: outcol=%d, outline=%d, destcol=%d, destline=%d\n",
+ outcol, outline, destcol, destline);
if (destcol >= COLS) {
destline += destcol / COLS;
destcol %= COLS;
@@ -209,7 +211,8 @@ plod(int cnt, int in_refresh)
__CTRACE(__CTRACE_OUTPUT, "plod: cnt=%d, in_refresh=%d\n",
cnt, in_refresh);
- __CTRACE(__CTRACE_OUTPUT, "plod: plodding from col %d, row %d to col %d, row %d\n",
+ __CTRACE(__CTRACE_OUTPUT,
+ "plod: plodding from col %d, row %d to col %d, row %d\n",
outcol, outline, destcol, destline);
plodcnt = plodflg = cnt;
soutcol = outcol;
Index: src/lib/libcurses/curs_set.c
diff -u src/lib/libcurses/curs_set.c:1.11 src/lib/libcurses/curs_set.c:1.12
--- src/lib/libcurses/curs_set.c:1.11 Mon Sep 6 07:03:49 2021
+++ src/lib/libcurses/curs_set.c Mon Sep 6 07:45:48 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: curs_set.c,v 1.11 2021/09/06 07:03:49 rin Exp $ */
+/* $NetBSD: curs_set.c,v 1.12 2021/09/06 07:45:48 rin Exp $ */
/*-
* Copyright (c) 1998-2000 Brett Lymn
@@ -31,7 +31,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: curs_set.c,v 1.11 2021/09/06 07:03:49 rin Exp $");
+__RCSID("$NetBSD: curs_set.c,v 1.12 2021/09/06 07:45:48 rin Exp $");
#endif /* not lint */
#include "curses.h"
@@ -74,8 +74,7 @@ curs_set(int visibility)
case 2: /* high visibility */
if (cursor_visible != NULL) {
- __CTRACE(__CTRACE_MISC,
- "curs_set: high vis\n");
+ __CTRACE(__CTRACE_MISC, "curs_set: high vis\n");
_cursesi_screen->old_mode = 2;
tputs(cursor_visible, 0, __cputchar);
fflush(_cursesi_screen->outfd);
Index: src/lib/libcurses/get_wch.c
diff -u src/lib/libcurses/get_wch.c:1.25 src/lib/libcurses/get_wch.c:1.26
--- src/lib/libcurses/get_wch.c:1.25 Mon Sep 6 07:03:49 2021
+++ src/lib/libcurses/get_wch.c Mon Sep 6 07:45:48 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: get_wch.c,v 1.25 2021/09/06 07:03:49 rin Exp $ */
+/* $NetBSD: get_wch.c,v 1.26 2021/09/06 07:45:48 rin Exp $ */
/*
* Copyright (c) 2005 The NetBSD Foundation Inc.
@@ -36,7 +36,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: get_wch.c,v 1.25 2021/09/06 07:03:49 rin Exp $");
+__RCSID("$NetBSD: get_wch.c,v 1.26 2021/09/06 07:45:48 rin Exp $");
#endif /* not lint */
#include <errno.h>
@@ -190,7 +190,7 @@ inkey(wchar_t *wc, int to, int delay)
k = (wchar_t)c;
__CTRACE(__CTRACE_INPUT,
"inkey (wstate wcassembling) got '%s'\n",
- unctrl(k));
+ unctrl(k));
if (feof(infd)) { /* inter-char T/O, start backout */
clearerr(infd);
if (*start == *end)
@@ -236,7 +236,8 @@ inkey(wchar_t *wc, int to, int delay)
if ( ret == -1 ) {
/* return the 1st character we know */
*wc = inbuf[*start];
- *working = *start = (*start + 1) % MAX_CBUF_SIZE;
+ *working = *start =
+ (*start + 1) % MAX_CBUF_SIZE;
__CTRACE(__CTRACE_INPUT,
"inkey: Invalid wide char(%x) "
"[head(%d), current(%d), "
@@ -244,8 +245,8 @@ inkey(wchar_t *wc, int to, int delay)
*wc, *start, *working, *end);
} else { /* > 0 */
/* return the wide character */
- *start = *working
- = (*working + ret)%MAX_CBUF_SIZE;
+ *start = *working =
+ (*working + ret) % MAX_CBUF_SIZE;
__CTRACE(__CTRACE_INPUT,
"inkey: Wide char found(%x) "
"[head(%d), current(%d), "
@@ -289,7 +290,7 @@ inkey(wchar_t *wc, int to, int delay)
/* wide-character specific code */
__CTRACE(__CTRACE_INPUT,
"inkey: Checking for wide char\n");
- mbrtowc( NULL, NULL, 1, &_cursesi_screen->sp );
+ mbrtowc(NULL, NULL, 1, &_cursesi_screen->sp);
*working = *start;
mlen = *end > *working ?
*end - *working : MAX_CBUF_SIZE - *working;
@@ -297,8 +298,8 @@ inkey(wchar_t *wc, int to, int delay)
return ERR;
__CTRACE(__CTRACE_INPUT,
"inkey: Check wide char[head(%d), "
- "current(%d), tail(%d), mlen(%ld)]\n",
- *start, *working, *end, (long) mlen);
+ "current(%d), tail(%d), mlen(%zu)]\n",
+ *start, *working, *end, mlen);
ret = (int)mbrtowc(wc, inbuf + (*working), mlen,
&_cursesi_screen->sp);
__CTRACE(__CTRACE_INPUT,
@@ -312,8 +313,8 @@ inkey(wchar_t *wc, int to, int delay)
&_cursesi_screen->sp);
}
if (ret == -2 && wstate != INKEY_TIMEOUT) {
- *working = (*working + (int) mlen)
- % MAX_CBUF_SIZE;
+ *working =
+ (*working + (int) mlen) % MAX_CBUF_SIZE;
wstate = INKEY_WCASSEMBLING;
continue;
}
@@ -322,16 +323,16 @@ inkey(wchar_t *wc, int to, int delay)
if (ret == -1) {
/* return the first key we know about */
*wc = inbuf[*start];
- *working = *start
- = (*start + 1) % MAX_CBUF_SIZE;
+ *working = *start =
+ (*start + 1) % MAX_CBUF_SIZE;
__CTRACE(__CTRACE_INPUT,
"inkey: Invalid wide char(%x)[head(%d), "
"current(%d), tail(%d)]\n",
*wc, *start, *working, *end);
} else { /* > 0 */
/* return the wide character */
- *start = *working
- = (*working + ret) % MAX_CBUF_SIZE;
+ *start = *working =
+ (*working + ret) % MAX_CBUF_SIZE;
__CTRACE(__CTRACE_INPUT,
"inkey: Wide char found(%x)[head(%d), "
"current(%d), tail(%d)]\n",
@@ -359,8 +360,8 @@ inkey(wchar_t *wc, int to, int delay)
if (current->key[current->mapping[k]]->type
== KEYMAP_LEAF) {
/* eat the key sequence in cbuf */
- *start = *working = ( *working + 1 )
- % MAX_CBUF_SIZE;
+ *start = *working =
+ (*working + 1) % MAX_CBUF_SIZE;
/* check if inbuf empty now */
__CTRACE(__CTRACE_INPUT,
@@ -379,7 +380,7 @@ inkey(wchar_t *wc, int to, int delay)
__CTRACE(__CTRACE_INPUT,
"[inkey]=>BACKOUT, start(%d), "
"current(%d), end(%d)",
- *start, *working, *end );
+ *start, *working, *end);
}
/* return the symbol */
Index: src/lib/libcurses/getch.c
diff -u src/lib/libcurses/getch.c:1.76 src/lib/libcurses/getch.c:1.77
--- src/lib/libcurses/getch.c:1.76 Mon Sep 6 07:03:49 2021
+++ src/lib/libcurses/getch.c Mon Sep 6 07:45:48 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: getch.c,v 1.76 2021/09/06 07:03:49 rin Exp $ */
+/* $NetBSD: getch.c,v 1.77 2021/09/06 07:45:48 rin Exp $ */
/*
* Copyright (c) 1981, 1993, 1994
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)getch.c 8.2 (Berkeley) 5/4/94";
#else
-__RCSID("$NetBSD: getch.c,v 1.76 2021/09/06 07:03:49 rin Exp $");
+__RCSID("$NetBSD: getch.c,v 1.77 2021/09/06 07:45:48 rin Exp $");
#endif
#endif /* not lint */
@@ -302,26 +302,26 @@ add_new_key(keymap_t *current, char chr,
the_key->type = key_type;
switch (key_type) {
- case KEYMAP_MULTI:
- /* need for next key */
- __CTRACE(__CTRACE_MISC, "Creating new keymap\n");
- the_key->value.next = new_keymap();
- the_key->enable = TRUE;
- break;
-
- case KEYMAP_LEAF:
- /* the associated symbol for the key */
- __CTRACE(__CTRACE_MISC, "Adding leaf key\n");
- the_key->value.symbol = symbol;
- the_key->enable = TRUE;
- break;
-
- default:
- fprintf(stderr, "add_new_key: bad type passed\n");
- exit(1);
+ case KEYMAP_MULTI:
+ /* need for next key */
+ __CTRACE(__CTRACE_MISC, "Creating new keymap\n");
+ the_key->value.next = new_keymap();
+ the_key->enable = TRUE;
+ break;
+
+ case KEYMAP_LEAF:
+ /* the associated symbol for the key */
+ __CTRACE(__CTRACE_MISC, "Adding leaf key\n");
+ the_key->value.symbol = symbol;
+ the_key->enable = TRUE;
+ break;
+
+ default:
+ fprintf(stderr, "add_new_key: bad type passed\n");
+ exit(1);
}
} else {
- /* the key is already known - just return the address. */
+ /* the key is already known - just return the address. */
__CTRACE(__CTRACE_MISC, "Keymap already known\n");
the_key = current->key[current->mapping[(unsigned char)chr]];
}
@@ -357,7 +357,8 @@ delete_key_sequence(keymap_t *current, i
_cursesi_free_keymap(key->value.next);
} else if ((key->type == KEYMAP_LEAF)
&& (key->value.symbol == key_type)) {
- __CTRACE(__CTRACE_INPUT, "delete_key_sequence: found keysym %d, deleting\n",
+ __CTRACE(__CTRACE_INPUT,
+ "delete_key_sequence: found keysym %d, deleting\n",
key_type);
key->enable = FALSE;
}
@@ -801,9 +802,13 @@ wgetch(WINDOW *win)
wrefresh(win);
else if ((_cursesi_screen->curscr->cury != (win->begy + win->cury))
|| (_cursesi_screen->curscr->curx != (win->begx + win->curx))) {
- __CTRACE(__CTRACE_INPUT, "wgetch: curscr cury %d cury %d curscr curx %d curx %d\n",
- _cursesi_screen->curscr->cury, win->begy + win->cury,
- _cursesi_screen->curscr->curx, win->begx + win->curx);
+ __CTRACE(__CTRACE_INPUT,
+ "wgetch: curscr cury %d cury %d "
+ "curscr curx %d curx %d\n",
+ _cursesi_screen->curscr->cury,
+ win->begy + win->cury,
+ _cursesi_screen->curscr->curx,
+ win->begx + win->curx);
/*
* Just in case the window is not dirty but the
* cursor was moved, check and update the
Index: src/lib/libcurses/ins_wstr.c
diff -u src/lib/libcurses/ins_wstr.c:1.16 src/lib/libcurses/ins_wstr.c:1.17
--- src/lib/libcurses/ins_wstr.c:1.16 Mon Sep 6 07:03:49 2021
+++ src/lib/libcurses/ins_wstr.c Mon Sep 6 07:45:48 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: ins_wstr.c,v 1.16 2021/09/06 07:03:49 rin Exp $ */
+/* $NetBSD: ins_wstr.c,v 1.17 2021/09/06 07:45:48 rin Exp $ */
/*
* Copyright (c) 2005 The NetBSD Foundation Inc.
@@ -36,7 +36,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: ins_wstr.c,v 1.16 2021/09/06 07:03:49 rin Exp $");
+__RCSID("$NetBSD: ins_wstr.c,v 1.17 2021/09/06 07:45:48 rin Exp $");
#endif /* not lint */
#include <string.h>
@@ -184,7 +184,7 @@ wins_nwstr(WINDOW *win, const wchar_t *w
for (x = 0; x < win->maxx; x++)
__CTRACE(__CTRACE_INPUT,
"wins_nwstr: (%d,%d)=(%x,%x,%p)\n",
- (int) win->cury, x,
+ win->cury, x,
win->alines[win->cury]->line[x].ch,
win->alines[win->cury]->line[x].attr,
win->alines[win->cury]->line[x].nsp);
@@ -223,7 +223,7 @@ wins_nwstr(WINDOW *win, const wchar_t *w
for (x = 0; x < win->maxx; x++)
__CTRACE(__CTRACE_INPUT,
"wins_nwstr: (%d,%d)=(%x,%x,%p)\n",
- (int) win->cury, x,
+ win->cury, x,
win->alines[win->cury]->line[x].ch,
win->alines[win->cury]->line[x].attr,
win->alines[win->cury]->line[x].nsp);
@@ -301,7 +301,7 @@ wins_nwstr(WINDOW *win, const wchar_t *w
for (x = 0; x < win->maxx; x++)
__CTRACE(__CTRACE_INPUT,
"wins_nwstr: (%d,%d)=(%x,%x,%p)\n",
- (int) win->cury, x,
+ win->cury, x,
win->alines[win->cury]->line[x].ch,
win->alines[win->cury]->line[x].attr,
win->alines[win->cury]->line[x].nsp);
Index: src/lib/libcurses/refresh.c
diff -u src/lib/libcurses/refresh.c:1.114 src/lib/libcurses/refresh.c:1.115
--- src/lib/libcurses/refresh.c:1.114 Mon Sep 6 07:03:50 2021
+++ src/lib/libcurses/refresh.c Mon Sep 6 07:45:48 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: refresh.c,v 1.114 2021/09/06 07:03:50 rin Exp $ */
+/* $NetBSD: refresh.c,v 1.115 2021/09/06 07:45:48 rin 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.114 2021/09/06 07:03:50 rin Exp $");
+__RCSID("$NetBSD: refresh.c,v 1.115 2021/09/06 07:45:48 rin Exp $");
#endif
#endif /* not lint */
@@ -100,7 +100,9 @@ int
wnoutrefresh(WINDOW *win)
{
- __CTRACE(__CTRACE_REFRESH, "wnoutrefresh: win %p, begy %d, begx %d, maxy %d, maxx %d\n", win, win->begy, win->begx, win->maxy, win->maxx);
+ __CTRACE(__CTRACE_REFRESH,
+ "wnoutrefresh: win %p, begy %d, begx %d, maxy %d, maxx %d\n",
+ win, win->begy, win->begx, win->maxy, win->maxx);
return _wnoutrefresh(win, 0, 0, win->begy, win->begx,
win->maxy, win->maxx);
@@ -252,18 +254,19 @@ _wnoutrefresh(WINDOW *win, int begy, int
_wintype = "dwin";
__CTRACE(__CTRACE_REFRESH,
- "_wnoutrefresh: %s wy %d\tf %d\tl %d\tflags %x\n",
- _wintype, dy_off, *dwlp->firstchp, *dwlp->lastchp, dwlp->flags);
+ "_wnoutrefresh: %s wy %d\tf %d\tl %d\tflags %x\n",
+ _wintype, dy_off, *dwlp->firstchp, *dwlp->lastchp,
+ dwlp->flags);
__CTRACE(__CTRACE_REFRESH,
- "_wnoutrefresh: %s maxx %d\tch_off %d wlp %p\n",
- _wintype, dwin->maxx, dwin->ch_off, wlp);
+ "_wnoutrefresh: %s maxx %d\tch_off %d wlp %p\n",
+ _wintype, dwin->maxx, dwin->ch_off, wlp);
#endif
if (((wlp->flags & (__ISDIRTY | __ISFORCED)) == 0) &&
((dwlp->flags & (__ISDIRTY | __ISFORCED)) == 0))
continue;
__CTRACE(__CTRACE_REFRESH,
- "_wnoutrefresh: line y_off %d (dy_off %d) is dirty\n",
- y_off, dy_off);
+ "_wnoutrefresh: line y_off %d (dy_off %d) is dirty\n",
+ y_off, dy_off);
wlp = swin->alines[wy];
vlp = screen->__virtscr->alines[y_off];
@@ -305,7 +308,8 @@ _wnoutrefresh(WINDOW *win, int begy, int
wy, wx, y_off, x_off,
unctrl(wlp->line[wx].ch),
wlp->line[wx].attr);
- __CTRACE(__CTRACE_REFRESH, " (curdest %s, 0x%x)",
+ __CTRACE(__CTRACE_REFRESH,
+ " (curdest %s, 0x%x)",
unctrl(vlp->line[x_off].ch),
vlp->line[x_off].attr);
/* Copy character */
@@ -1669,8 +1673,8 @@ done:
(void) memcpy(clp->line + i -
BLANKSIZE, buf, sizeof(buf));
}
- (void) memcpy(clp->line , buf, i *
- sizeof(buf[0]));
+ (void)memcpy(clp->line, buf,
+ i * sizeof(buf[0]));
__CTRACE(__CTRACE_REFRESH,
" blanked out: dirty\n");
clp->hash = blank_hash;
@@ -1682,7 +1686,8 @@ done:
}
} else {
__CTRACE(__CTRACE_REFRESH, " -- dirty\n");
- __touchline(__virtscr, target, 0, (int) __virtscr->maxx - 1);
+ __touchline(__virtscr, target, 0,
+ (int)__virtscr->maxx - 1);
}
if (target == cur_period) {
i = target + 1;
@@ -1996,8 +2001,8 @@ __cursesi_putnsp(nschar_t *nsp, const in
while (p != NULL) {
__cputwchar((int)p->ch);
__CTRACE(__CTRACE_REFRESH,
- "_cursesi_putnsp: (%d,%d) non-spacing putwchar(0x%x)\n",
- wy, wx - 1, p->ch);
+ "_cursesi_putnsp: (%d,%d) non-spacing putwchar(0x%x)\n",
+ wy, wx - 1, p->ch);
p = p->next;
}
}
Index: src/lib/libcurses/setterm.c
diff -u src/lib/libcurses/setterm.c:1.70 src/lib/libcurses/setterm.c:1.71
--- src/lib/libcurses/setterm.c:1.70 Mon Sep 6 07:03:50 2021
+++ src/lib/libcurses/setterm.c Mon Sep 6 07:45:48 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: setterm.c,v 1.70 2021/09/06 07:03:50 rin Exp $ */
+/* $NetBSD: setterm.c,v 1.71 2021/09/06 07:45:48 rin Exp $ */
/*
* Copyright (c) 1981, 1993, 1994
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)setterm.c 8.8 (Berkeley) 10/25/94";
#else
-__RCSID("$NetBSD: setterm.c,v 1.70 2021/09/06 07:03:50 rin Exp $");
+__RCSID("$NetBSD: setterm.c,v 1.71 2021/09/06 07:45:48 rin Exp $");
#endif
#endif /* not lint */
@@ -370,7 +370,8 @@ does_ctrl_o(const char *exit_cap, const
char *eptr, *aptr;
int res;
- __CTRACE(__CTRACE_INIT, "does_ctrl_o: Testing %s for %s\n", exit_cap, acs_cap);
+ __CTRACE(__CTRACE_INIT, "does_ctrl_o: Testing %s for %s\n",
+ exit_cap, acs_cap);
eptr = capdup_nodelay(exit_cap);
if (__predict_false(eptr == NULL))
Index: src/lib/libcurses/slk.c
diff -u src/lib/libcurses/slk.c:1.15 src/lib/libcurses/slk.c:1.16
--- src/lib/libcurses/slk.c:1.15 Mon Sep 6 07:03:50 2021
+++ src/lib/libcurses/slk.c Mon Sep 6 07:45:48 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: slk.c,v 1.15 2021/09/06 07:03:50 rin Exp $ */
+/* $NetBSD: slk.c,v 1.16 2021/09/06 07:45:48 rin Exp $ */
/*-
* Copyright (c) 2017 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: slk.c,v 1.15 2021/09/06 07:03:50 rin Exp $");
+__RCSID("$NetBSD: slk.c,v 1.16 2021/09/06 07:45:48 rin Exp $");
#endif /* not lint */
#include <ctype.h>
@@ -558,8 +558,9 @@ __slk_wset(SCREEN *screen, int labnum, c
__CTRACE(__CTRACE_INPUT, "__slk_wset: entry\n");
olabel = label;
if ((len = wcsrtombs(NULL, &olabel, 0, &screen->sp)) == -1) {
- __CTRACE(__CTRACE_INPUT, "__slk_wset: conversion failed on char 0x%x\n",
- (uint16_t) *olabel);
+ __CTRACE(__CTRACE_INPUT,
+ "__slk_wset: conversion failed on char 0x%hx\n",
+ (uint16_t)*olabel);
return ERR;
}
@@ -574,7 +575,7 @@ __slk_wset(SCREEN *screen, int labnum, c
out:
free(str);
__CTRACE(__CTRACE_INPUT, "__slk_wset: return %s\n",
- (result == OK)?"OK":"ERR");
+ result == OK ? "OK" : "ERR");
return result;
}
#endif /* HAVE_WCHAR */
@@ -843,7 +844,8 @@ __slk_draw(SCREEN *screen, int labnum)
continue;
}
- __CTRACE(__CTRACE_INPUT, "__slk_draw: last label, (%d,%d) char[%d] 0x%x\n",
+ __CTRACE(__CTRACE_INPUT,
+ "__slk_draw: last label, (%d,%d) char[%d] 0x%x\n",
l->x + tx, 0, lcnt, l->label[lcnt]);
__CTRACE(__CTRACE_INPUT, "__slk_draw: label len %d, wcwidth %d\n",
screen->slk_label_len, wcwidth(l->label[lcnt]));
