Author: tijl Date: Thu Apr 30 16:08:47 2015 New Revision: 282275 URL: https://svnweb.freebsd.org/changeset/base/282275
Log: 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 Modified: stable/10/UPDATING stable/10/bin/csh/config.h stable/10/bin/csh/iconv_stub.h stable/10/contrib/smbfs/include/netsmb/smb_lib.h stable/10/contrib/smbfs/lib/smb/nls.c stable/10/contrib/smbfs/lib/smb/print.c stable/10/contrib/smbfs/lib/smb/rq.c stable/10/include/iconv.h stable/10/lib/libarchive/Makefile stable/10/lib/libc/iconv/__iconv.c stable/10/lib/libc/iconv/bsd_iconv.c stable/10/lib/libc/iconv/citrus_iconv.h stable/10/lib/libc/iconv/citrus_iconv_local.h stable/10/lib/libc/iconv/citrus_none.c stable/10/lib/libc/iconv/citrus_stdenc.h stable/10/lib/libc/iconv/citrus_stdenc_local.h stable/10/lib/libc/iconv/citrus_stdenc_template.h stable/10/lib/libc/iconv/iconv-internal.h stable/10/lib/libc/iconv/iconv.3 stable/10/lib/libc/iconv/iconv.c stable/10/lib/libc/iconv/iconv_compat.c stable/10/lib/libc/locale/cXXrtomb_iconv.h stable/10/lib/libc/locale/mbrtocXX_iconv.h stable/10/lib/libiconv_modules/BIG5/citrus_big5.c stable/10/lib/libiconv_modules/DECHanyu/citrus_dechanyu.c stable/10/lib/libiconv_modules/EUC/citrus_euc.c stable/10/lib/libiconv_modules/EUCTW/citrus_euctw.c stable/10/lib/libiconv_modules/GBK2K/citrus_gbk2k.c stable/10/lib/libiconv_modules/HZ/citrus_hz.c stable/10/lib/libiconv_modules/ISO2022/citrus_iso2022.c stable/10/lib/libiconv_modules/JOHAB/citrus_johab.c stable/10/lib/libiconv_modules/MSKanji/citrus_mskanji.c stable/10/lib/libiconv_modules/UES/citrus_ues.c stable/10/lib/libiconv_modules/UTF1632/citrus_utf1632.c stable/10/lib/libiconv_modules/UTF7/citrus_utf7.c stable/10/lib/libiconv_modules/UTF8/citrus_utf8.c stable/10/lib/libiconv_modules/VIQR/citrus_viqr.c stable/10/lib/libiconv_modules/ZW/citrus_zw.c stable/10/lib/libiconv_modules/iconv_none/citrus_iconv_none.c stable/10/lib/libiconv_modules/iconv_std/citrus_iconv_std.c stable/10/lib/libkiconv/xlat16_iconv.c stable/10/sys/sys/param.h stable/10/usr.bin/iconv/iconv.c Directory Properties: stable/10/ (props changed) Modified: stable/10/UPDATING ============================================================================== --- stable/10/UPDATING Thu Apr 30 15:48:48 2015 (r282274) +++ stable/10/UPDATING Thu Apr 30 16:08:47 2015 (r282275) @@ -16,6 +16,10 @@ from older versions of FreeBSD, try WITH stable/10, and then rebuild without this option. The bootstrap process from older version of current is a bit fragile. +20150430: + The const qualifier has been removed from iconv(3) to comply with + POSIX. The ports tree is aware of this from r384038 onwards. + 20141215: At svn r275807, The default linux compat kernel ABI has been adjusted to 2.6.18 in support of the linux-c6 compat ports infrastructure Modified: stable/10/bin/csh/config.h ============================================================================== --- stable/10/bin/csh/config.h Thu Apr 30 15:48:48 2015 (r282274) +++ stable/10/bin/csh/config.h Thu Apr 30 16:08:47 2015 (r282275) @@ -198,7 +198,7 @@ #define HAVE_WCWIDTH 1 /* Define as const if the declaration of iconv() needs const. */ -#define ICONV_CONST const +#define ICONV_CONST /* Support NLS. */ #define NLS 1 Modified: stable/10/bin/csh/iconv_stub.h ============================================================================== --- stable/10/bin/csh/iconv_stub.h Thu Apr 30 15:48:48 2015 (r282274) +++ stable/10/bin/csh/iconv_stub.h Thu Apr 30 16:08:47 2015 (r282275) @@ -30,7 +30,7 @@ #define _ICONV_H_ typedef void *iconv_t; -typedef size_t dl_iconv_t(iconv_t, const char **, size_t *, char **, size_t *); +typedef size_t dl_iconv_t(iconv_t, char **, size_t *, char **, size_t *); typedef int dl_iconv_close_t(iconv_t); extern iconv_t dl_iconv_open(const char *, const char *); Modified: stable/10/contrib/smbfs/include/netsmb/smb_lib.h ============================================================================== --- stable/10/contrib/smbfs/include/netsmb/smb_lib.h Thu Apr 30 15:48:48 2015 (r282274) +++ stable/10/contrib/smbfs/include/netsmb/smb_lib.h Thu Apr 30 16:08:47 2015 (r282275) @@ -191,7 +191,7 @@ int smb_ctx_readrc(struct smb_ctx *); int smb_ctx_resolve(struct smb_ctx *); int smb_ctx_setflags(struct smb_ctx *, int, int, int); -int smb_smb_open_print_file(struct smb_ctx *, int, int, const char *, smbfh*); +int smb_smb_open_print_file(struct smb_ctx *, int, int, char *, smbfh*); int smb_smb_close_print_file(struct smb_ctx *, smbfh); int smb_read(struct smb_ctx *, smbfh, off_t, size_t, char *); @@ -204,8 +204,8 @@ int smb_rq_init(struct smb_ctx *, u_cha void smb_rq_done(struct smb_rq *); void smb_rq_wend(struct smb_rq *); int smb_rq_simple(struct smb_rq *); -int smb_rq_dmem(struct mbdata *, const char *, size_t); -int smb_rq_dstring(struct mbdata *, const char *); +int smb_rq_dmem(struct mbdata *, char *, size_t); +int smb_rq_dstring(struct mbdata *, char *); int smb_t2_request(struct smb_ctx *, int, int, const char *, int, void *, int, void *, int *, void *, int *, void *); @@ -246,10 +246,10 @@ extern u_char nls_lower[256], nls_upper[ int nls_setrecode(const char *, const char *); int nls_setlocale(const char *); -char* nls_str_toext(char *, const char *); -char* nls_str_toloc(char *, const char *); -void* nls_mem_toext(void *, const void *, int); -void* nls_mem_toloc(void *, const void *, int); +char* nls_str_toext(char *, char *); +char* nls_str_toloc(char *, char *); +void* nls_mem_toext(void *, void *, int); +void* nls_mem_toloc(void *, void *, int); char* nls_str_upper(char *, const char *); char* nls_str_lower(char *, const char *); Modified: stable/10/contrib/smbfs/lib/smb/nls.c ============================================================================== --- stable/10/contrib/smbfs/lib/smb/nls.c Thu Apr 30 15:48:48 2015 (r282274) +++ stable/10/contrib/smbfs/lib/smb/nls.c Thu Apr 30 16:08:47 2015 (r282275) @@ -102,7 +102,7 @@ nls_setrecode(const char *local, const c } char * -nls_str_toloc(char *dst, const char *src) +nls_str_toloc(char *dst, char *src) { #ifdef HAVE_ICONV char *p = dst; @@ -125,7 +125,7 @@ nls_str_toloc(char *dst, const char *src } char * -nls_str_toext(char *dst, const char *src) +nls_str_toext(char *dst, char *src) { #ifdef HAVE_ICONV char *p = dst; @@ -148,11 +148,11 @@ nls_str_toext(char *dst, const char *src } void * -nls_mem_toloc(void *dst, const void *src, int size) +nls_mem_toloc(void *dst, void *src, int size) { #ifdef HAVE_ICONV char *p = dst; - const char *s = src; + char *s = src; size_t inlen, outlen; if (size == 0) @@ -174,11 +174,11 @@ nls_mem_toloc(void *dst, const void *src } void * -nls_mem_toext(void *dst, const void *src, int size) +nls_mem_toext(void *dst, void *src, int size) { #ifdef HAVE_ICONV char *p = dst; - const char *s = src; + char *s = src; size_t inlen, outlen; if (size == 0) Modified: stable/10/contrib/smbfs/lib/smb/print.c ============================================================================== --- stable/10/contrib/smbfs/lib/smb/print.c Thu Apr 30 15:48:48 2015 (r282274) +++ stable/10/contrib/smbfs/lib/smb/print.c Thu Apr 30 16:08:47 2015 (r282275) @@ -54,7 +54,7 @@ int smb_smb_open_print_file(struct smb_ctx *ctx, int setuplen, int mode, - const char *ident, smbfh *fhp) + char *ident, smbfh *fhp) { struct smb_rq *rqp; struct mbdata *mbp; Modified: stable/10/contrib/smbfs/lib/smb/rq.c ============================================================================== --- stable/10/contrib/smbfs/lib/smb/rq.c Thu Apr 30 15:48:48 2015 (r282274) +++ stable/10/contrib/smbfs/lib/smb/rq.c Thu Apr 30 16:08:47 2015 (r282275) @@ -86,7 +86,7 @@ smb_rq_wend(struct smb_rq *rqp) } int -smb_rq_dmem(struct mbdata *mbp, const char *src, size_t size) +smb_rq_dmem(struct mbdata *mbp, char *src, size_t size) { struct mbuf *m; char * dst; @@ -118,7 +118,7 @@ smb_rq_dmem(struct mbdata *mbp, const ch } int -smb_rq_dstring(struct mbdata *mbp, const char *s) +smb_rq_dstring(struct mbdata *mbp, char *s) { return smb_rq_dmem(mbp, s, strlen(s) + 1); } Modified: stable/10/include/iconv.h ============================================================================== --- stable/10/include/iconv.h Thu Apr 30 15:48:48 2015 (r282274) +++ stable/10/include/iconv.h Thu Apr 30 16:08:47 2015 (r282275) @@ -53,7 +53,7 @@ typedef struct __tag_iconv_t *iconv_t; __BEGIN_DECLS iconv_t iconv_open(const char *, const char *); -size_t iconv(iconv_t, const char ** __restrict, +size_t iconv(iconv_t, char ** __restrict, size_t * __restrict, char ** __restrict, size_t * __restrict); int iconv_close(iconv_t); @@ -62,7 +62,7 @@ int iconv_close(iconv_t); */ int __iconv_get_list(char ***, size_t *, __iconv_bool); void __iconv_free_list(char **, size_t); -size_t __iconv(iconv_t, const char **, size_t *, char **, +size_t __iconv(iconv_t, char **, size_t *, char **, size_t *, __uint32_t, size_t *); #define __ICONV_F_HIDE_INVALID 0x0001 Modified: stable/10/lib/libarchive/Makefile ============================================================================== --- stable/10/lib/libarchive/Makefile Thu Apr 30 15:48:48 2015 (r282274) +++ stable/10/lib/libarchive/Makefile Thu Apr 30 16:08:47 2015 (r282275) @@ -37,7 +37,7 @@ LDADD+= -lmd .if ${MK_ICONV} != "no" # TODO: This can be changed back to CFLAGS once iconv works correctly # with statically linked binaries. -SHARED_CFLAGS+= -DHAVE_ICONV=1 -DHAVE_ICONV_H=1 -DICONV_CONST=const +SHARED_CFLAGS+= -DHAVE_ICONV=1 -DHAVE_ICONV_H=1 -DICONV_CONST= .endif .if ${MACHINE_ARCH:Marm*} != "" || ${MACHINE_ARCH:Mmips*} != "" || \ Modified: stable/10/lib/libc/iconv/__iconv.c ============================================================================== --- stable/10/lib/libc/iconv/__iconv.c Thu Apr 30 15:48:48 2015 (r282274) +++ stable/10/lib/libc/iconv/__iconv.c Thu Apr 30 16:08:47 2015 (r282275) @@ -31,7 +31,7 @@ #include "iconv-internal.h" size_t -__iconv(iconv_t a, const char **b, size_t *c, char **d, +__iconv(iconv_t a, char **b, size_t *c, char **d, size_t *e, __uint32_t f, size_t *g) { return __bsd___iconv(a, b, c, d, e, f, g); Modified: stable/10/lib/libc/iconv/bsd_iconv.c ============================================================================== --- stable/10/lib/libc/iconv/bsd_iconv.c Thu Apr 30 15:48:48 2015 (r282274) +++ stable/10/lib/libc/iconv/bsd_iconv.c Thu Apr 30 16:08:47 2015 (r282275) @@ -120,7 +120,7 @@ __bsd_iconv_close(iconv_t handle) } size_t -__bsd_iconv(iconv_t handle, const char **in, size_t *szin, char **out, size_t *szout) +__bsd_iconv(iconv_t handle, char **in, size_t *szin, char **out, size_t *szout) { size_t ret; int err; @@ -141,7 +141,7 @@ __bsd_iconv(iconv_t handle, const char * } size_t -__bsd___iconv(iconv_t handle, const char **in, size_t *szin, char **out, +__bsd___iconv(iconv_t handle, char **in, size_t *szin, char **out, size_t *szout, uint32_t flags, size_t *invalids) { size_t ret; Modified: stable/10/lib/libc/iconv/citrus_iconv.h ============================================================================== --- stable/10/lib/libc/iconv/citrus_iconv.h Thu Apr 30 15:48:48 2015 (r282274) +++ stable/10/lib/libc/iconv/citrus_iconv.h Thu Apr 30 16:08:47 2015 (r282275) @@ -52,7 +52,7 @@ __END_DECLS */ static __inline int _citrus_iconv_convert(struct _citrus_iconv * __restrict cv, - const char * __restrict * __restrict in, size_t * __restrict inbytes, + char * __restrict * __restrict in, size_t * __restrict inbytes, char * __restrict * __restrict out, size_t * __restrict outbytes, uint32_t flags, size_t * __restrict nresults) { Modified: stable/10/lib/libc/iconv/citrus_iconv_local.h ============================================================================== --- stable/10/lib/libc/iconv/citrus_iconv_local.h Thu Apr 30 15:48:48 2015 (r282274) +++ stable/10/lib/libc/iconv/citrus_iconv_local.h Thu Apr 30 16:08:47 2015 (r282275) @@ -46,7 +46,7 @@ static void _citrus_##_m_##_iconv_unini (struct _citrus_iconv_shared *); \ static int _citrus_##_m_##_iconv_convert \ (struct _citrus_iconv * __restrict, \ - const char * __restrict * __restrict, \ + char * __restrict * __restrict, \ size_t * __restrict, \ char * __restrict * __restrict, \ size_t * __restrict outbytes, \ @@ -75,7 +75,7 @@ typedef void (*_citrus_iconv_uninit_shar (struct _citrus_iconv_shared *); typedef int (*_citrus_iconv_convert_t) (struct _citrus_iconv * __restrict, - const char *__restrict* __restrict, size_t * __restrict, + char *__restrict* __restrict, size_t * __restrict, char * __restrict * __restrict, size_t * __restrict, uint32_t, size_t * __restrict); typedef int (*_citrus_iconv_init_context_t)(struct _citrus_iconv *); Modified: stable/10/lib/libc/iconv/citrus_none.c ============================================================================== --- stable/10/lib/libc/iconv/citrus_none.c Thu Apr 30 15:48:48 2015 (r282274) +++ stable/10/lib/libc/iconv/citrus_none.c Thu Apr 30 16:08:47 2015 (r282275) @@ -83,7 +83,7 @@ _citrus_NONE_stdenc_init_state(struct _c static int _citrus_NONE_stdenc_mbtocs(struct _citrus_stdenc * __restrict ce __unused, - _csid_t *csid, _index_t *idx, const char **s, size_t n, + _csid_t *csid, _index_t *idx, char **s, size_t n, void *ps __unused, size_t *nresult, struct iconv_hooks *hooks) { @@ -159,7 +159,7 @@ _citrus_NONE_stdenc_cstomb(struct _citru static int _citrus_NONE_stdenc_mbtowc(struct _citrus_stdenc * __restrict ce __unused, - _wc_t * __restrict pwc, const char ** __restrict s, size_t n, + _wc_t * __restrict pwc, char ** __restrict s, size_t n, void * __restrict pspriv __unused, size_t * __restrict nresult, struct iconv_hooks *hooks) { Modified: stable/10/lib/libc/iconv/citrus_stdenc.h ============================================================================== --- stable/10/lib/libc/iconv/citrus_stdenc.h Thu Apr 30 15:48:48 2015 (r282274) +++ stable/10/lib/libc/iconv/citrus_stdenc.h Thu Apr 30 16:08:47 2015 (r282275) @@ -69,7 +69,7 @@ _citrus_stdenc_init_state(struct _citrus static __inline int _citrus_stdenc_mbtocs(struct _citrus_stdenc * __restrict ce, _citrus_csid_t * __restrict csid, _citrus_index_t * __restrict idx, - const char ** __restrict s, size_t n, void * __restrict ps, + char ** __restrict s, size_t n, void * __restrict ps, size_t * __restrict nresult, struct iconv_hooks *hooks) { Modified: stable/10/lib/libc/iconv/citrus_stdenc_local.h ============================================================================== --- stable/10/lib/libc/iconv/citrus_stdenc_local.h Thu Apr 30 15:48:48 2015 (r282274) +++ stable/10/lib/libc/iconv/citrus_stdenc_local.h Thu Apr 30 16:08:47 2015 (r282275) @@ -55,7 +55,7 @@ static int _citrus_##_e_##_stdenc_mbtoc (struct _citrus_stdenc * __restrict, \ _citrus_csid_t * __restrict, \ _citrus_index_t * __restrict, \ - const char ** __restrict, size_t, \ + char ** __restrict, size_t, \ void * __restrict, size_t * __restrict, \ struct iconv_hooks *); \ static int _citrus_##_e_##_stdenc_cstomb \ @@ -66,7 +66,7 @@ static int _citrus_##_e_##_stdenc_cstom static int _citrus_##_e_##_stdenc_mbtowc \ (struct _citrus_stdenc * __restrict, \ _citrus_wc_t * __restrict, \ - const char ** __restrict, size_t, \ + char ** __restrict, size_t, \ void * __restrict, size_t * __restrict, \ struct iconv_hooks *); \ static int _citrus_##_e_##_stdenc_wctomb \ @@ -106,7 +106,7 @@ typedef int (*_citrus_stdenc_init_state_ typedef int (*_citrus_stdenc_mbtocs_t) (struct _citrus_stdenc * __restrict, _citrus_csid_t * __restrict, _citrus_index_t * __restrict, - const char ** __restrict, size_t, + char ** __restrict, size_t, void * __restrict, size_t * __restrict, struct iconv_hooks *); typedef int (*_citrus_stdenc_cstomb_t) @@ -116,7 +116,7 @@ typedef int (*_citrus_stdenc_cstomb_t) typedef int (*_citrus_stdenc_mbtowc_t) (struct _citrus_stdenc * __restrict, _citrus_wc_t * __restrict, - const char ** __restrict, size_t, + char ** __restrict, size_t, void * __restrict, size_t * __restrict, struct iconv_hooks *); typedef int (*_citrus_stdenc_wctomb_t) Modified: stable/10/lib/libc/iconv/citrus_stdenc_template.h ============================================================================== --- stable/10/lib/libc/iconv/citrus_stdenc_template.h Thu Apr 30 15:48:48 2015 (r282274) +++ stable/10/lib/libc/iconv/citrus_stdenc_template.h Thu Apr 30 16:08:47 2015 (r282275) @@ -112,7 +112,7 @@ _FUNCNAME(stdenc_init_state)(struct _cit static int _FUNCNAME(stdenc_mbtocs)(struct _citrus_stdenc * __restrict ce, _citrus_csid_t * __restrict csid, _citrus_index_t * __restrict idx, - const char ** __restrict s, size_t n, void * __restrict ps, + char ** __restrict s, size_t n, void * __restrict ps, size_t * __restrict nresult, struct iconv_hooks *hooks) { wchar_t wc; @@ -151,7 +151,7 @@ _FUNCNAME(stdenc_cstomb)(struct _citrus_ static int _FUNCNAME(stdenc_mbtowc)(struct _citrus_stdenc * __restrict ce, - _citrus_wc_t * __restrict wc, const char ** __restrict s, size_t n, + _citrus_wc_t * __restrict wc, char ** __restrict s, size_t n, void * __restrict ps, size_t * __restrict nresult, struct iconv_hooks *hooks) { Modified: stable/10/lib/libc/iconv/iconv-internal.h ============================================================================== --- stable/10/lib/libc/iconv/iconv-internal.h Thu Apr 30 15:48:48 2015 (r282274) +++ stable/10/lib/libc/iconv/iconv-internal.h Thu Apr 30 16:08:47 2015 (r282275) @@ -29,11 +29,11 @@ /* * Interal prototypes for our back-end functions. */ -size_t __bsd___iconv(iconv_t, const char **, size_t *, char **, +size_t __bsd___iconv(iconv_t, char **, size_t *, char **, size_t *, __uint32_t, size_t *); void __bsd___iconv_free_list(char **, size_t); int __bsd___iconv_get_list(char ***, size_t *, __iconv_bool); -size_t __bsd_iconv(iconv_t, const char ** __restrict, +size_t __bsd_iconv(iconv_t, char ** __restrict, size_t * __restrict, char ** __restrict, size_t * __restrict); const char *__bsd_iconv_canonicalize(const char *); Modified: stable/10/lib/libc/iconv/iconv.3 ============================================================================== --- stable/10/lib/libc/iconv/iconv.3 Thu Apr 30 15:48:48 2015 (r282274) +++ stable/10/lib/libc/iconv/iconv.3 Thu Apr 30 16:08:47 2015 (r282275) @@ -48,7 +48,7 @@ .Ft size_t .Fn iconv "iconv_t cd" "char ** restrict src" "size_t * restrict srcleft" "char ** restrict dst" "size_t * restrict dstleft" .Ft size_t -.Fn __iconv "iconv_t cd" "const char ** restrict src" "size_t * restrict srcleft" "char ** restrict dst" "size_t * restrict dstleft" "uint32_t flags" "size_t invalids" +.Fn __iconv "iconv_t cd" "char ** restrict src" "size_t * restrict srcleft" "char ** restrict dst" "size_t * restrict dstleft" "uint32_t flags" "size_t * invalids" .Sh DESCRIPTION The .Fn iconv_open Modified: stable/10/lib/libc/iconv/iconv.c ============================================================================== --- stable/10/lib/libc/iconv/iconv.c Thu Apr 30 15:48:48 2015 (r282274) +++ stable/10/lib/libc/iconv/iconv.c Thu Apr 30 16:08:47 2015 (r282275) @@ -31,7 +31,7 @@ #include "iconv-internal.h" size_t -iconv(iconv_t a, const char ** __restrict b, +iconv(iconv_t a, char ** __restrict b, size_t * __restrict c, char ** __restrict d, size_t * __restrict e) { Modified: stable/10/lib/libc/iconv/iconv_compat.c ============================================================================== --- stable/10/lib/libc/iconv/iconv_compat.c Thu Apr 30 15:48:48 2015 (r282274) +++ stable/10/lib/libc/iconv/iconv_compat.c Thu Apr 30 16:08:47 2015 (r282275) @@ -37,7 +37,7 @@ #include "iconv-internal.h" size_t -__iconv_compat(iconv_t a, const char ** b, size_t * c, char ** d, +__iconv_compat(iconv_t a, char ** b, size_t * c, char ** d, size_t * e, __uint32_t f, size_t *g) { return __bsd___iconv(a, b, c, d, e, f, g); @@ -56,7 +56,7 @@ __iconv_get_list_compat(char ***a, size_ } size_t -iconv_compat(iconv_t a, const char ** __restrict b, +iconv_compat(iconv_t a, char ** __restrict b, size_t * __restrict c, char ** __restrict d, size_t * __restrict e) { Modified: stable/10/lib/libc/locale/cXXrtomb_iconv.h ============================================================================== --- stable/10/lib/libc/locale/cXXrtomb_iconv.h Thu Apr 30 15:48:48 2015 (r282274) +++ stable/10/lib/libc/locale/cXXrtomb_iconv.h Thu Apr 30 16:08:47 2015 (r282275) @@ -57,8 +57,7 @@ cXXrtomb_l(char * __restrict s, charXX_t { _ConversionState *cs; struct _citrus_iconv *handle; - const char *src; - char *dst; + char *src, *dst; size_t srcleft, dstleft, invlen; int err; Modified: stable/10/lib/libc/locale/mbrtocXX_iconv.h ============================================================================== --- stable/10/lib/libc/locale/mbrtocXX_iconv.h Thu Apr 30 15:48:48 2015 (r282274) +++ stable/10/lib/libc/locale/mbrtocXX_iconv.h Thu Apr 30 16:08:47 2015 (r282275) @@ -99,8 +99,7 @@ mbrtocXX_l(charXX_t * __restrict pc, con /* Convert as few characters to the dst buffer as possible. */ for (i = 0; ; i++) { - const char *src; - char *dst; + char *src, *dst; size_t srcleft, dstleft, invlen; int err; Modified: stable/10/lib/libiconv_modules/BIG5/citrus_big5.c ============================================================================== --- stable/10/lib/libiconv_modules/BIG5/citrus_big5.c Thu Apr 30 15:48:48 2015 (r282274) +++ stable/10/lib/libiconv_modules/BIG5/citrus_big5.c Thu Apr 30 16:08:47 2015 (r282275) @@ -269,12 +269,12 @@ static int /*ARGSUSED*/ _citrus_BIG5_mbrtowc_priv(_BIG5EncodingInfo * __restrict ei, wchar_t * __restrict pwc, - const char ** __restrict s, size_t n, + char ** __restrict s, size_t n, _BIG5State * __restrict psenc, size_t * __restrict nresult) { wchar_t wchar; - const char *s0; + char *s0; int c, chlenbak; s0 = *s; Modified: stable/10/lib/libiconv_modules/DECHanyu/citrus_dechanyu.c ============================================================================== --- stable/10/lib/libiconv_modules/DECHanyu/citrus_dechanyu.c Thu Apr 30 15:48:48 2015 (r282274) +++ stable/10/lib/libiconv_modules/DECHanyu/citrus_dechanyu.c Thu Apr 30 16:08:47 2015 (r282275) @@ -165,10 +165,10 @@ is_94charset(int c) static int /*ARGSUSED*/ _citrus_DECHanyu_mbrtowc_priv(_DECHanyuEncodingInfo * __restrict ei, - wchar_t * __restrict pwc, const char ** __restrict s, size_t n, + wchar_t * __restrict pwc, char ** __restrict s, size_t n, _DECHanyuState * __restrict psenc, size_t * __restrict nresult) { - const char *s0; + char *s0; wchar_t wc; int ch; Modified: stable/10/lib/libiconv_modules/EUC/citrus_euc.c ============================================================================== --- stable/10/lib/libiconv_modules/EUC/citrus_euc.c Thu Apr 30 15:48:48 2015 (r282274) +++ stable/10/lib/libiconv_modules/EUC/citrus_euc.c Thu Apr 30 16:08:47 2015 (r282275) @@ -190,12 +190,12 @@ _citrus_EUC_unpack_state(_EUCEncodingInf #endif static int -_citrus_EUC_mbrtowc_priv(_EUCEncodingInfo *ei, wchar_t *pwc, const char **s, +_citrus_EUC_mbrtowc_priv(_EUCEncodingInfo *ei, wchar_t *pwc, char **s, size_t n, _EUCState *psenc, size_t *nresult) { wchar_t wchar; int c, chlenbak, cs, len; - const char *s0, *s1 = NULL; + char *s0, *s1 = NULL; s0 = *s; Modified: stable/10/lib/libiconv_modules/EUCTW/citrus_euctw.c ============================================================================== --- stable/10/lib/libiconv_modules/EUCTW/citrus_euctw.c Thu Apr 30 15:48:48 2015 (r282274) +++ stable/10/lib/libiconv_modules/EUCTW/citrus_euctw.c Thu Apr 30 16:08:47 2015 (r282275) @@ -176,10 +176,10 @@ _citrus_EUCTW_encoding_module_uninit(_EU static int _citrus_EUCTW_mbrtowc_priv(_EUCTWEncodingInfo * __restrict ei, - wchar_t * __restrict pwc, const char ** __restrict s, + wchar_t * __restrict pwc, char ** __restrict s, size_t n, _EUCTWState * __restrict psenc, size_t * __restrict nresult) { - const char *s0; + char *s0; wchar_t wchar; int c, chlenbak, cs; Modified: stable/10/lib/libiconv_modules/GBK2K/citrus_gbk2k.c ============================================================================== --- stable/10/lib/libiconv_modules/GBK2K/citrus_gbk2k.c Thu Apr 30 15:48:48 2015 (r282274) +++ stable/10/lib/libiconv_modules/GBK2K/citrus_gbk2k.c Thu Apr 30 16:08:47 2015 (r282275) @@ -149,10 +149,10 @@ _mb_count(wchar_t v) static int _citrus_GBK2K_mbrtowc_priv(_GBK2KEncodingInfo * __restrict ei, - wchar_t * __restrict pwc, const char ** __restrict s, size_t n, + wchar_t * __restrict pwc, char ** __restrict s, size_t n, _GBK2KState * __restrict psenc, size_t * __restrict nresult) { - const char *s0, *s1; + char *s0, *s1; wchar_t wc; int chlenbak, len; Modified: stable/10/lib/libiconv_modules/HZ/citrus_hz.c ============================================================================== --- stable/10/lib/libiconv_modules/HZ/citrus_hz.c Thu Apr 30 15:48:48 2015 (r282274) +++ stable/10/lib/libiconv_modules/HZ/citrus_hz.c Thu Apr 30 16:08:47 2015 (r282275) @@ -175,13 +175,13 @@ _citrus_HZ_unpack_state(_HZEncodingInfo static int _citrus_HZ_mbrtowc_priv(_HZEncodingInfo * __restrict ei, - wchar_t * __restrict pwc, const char ** __restrict s, size_t n, + wchar_t * __restrict pwc, char ** __restrict s, size_t n, _HZState * __restrict psenc, size_t * __restrict nresult) { escape_t *candidate, *init; graphic_t *graphic; const range_t *range; - const char *s0; + char *s0; wchar_t wc; int bit, ch, head, len, tail; Modified: stable/10/lib/libiconv_modules/ISO2022/citrus_iso2022.c ============================================================================== --- stable/10/lib/libiconv_modules/ISO2022/citrus_iso2022.c Thu Apr 30 15:48:48 2015 (r282274) +++ stable/10/lib/libiconv_modules/ISO2022/citrus_iso2022.c Thu Apr 30 16:08:47 2015 (r282275) @@ -574,7 +574,7 @@ terminate: static wchar_t _ISO2022_sgetwchar(_ISO2022EncodingInfo * __restrict ei __unused, - const char * __restrict string, size_t n, const char ** __restrict result, + char * __restrict string, size_t n, char ** __restrict result, _ISO2022State * __restrict psenc) { const struct seqtable *sp; @@ -842,10 +842,10 @@ asis: static int _citrus_ISO2022_mbrtowc_priv(_ISO2022EncodingInfo * __restrict ei, - wchar_t * __restrict pwc, const char ** __restrict s, + wchar_t * __restrict pwc, char ** __restrict s, size_t n, _ISO2022State * __restrict psenc, size_t * __restrict nresult) { - const char *p, *result, *s0; + char *p, *result, *s0; wchar_t wchar; int c, chlenbak; Modified: stable/10/lib/libiconv_modules/JOHAB/citrus_johab.c ============================================================================== --- stable/10/lib/libiconv_modules/JOHAB/citrus_johab.c Thu Apr 30 15:48:48 2015 (r282274) +++ stable/10/lib/libiconv_modules/JOHAB/citrus_johab.c Thu Apr 30 16:08:47 2015 (r282275) @@ -145,10 +145,10 @@ ishanja(int l, int t) static int /*ARGSUSED*/ _citrus_JOHAB_mbrtowc_priv(_JOHABEncodingInfo * __restrict ei, - wchar_t * __restrict pwc, const char ** __restrict s, size_t n, + wchar_t * __restrict pwc, char ** __restrict s, size_t n, _JOHABState * __restrict psenc, size_t * __restrict nresult) { - const char *s0; + char *s0; int l, t; if (*s == NULL) { Modified: stable/10/lib/libiconv_modules/MSKanji/citrus_mskanji.c ============================================================================== --- stable/10/lib/libiconv_modules/MSKanji/citrus_mskanji.c Thu Apr 30 15:48:48 2015 (r282274) +++ stable/10/lib/libiconv_modules/MSKanji/citrus_mskanji.c Thu Apr 30 16:08:47 2015 (r282275) @@ -153,10 +153,10 @@ _citrus_MSKanji_unpack_state(_MSKanjiEnc static int /*ARGSUSED*/ _citrus_MSKanji_mbrtowc_priv(_MSKanjiEncodingInfo * __restrict ei, - wchar_t * __restrict pwc, const char ** __restrict s, size_t n, + wchar_t * __restrict pwc, char ** __restrict s, size_t n, _MSKanjiState * __restrict psenc, size_t * __restrict nresult) { - const char *s0; + char *s0; wchar_t wchar; int chlenbak, len; Modified: stable/10/lib/libiconv_modules/UES/citrus_ues.c ============================================================================== --- stable/10/lib/libiconv_modules/UES/citrus_ues.c Thu Apr 30 15:48:48 2015 (r282274) +++ stable/10/lib/libiconv_modules/UES/citrus_ues.c Thu Apr 30 16:08:47 2015 (r282275) @@ -185,10 +185,10 @@ is_basic(wchar_t wc) static int _citrus_UES_mbrtowc_priv(_UESEncodingInfo * __restrict ei, - wchar_t * __restrict pwc, const char ** __restrict s, size_t n, + wchar_t * __restrict pwc, char ** __restrict s, size_t n, _UESState * __restrict psenc, size_t * __restrict nresult) { - const char *s0; + char *s0; int ch, head, num, tail; wchar_t hi, wc; Modified: stable/10/lib/libiconv_modules/UTF1632/citrus_utf1632.c ============================================================================== --- stable/10/lib/libiconv_modules/UTF1632/citrus_utf1632.c Thu Apr 30 15:48:48 2015 (r282274) +++ stable/10/lib/libiconv_modules/UTF1632/citrus_utf1632.c Thu Apr 30 16:08:47 2015 (r282275) @@ -97,9 +97,9 @@ _citrus_UTF1632_init_state(_UTF1632Encod static int _citrus_UTF1632_mbrtowc_priv(_UTF1632EncodingInfo *ei, wchar_t *pwc, - const char **s, size_t n, _UTF1632State *psenc, size_t *nresult) + char **s, size_t n, _UTF1632State *psenc, size_t *nresult) { - const char *s0; + char *s0; size_t result; wchar_t wc = L'\0'; int chlenbak, endian, needlen; Modified: stable/10/lib/libiconv_modules/UTF7/citrus_utf7.c ============================================================================== --- stable/10/lib/libiconv_modules/UTF7/citrus_utf7.c Thu Apr 30 15:48:48 2015 (r282274) +++ stable/10/lib/libiconv_modules/UTF7/citrus_utf7.c Thu Apr 30 16:08:47 2015 (r282275) @@ -151,11 +151,11 @@ static const char spaces[] = " \t\r\n"; static int _citrus_UTF7_mbtoutf16(_UTF7EncodingInfo * __restrict ei, - uint16_t * __restrict u16, const char ** __restrict s, size_t n, + uint16_t * __restrict u16, char ** __restrict s, size_t n, _UTF7State * __restrict psenc, size_t * __restrict nresult) { _UTF7State sv; - const char *s0; + char *s0; int done, i, len; s0 = *s; @@ -244,7 +244,7 @@ ilseq: static int _citrus_UTF7_mbrtowc_priv(_UTF7EncodingInfo * __restrict ei, - wchar_t * __restrict pwc, const char ** __restrict s, size_t n, + wchar_t * __restrict pwc, char ** __restrict s, size_t n, _UTF7State * __restrict psenc, size_t * __restrict nresult) { uint32_t u32; Modified: stable/10/lib/libiconv_modules/UTF8/citrus_utf8.c ============================================================================== --- stable/10/lib/libiconv_modules/UTF8/citrus_utf8.c Thu Apr 30 15:48:48 2015 (r282274) +++ stable/10/lib/libiconv_modules/UTF8/citrus_utf8.c Thu Apr 30 16:08:47 2015 (r282275) @@ -177,10 +177,10 @@ _citrus_UTF8_unpack_state(_UTF8EncodingI #endif static int -_citrus_UTF8_mbrtowc_priv(_UTF8EncodingInfo *ei, wchar_t *pwc, const char **s, +_citrus_UTF8_mbrtowc_priv(_UTF8EncodingInfo *ei, wchar_t *pwc, char **s, size_t n, _UTF8State *psenc, size_t *nresult) { - const char *s0; + char *s0; wchar_t wchar; int i; uint8_t c; Modified: stable/10/lib/libiconv_modules/VIQR/citrus_viqr.c ============================================================================== --- stable/10/lib/libiconv_modules/VIQR/citrus_viqr.c Thu Apr 30 15:48:48 2015 (r282274) +++ stable/10/lib/libiconv_modules/VIQR/citrus_viqr.c Thu Apr 30 16:08:47 2015 (r282275) @@ -252,11 +252,11 @@ _citrus_VIQR_unpack_state(_VIQREncodingI static int _citrus_VIQR_mbrtowc_priv(_VIQREncodingInfo * __restrict ei, - wchar_t * __restrict pwc, const char ** __restrict s, size_t n, + wchar_t * __restrict pwc, char ** __restrict s, size_t n, _VIQRState * __restrict psenc, size_t * __restrict nresult) { mnemonic_t *m, *m0; - const char *s0; + char *s0; wchar_t wc; ssize_t i; int ch, escape; Modified: stable/10/lib/libiconv_modules/ZW/citrus_zw.c ============================================================================== --- stable/10/lib/libiconv_modules/ZW/citrus_zw.c Thu Apr 30 15:48:48 2015 (r282274) +++ stable/10/lib/libiconv_modules/ZW/citrus_zw.c Thu Apr 30 16:08:47 2015 (r282275) @@ -107,10 +107,10 @@ _citrus_ZW_unpack_state(_ZWEncodingInfo static int _citrus_ZW_mbrtowc_priv(_ZWEncodingInfo * __restrict ei, - wchar_t * __restrict pwc, const char **__restrict s, size_t n, + wchar_t * __restrict pwc, char **__restrict s, size_t n, _ZWState * __restrict psenc, size_t * __restrict nresult) { - const char *s0; + char *s0; wchar_t wc; int ch, len; Modified: stable/10/lib/libiconv_modules/iconv_none/citrus_iconv_none.c ============================================================================== --- stable/10/lib/libiconv_modules/iconv_none/citrus_iconv_none.c Thu Apr 30 15:48:48 2015 (r282274) +++ stable/10/lib/libiconv_modules/iconv_none/citrus_iconv_none.c Thu Apr 30 16:08:47 2015 (r282275) @@ -97,7 +97,7 @@ _citrus_iconv_none_iconv_uninit_context( static int /*ARGSUSED*/ _citrus_iconv_none_iconv_convert(struct _citrus_iconv * __restrict ci __unused, - const char * __restrict * __restrict in, size_t * __restrict inbytes, + char * __restrict * __restrict in, size_t * __restrict inbytes, char * __restrict * __restrict out, size_t * __restrict outbytes, uint32_t flags __unused, size_t * __restrict invalids) { Modified: stable/10/lib/libiconv_modules/iconv_std/citrus_iconv_std.c ============================================================================== --- stable/10/lib/libiconv_modules/iconv_std/citrus_iconv_std.c Thu Apr 30 15:48:48 2015 (r282274) +++ stable/10/lib/libiconv_modules/iconv_std/citrus_iconv_std.c Thu Apr 30 16:08:47 2015 (r282275) @@ -104,7 +104,7 @@ init_encoding_state(struct _citrus_iconv static __inline int mbtocsx(struct _citrus_iconv_std_encoding *se, - _csid_t *csid, _index_t *idx, const char **s, size_t n, size_t *nresult, + _csid_t *csid, _index_t *idx, char **s, size_t n, size_t *nresult, struct iconv_hooks *hooks) { @@ -461,7 +461,7 @@ _citrus_iconv_std_iconv_uninit_context(s static int _citrus_iconv_std_iconv_convert(struct _citrus_iconv * __restrict cv, - const char * __restrict * __restrict in, size_t * __restrict inbytes, + char * __restrict * __restrict in, size_t * __restrict inbytes, char * __restrict * __restrict out, size_t * __restrict outbytes, uint32_t flags, size_t * __restrict invalids) { @@ -469,7 +469,7 @@ _citrus_iconv_std_iconv_convert(struct _ struct _citrus_iconv_std_context *sc = cv->cv_closure; _csid_t csid; _index_t idx; - const char *tmpin; + char *tmpin; size_t inval, szrin, szrout; int ret, state = 0; Modified: stable/10/lib/libkiconv/xlat16_iconv.c ============================================================================== --- stable/10/lib/libkiconv/xlat16_iconv.c Thu Apr 30 15:48:48 2015 (r282274) +++ stable/10/lib/libkiconv/xlat16_iconv.c Thu Apr 30 16:08:47 2015 (r282275) @@ -62,7 +62,7 @@ static int chklocale(int, const char *); typedef void *iconv_t; static int my_iconv_init(void); static iconv_t (*my_iconv_open)(const char *, const char *); -static size_t (*my_iconv)(iconv_t, const char **, size_t *, char **, size_t *); +static size_t (*my_iconv)(iconv_t, char **, size_t *, char **, size_t *); static int (*my_iconv_close)(iconv_t); #else #include <iconv.h> @@ -71,7 +71,7 @@ static int (*my_iconv_close)(iconv_t); #define my_iconv iconv #define my_iconv_close iconv_close #endif -static size_t my_iconv_char(iconv_t, const u_char **, size_t *, u_char **, size_t *); +static size_t my_iconv_char(iconv_t, u_char **, size_t *, u_char **, size_t *); int kiconv_add_xlat16_cspair(const char *tocode, const char *fromcode, int flag) @@ -221,8 +221,8 @@ kiconv_xlat16_open(const char *tocode, c src[0] = (u_char)(c >> 8); src[1] = (u_char)c; - ret = my_iconv_char(cd, (const u_char **)&srcp, - &inbytesleft, &dstp, &outbytesleft); + ret = my_iconv_char(cd, &srcp, &inbytesleft, + &dstp, &outbytesleft); if (ret == -1) { table[us] = 0; continue; @@ -338,11 +338,10 @@ my_iconv_init(void) #endif static size_t -my_iconv_char(iconv_t cd, const u_char **ibuf, size_t * ilen, u_char **obuf, +my_iconv_char(iconv_t cd, u_char **ibuf, size_t * ilen, u_char **obuf, size_t * olen) { - const u_char *sp; - u_char *dp, ilocal[3], olocal[3]; + u_char *sp, *dp, ilocal[3], olocal[3]; u_char c1, c2; int ret; size_t ir, or; @@ -352,7 +351,7 @@ my_iconv_char(iconv_t cd, const u_char * ir = *ilen; bzero(*obuf, *olen); - ret = my_iconv(cd, (const char **)&sp, ilen, (char **)&dp, olen); + ret = my_iconv(cd, (char **)&sp, ilen, (char **)&dp, olen); c1 = (*obuf)[0]; c2 = (*obuf)[1]; @@ -375,7 +374,7 @@ my_iconv_char(iconv_t cd, const u_char * sp = ilocal; dp = olocal; - if ((my_iconv(cd,(const char **)&sp, &ir, (char **)&dp, &or)) != -1) { + if ((my_iconv(cd,(char **)&sp, &ir, (char **)&dp, &or)) != -1) { if (olocal[0] != c1) return (ret); @@ -429,7 +428,7 @@ my_iconv_char(iconv_t cd, const u_char * sp = ilocal + 1; dp = olocal; - if ((my_iconv(cd,(const char **)&sp, &ir, (char **)&dp, &or)) != -1) { + if ((my_iconv(cd,(char **)&sp, &ir, (char **)&dp, &or)) != -1) { if (olocal[0] == c2) /* * inbuf is a single byte char Modified: stable/10/sys/sys/param.h ============================================================================== --- stable/10/sys/sys/param.h Thu Apr 30 15:48:48 2015 (r282274) +++ stable/10/sys/sys/param.h Thu Apr 30 16:08:47 2015 (r282275) @@ -58,7 +58,7 @@ * in the range 5 to 9. */ #undef __FreeBSD_version -#define __FreeBSD_version 1001513 /* Master, propagated to newvers */ +#define __FreeBSD_version 1001514 /* Master, propagated to newvers */ /* * __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD, Modified: stable/10/usr.bin/iconv/iconv.c ============================================================================== --- stable/10/usr.bin/iconv/iconv.c Thu Apr 30 15:48:48 2015 (r282274) +++ stable/10/usr.bin/iconv/iconv.c Thu Apr 30 16:08:47 2015 (r282275) @@ -71,9 +71,8 @@ do_conv(FILE *fp, const char *from, cons 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) _______________________________________________ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
