Module Name: src
Committed By: christos
Date: Fri Jul 29 23:44:45 UTC 2011
Modified Files:
src/lib/libedit: Makefile chared.c chartype.c chartype.h el.h
filecomplete.c history.c keymacro.c read.c readline.c refresh.c
search.c terminal.c terminal.h vi.c
Log Message:
pass -Wconversion
To generate a diff of this commit:
cvs rdiff -u -r1.45 -r1.46 src/lib/libedit/Makefile
cvs rdiff -u -r1.33 -r1.34 src/lib/libedit/chared.c
cvs rdiff -u -r1.8 -r1.9 src/lib/libedit/chartype.c
cvs rdiff -u -r1.7 -r1.8 src/lib/libedit/chartype.h
cvs rdiff -u -r1.24 -r1.25 src/lib/libedit/el.h
cvs rdiff -u -r1.28 -r1.29 src/lib/libedit/filecomplete.c
cvs rdiff -u -r1.44 -r1.45 src/lib/libedit/history.c
cvs rdiff -u -r1.5 -r1.6 src/lib/libedit/keymacro.c
cvs rdiff -u -r1.65 -r1.66 src/lib/libedit/read.c
cvs rdiff -u -r1.97 -r1.98 src/lib/libedit/readline.c
cvs rdiff -u -r1.36 -r1.37 src/lib/libedit/refresh.c
cvs rdiff -u -r1.27 -r1.28 src/lib/libedit/search.c
cvs rdiff -u -r1.6 -r1.7 src/lib/libedit/terminal.c
cvs rdiff -u -r1.2 -r1.3 src/lib/libedit/terminal.h
cvs rdiff -u -r1.38 -r1.39 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/Makefile
diff -u src/lib/libedit/Makefile:1.45 src/lib/libedit/Makefile:1.46
--- src/lib/libedit/Makefile:1.45 Fri Jul 29 16:56:58 2011
+++ src/lib/libedit/Makefile Fri Jul 29 19:44:44 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.45 2011/07/29 20:56:58 christos Exp $
+# $NetBSD: Makefile,v 1.46 2011/07/29 23:44:44 christos Exp $
# @(#)Makefile 8.1 (Berkeley) 6/4/93
USE_SHLIBDIR= yes
@@ -8,7 +8,7 @@
LIB= edit
LIBDPLIBS+= terminfo ${.CURDIR}/../libterminfo
-COPTS+=-Wunused-parameter
+COPTS+=-Wunused-parameter -Wconversion
OSRCS= chared.c common.c el.c emacs.c fcns.c filecomplete.c help.c \
hist.c keymacro.c map.c chartype.c \
Index: src/lib/libedit/chared.c
diff -u src/lib/libedit/chared.c:1.33 src/lib/libedit/chared.c:1.34
--- src/lib/libedit/chared.c:1.33 Fri Jul 29 11:20:39 2011
+++ src/lib/libedit/chared.c Fri Jul 29 19:44:44 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: chared.c,v 1.33 2011/07/29 15:20:39 christos Exp $ */
+/* $NetBSD: chared.c,v 1.34 2011/07/29 23:44:44 christos Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -37,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)chared.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: chared.c,v 1.33 2011/07/29 15:20:39 christos Exp $");
+__RCSID("$NetBSD: chared.c,v 1.34 2011/07/29 23:44:44 christos Exp $");
#endif
#endif /* not lint && not SCCSID */
@@ -691,7 +691,7 @@
break;
default:
- if (len >= EL_BUFSIZ - 16)
+ if (len >= (ssize_t)(EL_BUFSIZ - 16))
terminal_beep(el);
else {
buf[len++] = ch;
Index: src/lib/libedit/chartype.c
diff -u src/lib/libedit/chartype.c:1.8 src/lib/libedit/chartype.c:1.9
--- src/lib/libedit/chartype.c:1.8 Fri Jul 29 11:16:33 2011
+++ src/lib/libedit/chartype.c Fri Jul 29 19:44:44 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: chartype.c,v 1.8 2011/07/29 15:16:33 christos Exp $ */
+/* $NetBSD: chartype.c,v 1.9 2011/07/29 23:44:44 christos Exp $ */
/*-
* Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -38,12 +38,12 @@
*/
#include "config.h"
#if !defined(lint) && !defined(SCCSID)
-__RCSID("$NetBSD: chartype.c,v 1.8 2011/07/29 15:16:33 christos Exp $");
+__RCSID("$NetBSD: chartype.c,v 1.9 2011/07/29 23:44:44 christos Exp $");
#endif /* not lint && not SCCSID */
#include "el.h"
#include <stdlib.h>
-#define CT_BUFSIZ 1024
+#define CT_BUFSIZ ((size_t)1024)
#ifdef WIDECHAR
protected void
@@ -83,7 +83,7 @@
if (!s)
return NULL;
if (!conv->cbuff)
- ct_conv_buff_resize(conv, CT_BUFSIZ, 0);
+ ct_conv_buff_resize(conv, CT_BUFSIZ, (size_t)0);
if (!conv->cbuff)
return NULL;
@@ -92,12 +92,13 @@
used = conv->csize - (dst - conv->cbuff);
if (used < 5) {
used = dst - conv->cbuff;
- ct_conv_buff_resize(conv, conv->csize + CT_BUFSIZ, 0);
+ ct_conv_buff_resize(conv, conv->csize + CT_BUFSIZ,
+ (size_t)0);
if (!conv->cbuff)
return NULL;
dst = conv->cbuff + used;
}
- used = ct_encode_char(dst, 5, *s);
+ used = ct_encode_char(dst, (size_t)5, *s);
if (used == -1) /* failed to encode, need more buffer space */
abort();
++s;
@@ -115,15 +116,15 @@
if (!s)
return NULL;
if (!conv->wbuff)
- ct_conv_buff_resize(conv, 0, CT_BUFSIZ);
+ ct_conv_buff_resize(conv, (size_t)0, CT_BUFSIZ);
if (!conv->wbuff)
return NULL;
- len = ct_mbstowcs(NULL, s, 0);
+ len = ct_mbstowcs(NULL, s, (size_t)0);
if (len == (size_t)-1)
return NULL;
if (len > conv->wsize)
- ct_conv_buff_resize(conv, 0, len + 1);
+ ct_conv_buff_resize(conv, (size_t)0, len + 1);
if (!conv->wbuff)
return NULL;
ct_mbstowcs(conv->wbuff, s, conv->wsize);
@@ -144,7 +145,7 @@
* the argv strings. */
for (i = 0, bufspace = 0; i < argc; ++i)
bufspace += argv[i] ? strlen(argv[i]) + 1 : 0;
- ct_conv_buff_resize(conv, 0, bufspace);
+ ct_conv_buff_resize(conv, (size_t)0, bufspace);
if (!conv->wsize)
return NULL;
Index: src/lib/libedit/chartype.h
diff -u src/lib/libedit/chartype.h:1.7 src/lib/libedit/chartype.h:1.8
--- src/lib/libedit/chartype.h:1.7 Thu Dec 16 12:42:28 2010
+++ src/lib/libedit/chartype.h Fri Jul 29 19:44:44 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: chartype.h,v 1.7 2010/12/16 17:42:28 wiz Exp $ */
+/* $NetBSD: chartype.h,v 1.8 2011/07/29 23:44:44 christos Exp $ */
/*-
* Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -61,7 +61,7 @@
#endif
#define ct_mbtowc mbtowc
-#define ct_mbtowc_reset mbtowc(0,0,0)
+#define ct_mbtowc_reset mbtowc(0,0,(size_t)0)
#define ct_wctomb wctomb
#define ct_wctomb_reset wctomb(0,0)
#define ct_wcstombs wcstombs
@@ -206,7 +206,7 @@
/* The maximum buffer size to hold the most unwieldly visual representation,
* in this case \U+nnnnn. */
-#define VISUAL_WIDTH_MAX 8
+#define VISUAL_WIDTH_MAX ((size_t)8)
/* The terminal is thought of in terms of X columns by Y lines. In the cases
* where a wide character takes up more than one column, the adjacent
Index: src/lib/libedit/el.h
diff -u src/lib/libedit/el.h:1.24 src/lib/libedit/el.h:1.25
--- src/lib/libedit/el.h:1.24 Wed Jul 27 21:56:27 2011
+++ src/lib/libedit/el.h Fri Jul 29 19:44:44 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: el.h,v 1.24 2011/07/28 01:56:27 christos Exp $ */
+/* $NetBSD: el.h,v 1.25 2011/07/29 23:44:44 christos Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -51,7 +51,7 @@
#include <stdio.h>
#include <sys/types.h>
-#define EL_BUFSIZ 1024 /* Maximum line size */
+#define EL_BUFSIZ ((size_t)1024) /* Maximum line size */
#define HANDLE_SIGNALS 0x01
#define NO_TTY 0x02
Index: src/lib/libedit/filecomplete.c
diff -u src/lib/libedit/filecomplete.c:1.28 src/lib/libedit/filecomplete.c:1.29
--- src/lib/libedit/filecomplete.c:1.28 Fri Jul 29 16:58:07 2011
+++ src/lib/libedit/filecomplete.c Fri Jul 29 19:44:44 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: filecomplete.c,v 1.28 2011/07/29 20:58:07 christos Exp $ */
+/* $NetBSD: filecomplete.c,v 1.29 2011/07/29 23:44:44 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.28 2011/07/29 20:58:07 christos Exp $");
+__RCSID("$NetBSD: filecomplete.c,v 1.29 2011/07/29 23:44:44 christos Exp $");
#endif /* not lint && not SCCSID */
#include <sys/types.h>
@@ -572,6 +572,6 @@
_el_fn_complete(EditLine *el, int ch __attribute__((__unused__)))
{
return (unsigned char)fn_complete(el, NULL, NULL,
- break_chars, NULL, NULL, 100,
+ break_chars, NULL, NULL, (size_t)100,
NULL, NULL, NULL, NULL);
}
Index: src/lib/libedit/history.c
diff -u src/lib/libedit/history.c:1.44 src/lib/libedit/history.c:1.45
--- src/lib/libedit/history.c:1.44 Fri Jul 29 16:58:07 2011
+++ src/lib/libedit/history.c Fri Jul 29 19:44:44 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: history.c,v 1.44 2011/07/29 20:58:07 christos Exp $ */
+/* $NetBSD: history.c,v 1.45 2011/07/29 23:44:44 christos Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -37,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)history.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: history.c,v 1.44 2011/07/29 20:58:07 christos Exp $");
+__RCSID("$NetBSD: history.c,v 1.45 2011/07/29 23:44:44 christos Exp $");
#endif
#endif /* not lint && not SCCSID */
@@ -760,7 +760,7 @@
if (max_size < sz) {
char *nptr;
- max_size = (sz + 1024) & ~1023;
+ max_size = (sz + 1024) & (size_t)~1023;
nptr = h_realloc(ptr, max_size * sizeof(*ptr));
if (nptr == NULL) {
i = -1;
@@ -816,7 +816,7 @@
len = strlen(str) * 4;
if (len >= max_size) {
char *nptr;
- max_size = (len + 1024) & ~1023;
+ max_size = (len + 1024) & (size_t)~1023;
nptr = h_realloc(ptr, max_size * sizeof(*ptr));
if (nptr == NULL) {
i = -1;
Index: src/lib/libedit/keymacro.c
diff -u src/lib/libedit/keymacro.c:1.5 src/lib/libedit/keymacro.c:1.6
--- src/lib/libedit/keymacro.c:1.5 Fri Jul 29 11:16:33 2011
+++ src/lib/libedit/keymacro.c Fri Jul 29 19:44:44 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: keymacro.c,v 1.5 2011/07/29 15:16:33 christos Exp $ */
+/* $NetBSD: keymacro.c,v 1.6 2011/07/29 23:44:44 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: keymacro.c,v 1.5 2011/07/29 15:16:33 christos Exp $");
+__RCSID("$NetBSD: keymacro.c,v 1.6 2011/07/29 23:44:44 christos Exp $");
#endif
#endif /* not lint && not SCCSID */
@@ -265,7 +265,7 @@
return;
el->el_keymacro.buf[0] = '"';
- if (node_lookup(el, key, el->el_keymacro.map, 1) <= -1)
+ if (node_lookup(el, key, el->el_keymacro.map, (size_t)1) <= -1)
/* key is not bound */
(void) fprintf(el->el_errfile, "Unbound extended key \"" FSTR
"\"\n", key);
Index: src/lib/libedit/read.c
diff -u src/lib/libedit/read.c:1.65 src/lib/libedit/read.c:1.66
--- src/lib/libedit/read.c:1.65 Fri Jul 29 11:16:33 2011
+++ src/lib/libedit/read.c Fri Jul 29 19:44:44 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: read.c,v 1.65 2011/07/29 15:16:33 christos Exp $ */
+/* $NetBSD: read.c,v 1.66 2011/07/29 23:44:44 christos Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -37,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)read.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: read.c,v 1.65 2011/07/29 15:16:33 christos Exp $");
+__RCSID("$NetBSD: read.c,v 1.66 2011/07/29 23:44:44 christos Exp $");
#endif
#endif /* not lint && not SCCSID */
@@ -52,7 +52,7 @@
#include <limits.h>
#include "el.h"
-#define OKCMD -1 /* must be -1! */
+#define OKCMD -1 /* must be -1! */
private int read__fixio(int, int);
private int read_preread(EditLine *);
@@ -133,7 +133,7 @@
#ifdef EWOULDBLOCK
case EWOULDBLOCK:
#ifndef TRY_AGAIN
-#define TRY_AGAIN
+#define TRY_AGAIN
#endif
#endif /* EWOULDBLOCK */
@@ -141,7 +141,7 @@
#if defined(EWOULDBLOCK) && EWOULDBLOCK != EAGAIN
case EAGAIN:
#ifndef TRY_AGAIN
-#define TRY_AGAIN
+#define TRY_AGAIN
#endif
#endif /* EWOULDBLOCK && EWOULDBLOCK != EAGAIN */
#endif /* POSIX && EAGAIN */
@@ -262,11 +262,11 @@
*ch |= 0200;
}
#ifdef WIDECHAR
- if (*ch >= N_KEYS)
- cmd = ED_INSERT;
+ if (*ch >= N_KEYS)
+ cmd = ED_INSERT;
else
#endif
- cmd = el->el_map.current[(unsigned char) *ch];
+ cmd = el->el_map.current[(unsigned char) *ch];
if (cmd == ED_SEQUENCE_LEAD_IN) {
keymacro_value_t val;
switch (keymacro_get(el, ch, &val)) {
@@ -296,13 +296,13 @@
#ifdef WIDECHAR
/* utf8_islead():
- * Test whether a byte is a leading byte of a UTF-8 sequence.
+ * Test whether a byte is a leading byte of a UTF-8 sequence.
*/
private int
-utf8_islead(unsigned char c)
+utf8_islead(int c)
{
- return c < 0x80 || /* single byte char */
- (c >= 0xc2 && c <= 0xf4); /* start of multibyte sequence */
+ return c < 0x80 || /* single byte char */
+ (c >= 0xc2 && c <= 0xf4); /* start of multibyte sequence */
}
#endif
@@ -314,13 +314,13 @@
{
ssize_t num_read;
int tried = 0;
- char cbuf[MB_LEN_MAX];
- int cbp = 0;
- int bytes = 0;
+ char cbuf[MB_LEN_MAX];
+ size_t cbp = 0;
+ int bytes = 0;
again:
el->el_signal->sig_no = 0;
- while ((num_read = read(el->el_infd, cbuf + cbp, 1)) == -1) {
+ while ((num_read = read(el->el_infd, cbuf + cbp, (size_t)1)) == -1) {
switch (el->el_signal->sig_no) {
case SIGCONT:
FUN(el,set)(el, EL_REFRESH);
@@ -492,7 +492,7 @@
/* make sure there is space for next character */
if (cp + 1 >= el->el_line.limit) {
idx = (cp - el->el_line.buffer);
- if (!ch_enlargebufs(el, 2))
+ if (!ch_enlargebufs(el, (size_t)2))
break;
cp = &el->el_line.buffer[idx];
}
@@ -544,7 +544,7 @@
/* make sure there is space next character */
if (cp + 1 >= el->el_line.limit) {
idx = (cp - el->el_line.buffer);
- if (!ch_enlargebufs(el, 2))
+ if (!ch_enlargebufs(el, (size_t)2))
break;
cp = &el->el_line.buffer[idx];
}
@@ -677,7 +677,7 @@
/* put (real) cursor in a known place */
re_clear_display(el); /* reset the display stuff */
ch_reset(el, 1); /* reset the input pointers */
- re_refresh(el); /* print the prompt again */
+ re_refresh(el); /* print the prompt again */
break;
case CC_ERROR:
Index: src/lib/libedit/readline.c
diff -u src/lib/libedit/readline.c:1.97 src/lib/libedit/readline.c:1.98
--- src/lib/libedit/readline.c:1.97 Fri Jul 29 16:58:07 2011
+++ src/lib/libedit/readline.c Fri Jul 29 19:44:44 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: readline.c,v 1.97 2011/07/29 20:58:07 christos Exp $ */
+/* $NetBSD: readline.c,v 1.98 2011/07/29 23:44:44 christos Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include "config.h"
#if !defined(lint) && !defined(SCCSID)
-__RCSID("$NetBSD: readline.c,v 1.97 2011/07/29 20:58:07 christos Exp $");
+__RCSID("$NetBSD: readline.c,v 1.98 2011/07/29 23:44:44 christos Exp $");
#endif /* not lint && not SCCSID */
#include <sys/types.h>
@@ -221,11 +221,9 @@
li = el_line(el);
/* a cheesy way to get rid of const cast. */
- *ap = memchr(li->buffer, *li->buffer, 1);
+ *ap = memchr(li->buffer, *li->buffer, (size_t)1);
}
-static const char _dothistory[] = "/.history";
-
static const char *
_default_history_file(void)
{
@@ -236,8 +234,7 @@
return path;
if ((p = getpwuid(getuid())) == NULL)
return NULL;
- strlcpy(path, p->pw_dir, PATH_MAX);
- strlcat(path, _dothistory, PATH_MAX);
+ (void)snprintf(path, sizeof(path), "%s/.history", p->pw_dir);
return path;
}
@@ -1189,7 +1186,7 @@
}
for(;;) {
- if (fread(buf, sizeof(buf), 1, fp) != 1) {
+ if (fread(buf, sizeof(buf), (size_t)1, fp) != 1) {
if (ferror(fp)) {
ret = errno;
break;
@@ -1199,7 +1196,7 @@
ret = errno;
break;
}
- left = fread(buf, 1, sizeof(buf), fp);
+ left = fread(buf, (size_t)1, sizeof(buf), fp);
if (ferror(fp)) {
ret = errno;
break;
@@ -1207,14 +1204,15 @@
if (left == 0) {
count--;
left = sizeof(buf);
- } else if (fwrite(buf, (size_t)left, 1, tp) != 1) {
+ } else if (fwrite(buf, (size_t)left, (size_t)1, tp)
+ != 1) {
ret = errno;
break;
}
fflush(tp);
break;
}
- if (fwrite(buf, sizeof(buf), 1, tp) != 1) {
+ if (fwrite(buf, sizeof(buf), (size_t)1, tp) != 1) {
ret = errno;
break;
}
@@ -1244,7 +1242,7 @@
ret = errno;
break;
}
- if (fread(buf, sizeof(buf), 1, tp) != 1) {
+ if (fread(buf, sizeof(buf), (size_t)1, tp) != 1) {
if (ferror(tp)) {
ret = errno;
break;
@@ -1258,7 +1256,7 @@
if (ret || nlines > 0)
goto out3;
- if (fseeko(fp, 0, SEEK_SET) == (off_t)-1) {
+ if (fseeko(fp, (off_t)0, SEEK_SET) == (off_t)-1) {
ret = errno;
goto out3;
}
@@ -1270,12 +1268,12 @@
}
for(;;) {
- if ((left = fread(buf, 1, sizeof(buf), tp)) == 0) {
+ if ((left = fread(buf, (size_t)1, sizeof(buf), tp)) == 0) {
if (ferror(fp))
ret = errno;
break;
}
- if (fwrite(buf, (size_t)left, 1, fp) != 1) {
+ if (fwrite(buf, (size_t)left, (size_t)1, fp) != 1) {
ret = errno;
break;
}
@@ -2055,7 +2053,7 @@
if (ioctl(el->el_infd, FIONREAD, &n) < 0)
return -1;
if (n)
- num_read = read(el->el_infd, cp, 1);
+ num_read = read(el->el_infd, cp, (size_t)1);
else
num_read = 0;
#elif defined(F_SETFL) && defined(O_NDELAY)
Index: src/lib/libedit/refresh.c
diff -u src/lib/libedit/refresh.c:1.36 src/lib/libedit/refresh.c:1.37
--- src/lib/libedit/refresh.c:1.36 Wed Jul 27 21:05:20 2011
+++ src/lib/libedit/refresh.c Fri Jul 29 19:44:45 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: refresh.c,v 1.36 2011/07/28 01:05:20 christos Exp $ */
+/* $NetBSD: refresh.c,v 1.37 2011/07/29 23:44:45 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.36 2011/07/28 01:05:20 christos Exp $");
+__RCSID("$NetBSD: refresh.c,v 1.37 2011/07/29 23:44:45 christos Exp $");
#endif
#endif /* not lint && not SCCSID */
@@ -1081,7 +1081,7 @@
for(i = 1; i < lins; i++)
el->el_display[i - 1] = el->el_display[i];
- re__copy_and_pad(firstline, STR(""), 0);
+ re__copy_and_pad(firstline, STR(""), (size_t)0);
el->el_display[i - 1] = firstline;
} else {
el->el_cursor.v++;
Index: src/lib/libedit/search.c
diff -u src/lib/libedit/search.c:1.27 src/lib/libedit/search.c:1.28
--- src/lib/libedit/search.c:1.27 Fri Jul 29 11:16:33 2011
+++ src/lib/libedit/search.c Fri Jul 29 19:44:45 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: search.c,v 1.27 2011/07/29 15:16:33 christos Exp $ */
+/* $NetBSD: search.c,v 1.28 2011/07/29 23:44:45 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.27 2011/07/29 15:16:33 christos Exp $");
+__RCSID("$NetBSD: search.c,v 1.28 2011/07/29 23:44:45 christos Exp $");
#endif
#endif /* not lint && not SCCSID */
@@ -128,7 +128,8 @@
#if defined(REGEX)
if (regcomp(&re, ct_encode_string(pat, &conv), 0) == 0) {
- rv = regexec(&re, ct_encode_string(str, &conv), 0, NULL, 0) == 0;
+ rv = regexec(&re, ct_encode_string(str, &conv), (size_t)0, NULL,
+ 0) == 0;
regfree(&re);
} else {
rv = 0;
Index: src/lib/libedit/terminal.c
diff -u src/lib/libedit/terminal.c:1.6 src/lib/libedit/terminal.c:1.7
--- src/lib/libedit/terminal.c:1.6 Fri Jul 29 11:20:39 2011
+++ src/lib/libedit/terminal.c Fri Jul 29 19:44:45 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: terminal.c,v 1.6 2011/07/29 15:20:39 christos Exp $ */
+/* $NetBSD: terminal.c,v 1.7 2011/07/29 23:44:45 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.6 2011/07/29 15:20:39 christos Exp $");
+__RCSID("$NetBSD: terminal.c,v 1.7 2011/07/29 23:44:45 christos Exp $");
#endif
#endif /* not lint && not SCCSID */
@@ -82,7 +82,7 @@
* assumption...
*/
-#define TC_BUFSIZE 2048
+#define TC_BUFSIZE ((size_t)2048)
#define GoodStr(a) (el->el_terminal.t_str[a] != NULL && \
el->el_terminal.t_str[a][0] != '\0')
@@ -353,7 +353,7 @@
/* XXX strcpy is safe */
(void) strcpy(*str = &el->el_terminal.t_buf[
el->el_terminal.t_loc], cap);
- el->el_terminal.t_loc += (int)clen + 1; /* one for \0 */
+ el->el_terminal.t_loc += clen + 1; /* one for \0 */
return;
}
/*
@@ -370,7 +370,7 @@
termbuf[tlen++] = '\0';
}
memcpy(el->el_terminal.t_buf, termbuf, TC_BUFSIZE);
- el->el_terminal.t_loc = (int)tlen;
+ el->el_terminal.t_loc = tlen;
if (el->el_terminal.t_loc + 3 >= TC_BUFSIZE) {
(void) fprintf(el->el_errfile,
"Out of termcap string space.\n");
@@ -669,7 +669,7 @@
Char c;
if ((c = el->el_display[el->el_cursor.v]
[el->el_cursor.h]) != '\0') {
- terminal_overwrite(el, &c, 1);
+ terminal_overwrite(el, &c, (size_t)1);
#ifdef WIDECHAR
while (el->el_display[el->el_cursor.v]
[el->el_cursor.h] == MB_FILL_CHAR)
@@ -1236,7 +1236,7 @@
ssize_t i;
if (c == MB_FILL_CHAR)
return 0;
- i = ct_encode_char(buf, MB_LEN_MAX, c);
+ i = ct_encode_char(buf, (size_t)MB_LEN_MAX, c);
if (i <= 0)
return (int)i;
buf[i] = '\0';
Index: src/lib/libedit/terminal.h
diff -u src/lib/libedit/terminal.h:1.2 src/lib/libedit/terminal.h:1.3
--- src/lib/libedit/terminal.h:1.2 Wed Jul 27 21:56:27 2011
+++ src/lib/libedit/terminal.h Fri Jul 29 19:44:45 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: terminal.h,v 1.2 2011/07/28 01:56:27 christos Exp $ */
+/* $NetBSD: terminal.h,v 1.3 2011/07/29 23:44:45 christos Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -63,7 +63,7 @@
#define TERM_HAS_AUTO_MARGINS 0x080 /* Has auto margins */
#define TERM_HAS_MAGIC_MARGINS 0x100 /* Has magic margins */
char *t_buf; /* Termcap buffer */
- int t_loc; /* location used */
+ size_t t_loc; /* location used */
char **t_str; /* termcap strings */
int *t_val; /* termcap values */
char *t_cap; /* Termcap buffer */
Index: src/lib/libedit/vi.c
diff -u src/lib/libedit/vi.c:1.38 src/lib/libedit/vi.c:1.39
--- src/lib/libedit/vi.c:1.38 Fri Jul 29 16:58:07 2011
+++ src/lib/libedit/vi.c Fri Jul 29 19:44:45 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: vi.c,v 1.38 2011/07/29 20:58:07 christos Exp $ */
+/* $NetBSD: vi.c,v 1.39 2011/07/29 23:44:45 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.38 2011/07/29 20:58:07 christos Exp $");
+__RCSID("$NetBSD: vi.c,v 1.39 2011/07/29 23:44:45 christos Exp $");
#endif
#endif /* not lint && not SCCSID */
@@ -1037,7 +1037,7 @@
cp[TMP_BUFSIZ - 1] = '\0';
len = strlen(cp);
write(fd, cp, len);
- write(fd, "\n", 1);
+ write(fd, "\n", (size_t)1);
pid = fork();
switch (pid) {
case -1:
