summaryrefslogtreecommitdiff
path: root/lib/libedit
diff options
context:
space:
mode:
authorchristos <christos@NetBSD.org>2009-02-16 00:15:45 +0000
committerchristos <christos@NetBSD.org>2009-02-16 00:15:45 +0000
commit7939d24e16e882be35f1abe6c0d2d404efa97e39 (patch)
tree54e02c46f695719d4dbcc318d8d8a972e0d9c05e /lib/libedit
parent4a8dbf1acbc868dade0141dd9fa9a9e25d1b1c37 (diff)
fix sign compare issues.
Diffstat (limited to 'lib/libedit')
-rw-r--r--lib/libedit/filecomplete.c6
-rw-r--r--lib/libedit/filecomplete.h4
-rw-r--r--lib/libedit/key.c6
-rw-r--r--lib/libedit/tty.c6
4 files changed, 11 insertions, 11 deletions
diff --git a/lib/libedit/filecomplete.c b/lib/libedit/filecomplete.c
index 190dc1b0504..58419491425 100644
--- a/lib/libedit/filecomplete.c
+++ b/lib/libedit/filecomplete.c
@@ -1,4 +1,4 @@
-/* $NetBSD: filecomplete.c,v 1.14 2009/02/15 21:55:23 christos Exp $ */
+/* $NetBSD: filecomplete.c,v 1.15 2009/02/16 00:15:45 christos Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include "config.h"
#if !defined(lint) && !defined(SCCSID)
-__RCSID("$NetBSD: filecomplete.c,v 1.14 2009/02/15 21:55:23 christos Exp $");
+__RCSID("$NetBSD: filecomplete.c,v 1.15 2009/02/16 00:15:45 christos Exp $");
#endif /* not lint && not SCCSID */
#include <sys/types.h>
@@ -383,7 +383,7 @@ fn_complete(EditLine *el,
char *(*complet_func)(const char *, int),
char **(*attempted_completion_function)(const char *, int, int),
const char *word_break, const char *special_prefixes,
- const char *(*app_func)(const char *), int query_items,
+ const char *(*app_func)(const char *), size_t query_items,
int *completion_type, int *over, int *point, int *end)
{
const LineInfo *li;
diff --git a/lib/libedit/filecomplete.h b/lib/libedit/filecomplete.h
index 0af3fc341d0..0ab43e2869c 100644
--- a/lib/libedit/filecomplete.h
+++ b/lib/libedit/filecomplete.h
@@ -1,4 +1,4 @@
-/* $NetBSD: filecomplete.h,v 1.7 2009/02/15 21:55:23 christos Exp $ */
+/* $NetBSD: filecomplete.h,v 1.8 2009/02/16 00:15:45 christos Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
int fn_complete(EditLine *,
char *(*)(const char *, int),
char **(*)(const char *, int, int),
- const char *, const char *, const char *(*)(const char *), int,
+ const char *, const char *, const char *(*)(const char *), size_t,
int *, int *, int *, int *);
void fn_display_match_list(EditLine *, char **, size_t, size_t);
diff --git a/lib/libedit/key.c b/lib/libedit/key.c
index 036b766c8d6..f54cb2ecb57 100644
--- a/lib/libedit/key.c
+++ b/lib/libedit/key.c
@@ -1,4 +1,4 @@
-/* $NetBSD: key.c,v 1.20 2009/02/15 21:55:23 christos Exp $ */
+/* $NetBSD: key.c,v 1.21 2009/02/16 00:15:45 christos Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -37,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)key.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: key.c,v 1.20 2009/02/15 21:55:23 christos Exp $");
+__RCSID("$NetBSD: key.c,v 1.21 2009/02/16 00:15:45 christos Exp $");
#endif
#endif /* not lint && not SCCSID */
@@ -700,7 +700,7 @@ key__decode_str(const char *str, char *buf, size_t len, const char *sep)
}
done:
ADDC('\0');
- if (b - buf >= len)
+ if ((size_t)(b - buf) >= len)
buf[len - 1] = '\0';
return (int)(b - buf);
}
diff --git a/lib/libedit/tty.c b/lib/libedit/tty.c
index 015c4355917..cc390fbb4e9 100644
--- a/lib/libedit/tty.c
+++ b/lib/libedit/tty.c
@@ -1,4 +1,4 @@
-/* $NetBSD: tty.c,v 1.29 2009/02/15 21:55:23 christos Exp $ */
+/* $NetBSD: tty.c,v 1.30 2009/02/16 00:15:45 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.29 2009/02/15 21:55:23 christos Exp $");
+__RCSID("$NetBSD: tty.c,v 1.30 2009/02/16 00:15:45 christos Exp $");
#endif
#endif /* not lint && not SCCSID */
@@ -1239,7 +1239,7 @@ tty_stty(EditLine *el, int argc __attribute__((__unused__)), const char **argv)
cu = strlen(m->m_name) + (x != '\0') + 1;
- if (len + cu >= el->el_term.t_size.h) {
+ if (len + cu >= (size_t)el->el_term.t_size.h) {
(void) fprintf(el->el_outfile, "\n%*s",
(int)st, "");
len = st + cu;