diff options
| author | tijl <tijl@FreeBSD.org> | 2015-04-30 16:08:47 +0000 |
|---|---|---|
| committer | tijl <tijl@FreeBSD.org> | 2015-04-30 16:08:47 +0000 |
| commit | b709ec868adb5170d09bc5a66b18d0e0d5987ab6 (patch) | |
| tree | c67e00b5fe571ffc8b53045db12739794a0aa566 /usr.bin/iconv | |
| parent | de0424ce2628044461b3970c30ea52cd23d4a937 (diff) | |
| download | FreeBSD-src-b709ec868adb5170d09bc5a66b18d0e0d5987ab6.zip FreeBSD-src-b709ec868adb5170d09bc5a66b18d0e0d5987ab6.tar.gz | |
MFC r275805:
Fix incorrect type of "invalids" argument in __iconv() prototype.
MFC r281550,281591:
Remove the const qualifier from iconv(3) to comply with POSIX:
http://pubs.opengroup.org/onlinepubs/9699919799/functions/iconv.html
Adjust all code that calls iconv.
PR: 199099
Diffstat (limited to 'usr.bin/iconv')
| -rw-r--r-- | usr.bin/iconv/iconv.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/usr.bin/iconv/iconv.c b/usr.bin/iconv/iconv.c index dc2aec0..494aaf7 100644 --- a/usr.bin/iconv/iconv.c +++ b/usr.bin/iconv/iconv.c @@ -71,9 +71,8 @@ do_conv(FILE *fp, const char *from, const char *to, bool silent, bool hide_invalid) { iconv_t cd; - char inbuf[INBUFSIZE], outbuf[OUTBUFSIZE], *out; + char inbuf[INBUFSIZE], outbuf[OUTBUFSIZE], *in, *out; unsigned long long invalids; - const char *in; size_t inbytes, outbytes, ret; if ((cd = iconv_open(to, from)) == (iconv_t)-1) |
