Module Name: src
Committed By: christos
Date: Tue Oct 4 15:27:04 UTC 2011
Modified Files:
src/lib/libedit: search.c terminal.c tty.c vi.c
Log Message:
fixed warnings where wint_t is unsigned.
To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 src/lib/libedit/search.c
cvs rdiff -u -r1.9 -r1.10 src/lib/libedit/terminal.c
cvs rdiff -u -r1.40 -r1.41 src/lib/libedit/tty.c src/lib/libedit/vi.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/search.c
diff -u src/lib/libedit/search.c:1.29 src/lib/libedit/search.c:1.30
--- src/lib/libedit/search.c:1.29 Tue Aug 16 12:25:15 2011
+++ src/lib/libedit/search.c Tue Oct 4 11:27:04 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: search.c,v 1.29 2011/08/16 16:25:15 christos Exp $ */
+/* $NetBSD: search.c,v 1.30 2011/10/04 15:27:04 christos Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -37,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)search.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: search.c,v 1.29 2011/08/16 16:25:15 christos Exp $");
+__RCSID("$NetBSD: search.c,v 1.30 2011/10/04 15:27:04 christos Exp $");
#endif
#endif /* not lint && not SCCSID */
@@ -600,7 +600,7 @@ cv_csearch(EditLine *el, int direction,
if (ch == 0)
return CC_ERROR;
- if (ch == -1) {
+ if (ch == (Int)-1) {
Char c;
if (FUN(el,getc)(el, &c) != 1)
return ed_end_of_file(el, 0);
@@ -614,14 +614,14 @@ cv_csearch(EditLine *el, int direction,
cp = el->el_line.cursor;
while (count--) {
- if (*cp == ch)
+ if ((Int)*cp == ch)
cp += direction;
for (;;cp += direction) {
if (cp >= el->el_line.lastchar)
return CC_ERROR;
if (cp < el->el_line.buffer)
return CC_ERROR;
- if (*cp == ch)
+ if ((Int)*cp == ch)
break;
}
}
Index: src/lib/libedit/terminal.c
diff -u src/lib/libedit/terminal.c:1.9 src/lib/libedit/terminal.c:1.10
--- src/lib/libedit/terminal.c:1.9 Mon Oct 3 10:09:38 2011
+++ src/lib/libedit/terminal.c Tue Oct 4 11:27:04 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: terminal.c,v 1.9 2011/10/03 14:09:38 christos Exp $ */
+/* $NetBSD: terminal.c,v 1.10 2011/10/04 15:27:04 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.9 2011/10/03 14:09:38 christos Exp $");
+__RCSID("$NetBSD: terminal.c,v 1.10 2011/10/04 15:27:04 christos Exp $");
#endif
#endif /* not lint && not SCCSID */
@@ -1235,7 +1235,7 @@ terminal__putc(EditLine *el, Int c)
{
char buf[MB_LEN_MAX +1];
ssize_t i;
- if (c == MB_FILL_CHAR)
+ if (c == (Int)MB_FILL_CHAR)
return 0;
i = ct_encode_char(buf, (size_t)MB_LEN_MAX, c);
if (i <= 0)
Index: src/lib/libedit/tty.c
diff -u src/lib/libedit/tty.c:1.40 src/lib/libedit/tty.c:1.41
--- src/lib/libedit/tty.c:1.40 Tue Aug 16 12:25:15 2011
+++ src/lib/libedit/tty.c Tue Oct 4 11:27:04 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: tty.c,v 1.40 2011/08/16 16:25:15 christos Exp $ */
+/* $NetBSD: tty.c,v 1.41 2011/10/04 15:27:04 christos Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -37,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)tty.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: tty.c,v 1.40 2011/08/16 16:25:15 christos Exp $");
+__RCSID("$NetBSD: tty.c,v 1.41 2011/10/04 15:27:04 christos Exp $");
#endif
#endif /* not lint && not SCCSID */
@@ -154,7 +154,7 @@ private const ttymap_t tty_map[] = {
{C_LNEXT, VLNEXT,
{ED_QUOTED_INSERT, ED_QUOTED_INSERT, ED_UNASSIGNED}},
#endif /* VLNEXT */
- {-1, -1,
+ {(Int)-1, (Int)-1,
{ED_UNASSIGNED, ED_UNASSIGNED, ED_UNASSIGNED}}
};
@@ -914,7 +914,7 @@ tty_bind_char(EditLine *el, int force)
dalt = NULL;
}
- for (tp = tty_map; tp->nch != -1; tp++) {
+ for (tp = tty_map; tp->nch != (Int)-1; tp++) {
new[0] = t_n[tp->nch];
old[0] = t_o[tp->och];
if (new[0] == old[0] && !force)
Index: src/lib/libedit/vi.c
diff -u src/lib/libedit/vi.c:1.40 src/lib/libedit/vi.c:1.41
--- src/lib/libedit/vi.c:1.40 Tue Aug 16 12:25:15 2011
+++ src/lib/libedit/vi.c Tue Oct 4 11:27:04 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: vi.c,v 1.40 2011/08/16 16:25:15 christos Exp $ */
+/* $NetBSD: vi.c,v 1.41 2011/10/04 15:27:04 christos Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -42,7 +42,7 @@
#if 0
static char sccsid[] = "@(#)vi.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: vi.c,v 1.40 2011/08/16 16:25:15 christos Exp $");
+__RCSID("$NetBSD: vi.c,v 1.41 2011/10/04 15:27:04 christos Exp $");
#endif
#endif /* not lint && not SCCSID */
@@ -63,7 +63,7 @@ cv_action(EditLine *el, Int c)
if (el->el_chared.c_vcmd.action != NOP) {
/* 'cc', 'dd' and (possibly) friends */
- if (c != el->el_chared.c_vcmd.action)
+ if (c != (Int)el->el_chared.c_vcmd.action)
return CC_ERROR;
if (!(c & YANK))
