diff options
| author | Renato Botelho <renato@netgate.com> | 2016-01-25 08:56:15 -0200 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2016-01-25 08:56:15 -0200 |
| commit | eb84e0723f3b4bc5e40024f66fe21c14b09e9ec4 (patch) | |
| tree | fec6b99d018e13f1fccbe31478aaf29a28a55642 /contrib/less/cvt.c | |
| parent | c50df8e1b90c4f9b8bbffa592477c129854776ce (diff) | |
| parent | 94b1bbbd44bd88b6db1c00d795cdf7675b3ae254 (diff) | |
| download | FreeBSD-src-eb84e0723f3b4bc5e40024f66fe21c14b09e9ec4.zip FreeBSD-src-eb84e0723f3b4bc5e40024f66fe21c14b09e9ec4.tar.gz | |
Merge remote-tracking branch 'origin/stable/10' into devel
Diffstat (limited to 'contrib/less/cvt.c')
| -rw-r--r-- | contrib/less/cvt.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/contrib/less/cvt.c b/contrib/less/cvt.c index c3b3e6e..d983641 100644 --- a/contrib/less/cvt.c +++ b/contrib/less/cvt.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 1984-2012 Mark Nudelman + * Copyright (C) 1984-2015 Mark Nudelman * * You may distribute under the terms of either the GNU General Public * License or the Less License, as specified in the README file. @@ -75,8 +75,8 @@ cvt_text(odst, osrc, chpos, lenp, ops) for (src = osrc, dst = odst; src < src_end; ) { - int src_pos = src - osrc; - int dst_pos = dst - odst; + int src_pos = (int) (src - osrc); + int dst_pos = (int) (dst - odst); ch = step_char(&src, +1, src_end); if ((ops & CVT_BS) && ch == '\b' && dst > odst) { @@ -109,6 +109,6 @@ cvt_text(odst, osrc, chpos, lenp, ops) edst--; *edst = '\0'; if (lenp != NULL) - *lenp = edst - odst; + *lenp = (int) (edst - odst); /* FIXME: why was this here? if (chpos != NULL) chpos[dst - odst] = src - osrc; */ } |
