Module Name: src
Committed By: christos
Date: Thu Sep 9 20:24:08 UTC 2021
Modified Files:
src/lib/libedit: refresh.c terminal.c
Log Message:
Add casts to appease conversions between wchar_t and wint_t
To generate a diff of this commit:
cvs rdiff -u -r1.57 -r1.58 src/lib/libedit/refresh.c
cvs rdiff -u -r1.43 -r1.44 src/lib/libedit/terminal.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/libedit/refresh.c
diff -u src/lib/libedit/refresh.c:1.57 src/lib/libedit/refresh.c:1.58
--- src/lib/libedit/refresh.c:1.57 Mon Mar 30 02:54:37 2020
+++ src/lib/libedit/refresh.c Thu Sep 9 16:24:07 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: refresh.c,v 1.57 2020/03/30 06:54:37 ryo Exp $ */
+/* $NetBSD: refresh.c,v 1.58 2021/09/09 20:24:07 christos Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -37,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)refresh.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: refresh.c,v 1.57 2020/03/30 06:54:37 ryo Exp $");
+__RCSID("$NetBSD: refresh.c,v 1.58 2021/09/09 20:24:07 christos Exp $");
#endif
#endif /* not lint && not SCCSID */
@@ -105,7 +105,7 @@ re_nextline(EditLine *el)
*/
if (el->el_refresh.r_cursor.v + 1 >= el->el_terminal.t_size.v) {
int i, lins = el->el_terminal.t_size.v;
- wchar_t *firstline = el->el_vdisplay[0];
+ wint_t *firstline = el->el_vdisplay[0];
for(i = 1; i < lins; i++)
el->el_vdisplay[i - 1] = el->el_vdisplay[i];
@@ -334,7 +334,8 @@ re_refresh(EditLine *el)
ELRE_DEBUG(1, (__F, "updating %d lines.\r\n", el->el_refresh.r_newcv));
for (i = 0; i <= el->el_refresh.r_newcv; i++) {
/* NOTE THAT re_update_line MAY CHANGE el_display[i] */
- re_update_line(el, el->el_display[i], el->el_vdisplay[i], i);
+ re_update_line(el, (wchar_t *)el->el_display[i],
+ (wchar_t *)el->el_vdisplay[i], i);
/*
* Copy the new line to be the current one, and pad out with
@@ -343,7 +344,8 @@ re_refresh(EditLine *el)
* end of the screen line, it won't be a NUL or some old
* leftover stuff.
*/
- re__copy_and_pad(el->el_display[i], el->el_vdisplay[i],
+ re__copy_and_pad((wchar_t *)el->el_display[i],
+ (wchar_t *)el->el_vdisplay[i],
(size_t) el->el_terminal.t_size.h);
}
ELRE_DEBUG(1, (__F,
@@ -355,7 +357,8 @@ re_refresh(EditLine *el)
terminal_move_to_line(el, i);
terminal_move_to_char(el, 0);
/* This wcslen should be safe even with MB_FILL_CHARs */
- terminal_clear_EOL(el, (int) wcslen(el->el_display[i]));
+ terminal_clear_EOL(el,
+ (int) wcslen((const wchar_t *)el->el_display[i]));
#ifdef DEBUG_REFRESH
terminal_overwrite(el, L"C\b", 2);
#endif /* DEBUG_REFRESH */
@@ -1091,7 +1094,7 @@ re_refresh_cursor(EditLine *el)
static void
re_fastputc(EditLine *el, wint_t c)
{
- wchar_t *lastline;
+ wint_t *lastline;
int w;
w = wcwidth(c);
@@ -1126,7 +1129,8 @@ re_fastputc(EditLine *el, wint_t c)
el->el_cursor.v++;
lastline = el->el_display[++el->el_refresh.r_oldcv];
}
- re__copy_and_pad(lastline, L"", (size_t)el->el_terminal.t_size.h);
+ re__copy_and_pad((wchar_t *)lastline, L"",
+ (size_t)el->el_terminal.t_size.h);
if (EL_HAS_AUTO_MARGINS) {
if (EL_HAS_MAGIC_MARGINS) {
Index: src/lib/libedit/terminal.c
diff -u src/lib/libedit/terminal.c:1.43 src/lib/libedit/terminal.c:1.44
--- src/lib/libedit/terminal.c:1.43 Fri Jul 10 16:34:24 2020
+++ src/lib/libedit/terminal.c Thu Sep 9 16:24:07 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: terminal.c,v 1.43 2020/07/10 20:34:24 christos Exp $ */
+/* $NetBSD: terminal.c,v 1.44 2021/09/09 20:24:07 christos Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -37,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)term.c 8.2 (Berkeley) 4/30/95";
#else
-__RCSID("$NetBSD: terminal.c,v 1.43 2020/07/10 20:34:24 christos Exp $");
+__RCSID("$NetBSD: terminal.c,v 1.44 2021/09/09 20:24:07 christos Exp $");
#endif
#endif /* not lint && not SCCSID */
@@ -588,7 +588,8 @@ mc_again:
* NOTE THAT terminal_overwrite() WILL CHANGE
* el->el_cursor.h!!!
*/
- terminal_overwrite(el, &el->el_display[
+ terminal_overwrite(el,
+ (wchar_t *)&el->el_display[
el->el_cursor.v][el->el_cursor.h],
(size_t)(where - el->el_cursor.h));
