Attachment #155545 for bug #199099

Lines 198-204 Link Here

(-)bin/csh/config.h (-1 / +1 lines)
198	#define HAVE_WCWIDTH 1	198	#define HAVE_WCWIDTH 1
199		199
200	/* Define as const if the declaration of iconv() needs const. */	200	/* Define as const if the declaration of iconv() needs const. */
201	#define ICONV_CONST const	201	#define ICONV_CONST
202		202
203	/* Support NLS. */	203	/* Support NLS. */
204	#define NLS 1	204	#define NLS 1




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, char *, smbfh*);
int  smb_smb_close_print_file(struct smb_ctx *, smbfh);

int  smb_read(struct smb_ctx *, smbfh, off_t, size_t, char *);

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 *, 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 *);


int   nls_setrecode(const char *, const char *);
int   nls_setlocale(const char *);
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 *);





}

char *
nls_str_toloc(char *dst, char *src)
{
#ifdef HAVE_ICONV
	char *p = dst;

}

char *
nls_str_toext(char *dst, char *src)
{
#ifdef HAVE_ICONV
	char *p = dst;

}

void *
nls_mem_toloc(void *dst, void *src, int size)
{
#ifdef HAVE_ICONV
	char *p = dst;
	char *s = src;
	size_t inlen, outlen;

	if (size == 0)

}

void *
nls_mem_toext(void *dst, void *src, int size)
{
#ifdef HAVE_ICONV
	char *p = dst;
	char *s = src;
	size_t inlen, outlen;

	if (size == 0)

Lines 54-60 Link Here

(-)contrib/smbfs/lib/smb/print.c (-1 / +1 lines)
54		54
55	int	55	int
56	smb_smb_open_print_file(struct smb_ctx *ctx, int setuplen, int mode,	56	smb_smb_open_print_file(struct smb_ctx *ctx, int setuplen, int mode,
57	const char ident, smbfh fhp)	57	char ident, smbfh fhp)
58	{	58	{
59	struct smb_rq *rqp;	59	struct smb_rq *rqp;
60	struct mbdata *mbp;	60	struct mbdata *mbp;

Lines 86-92 smb_rq_wend(struct smb_rq *rqp) Link Here

(-)contrib/smbfs/lib/smb/rq.c (-2 / +2 lines)
86	}	86	}
87		87
88	int	88	int
89	smb_rq_dmem(struct mbdata mbp, const char src, size_t size)	89	smb_rq_dmem(struct mbdata mbp, char src, size_t size)
90	{	90	{
91	struct mbuf *m;	91	struct mbuf *m;
92	char * dst;	92	char * dst;
Lines 118-124 smb_rq_dmem(struct mbdata *mbp, const ch Link Here
118	}	118	}
119		119
120	int	120	int
121	smb_rq_dstring(struct mbdata mbp, const char s)	121	smb_rq_dstring(struct mbdata mbp, char s)
122	{	122	{
123	return smb_rq_dmem(mbp, s, strlen(s) + 1);	123	return smb_rq_dmem(mbp, s, strlen(s) + 1);
124	}	124	}

Lines 53-59 typedef struct __tag_iconv_t *iconv_t; Link Here

(-)include/iconv.h (-2 / +2 lines)
53		53
54	__BEGIN_DECLS	54	__BEGIN_DECLS
55	iconv_t iconv_open(const char , const char );	55	iconv_t iconv_open(const char , const char );
56	size_t iconv(iconv_t, const char ** __restrict,	56	size_t iconv(iconv_t, char ** __restrict,
57	size_t * __restrict, char ** __restrict,	57	size_t * __restrict, char ** __restrict,
58	size_t * __restrict);	58	size_t * __restrict);
59	int iconv_close(iconv_t);	59	int iconv_close(iconv_t);
Lines 62-68 int iconv_close(iconv_t); Link Here
62	*/	62	*/
63	int __iconv_get_list(char **, size_t , __iconv_bool);	63	int __iconv_get_list(char **, size_t , __iconv_bool);
64	void __iconv_free_list(char **, size_t);	64	void __iconv_free_list(char **, size_t);
65	size_t __iconv(iconv_t, const char *, size_t , char **,	65	size_t __iconv(iconv_t, char *, size_t , char **,
66	size_t , __uint32_t, size_t );	66	size_t , __uint32_t, size_t );
67	#define __ICONV_F_HIDE_INVALID 0x0001	67	#define __ICONV_F_HIDE_INVALID 0x0001
68		68

Lines 25-31 LIBADD+= md Link Here

(-)lib/libarchive/Makefile (-1 / +1 lines)
25	.if ${MK_ICONV} != "no"	25	.if ${MK_ICONV} != "no"
26	# TODO: This can be changed back to CFLAGS once iconv works correctly	26	# TODO: This can be changed back to CFLAGS once iconv works correctly
27	# with statically linked binaries.	27	# with statically linked binaries.
28	SHARED_CFLAGS+= -DHAVE_ICONV=1 -DHAVE_ICONV_H=1 -DICONV_CONST=const	28	SHARED_CFLAGS+= -DHAVE_ICONV=1 -DHAVE_ICONV_H=1 -DICONV_CONST=
29	.endif	29	.endif
30		30
31	.if ${MACHINE_ARCH:Marm} != "" \|\| ${MACHINE_ARCH:Mmips} != "" \|\| \	31	.if ${MACHINE_ARCH:Marm} != "" \|\| ${MACHINE_ARCH:Mmips} != "" \|\| \

Lines 31-37 Link Here

(-)lib/libc/iconv/__iconv.c (-1 / +1 lines)
31	#include "iconv-internal.h"	31	#include "iconv-internal.h"
32		32
33	size_t	33	size_t
34	__iconv(iconv_t a, const char *b, size_t c, char **d,	34	__iconv(iconv_t a, char *b, size_t c, char **d,
35	size_t e, __uint32_t f, size_t g)	35	size_t e, __uint32_t f, size_t g)
36	{	36	{
37	return __bsd___iconv(a, b, c, d, e, f, g);	37	return __bsd___iconv(a, b, c, d, e, f, g);

Lines 120-126 __bsd_iconv_close(iconv_t handle) Link Here

(-)lib/libc/iconv/bsd_iconv.c (-2 / +2 lines)
120	}	120	}
121		121
122	size_t	122	size_t
123	__bsd_iconv(iconv_t handle, const char *in, size_t szin, char *out, size_t szout)	123	__bsd_iconv(iconv_t handle, char *in, size_t szin, char *out, size_t szout)
124	{	124	{
125	size_t ret;	125	size_t ret;
126	int err;	126	int err;
Lines 141-147 __bsd_iconv(iconv_t handle, const char * Link Here
141	}	141	}
142		142
143	size_t	143	size_t
144	__bsd___iconv(iconv_t handle, const char *in, size_t szin, char **out,	144	__bsd___iconv(iconv_t handle, char *in, size_t szin, char **out,
145	size_t szout, uint32_t flags, size_t invalids)	145	size_t szout, uint32_t flags, size_t invalids)
146	{	146	{
147	size_t ret;	147	size_t ret;

Lines 52-58 __END_DECLS Link Here

(-)lib/libc/iconv/citrus_iconv.h (-1 / +1 lines)
52	*/	52	*/
53	static __inline int	53	static __inline int
54	_citrus_iconv_convert(struct _citrus_iconv * __restrict cv,	54	_citrus_iconv_convert(struct _citrus_iconv * __restrict cv,
55	const char * __restrict * __restrict in, size_t * __restrict inbytes,	55	char * __restrict * __restrict in, size_t * __restrict inbytes,
56	char * __restrict * __restrict out, size_t * __restrict outbytes,	56	char * __restrict * __restrict out, size_t * __restrict outbytes,
57	uint32_t flags, size_t * __restrict nresults)	57	uint32_t flags, size_t * __restrict nresults)
58	{	58	{

Lines 83-89 _citrus_NONE_stdenc_init_state(struct _c Link Here

(-)lib/libc/iconv/citrus_none.c (-2 / +2 lines)
83		83
84	static int	84	static int
85	_citrus_NONE_stdenc_mbtocs(struct _citrus_stdenc * __restrict ce __unused,	85	_citrus_NONE_stdenc_mbtocs(struct _citrus_stdenc * __restrict ce __unused,
86	_csid_t csid, _index_t idx, const char **s, size_t n,	86	_csid_t csid, _index_t idx, char **s, size_t n,
87	void ps __unused, size_t nresult, struct iconv_hooks *hooks)	87	void ps __unused, size_t nresult, struct iconv_hooks *hooks)
88	{	88	{
89		89
Lines 159-165 _citrus_NONE_stdenc_cstomb(struct _citru Link Here
159		159
160	static int	160	static int
161	_citrus_NONE_stdenc_mbtowc(struct _citrus_stdenc * __restrict ce __unused,	161	_citrus_NONE_stdenc_mbtowc(struct _citrus_stdenc * __restrict ce __unused,
162	_wc_t * __restrict pwc, const char ** __restrict s, size_t n,	162	_wc_t * __restrict pwc, char ** __restrict s, size_t n,
163	void * __restrict pspriv __unused, size_t * __restrict nresult,	163	void * __restrict pspriv __unused, size_t * __restrict nresult,
164	struct iconv_hooks *hooks)	164	struct iconv_hooks *hooks)
165	{	165	{

Lines 69-75 _citrus_stdenc_init_state(struct _citrus Link Here

(-)lib/libc/iconv/citrus_stdenc.h (-1 / +1 lines)
69	static __inline int	69	static __inline int
70	_citrus_stdenc_mbtocs(struct _citrus_stdenc * __restrict ce,	70	_citrus_stdenc_mbtocs(struct _citrus_stdenc * __restrict ce,
71	_citrus_csid_t * __restrict csid, _citrus_index_t * __restrict idx,	71	_citrus_csid_t * __restrict csid, _citrus_index_t * __restrict idx,
72	const char ** __restrict s, size_t n, void * __restrict ps,	72	char ** __restrict s, size_t n, void * __restrict ps,
73	size_t * __restrict nresult, struct iconv_hooks *hooks)	73	size_t * __restrict nresult, struct iconv_hooks *hooks)
74	{	74	{
75		75




		    (struct _citrus_stdenc * __restrict,		\
		    _citrus_csid_t * __restrict,			\
		    _citrus_index_t * __restrict,			\
		    char ** __restrict, size_t,				\
		    void * __restrict, size_t * __restrict,		\
		    struct iconv_hooks *);				\
static int	 _citrus_##_e_##_stdenc_cstomb				\

static int	 _citrus_##_e_##_stdenc_mbtowc				\
		    (struct _citrus_stdenc * __restrict,		\
		    _citrus_wc_t * __restrict,				\
		    char ** __restrict, size_t,				\
		    void * __restrict, size_t * __restrict,		\
		    struct iconv_hooks *);				\
static int	 _citrus_##_e_##_stdenc_wctomb				\

typedef int (*_citrus_stdenc_mbtocs_t)
    (struct _citrus_stdenc * __restrict,
    _citrus_csid_t * __restrict, _citrus_index_t * __restrict,
    char ** __restrict, size_t,
    void * __restrict, size_t * __restrict,
    struct iconv_hooks *);
typedef int (*_citrus_stdenc_cstomb_t)

typedef int (*_citrus_stdenc_mbtowc_t)
    (struct _citrus_stdenc * __restrict,
    _citrus_wc_t * __restrict,
    char ** __restrict, size_t,
    void * __restrict, size_t * __restrict,
    struct iconv_hooks *);
typedef int (*_citrus_stdenc_wctomb_t)

Lines 112-118 _FUNCNAME(stdenc_init_state)(struct _cit Link Here

(-)lib/libc/iconv/citrus_stdenc_template.h (-2 / +2 lines)
112	static int	112	static int
113	_FUNCNAME(stdenc_mbtocs)(struct _citrus_stdenc * __restrict ce,	113	_FUNCNAME(stdenc_mbtocs)(struct _citrus_stdenc * __restrict ce,
114	_citrus_csid_t * __restrict csid, _citrus_index_t * __restrict idx,	114	_citrus_csid_t * __restrict csid, _citrus_index_t * __restrict idx,
115	const char ** __restrict s, size_t n, void * __restrict ps,	115	char ** __restrict s, size_t n, void * __restrict ps,
116	size_t * __restrict nresult, struct iconv_hooks *hooks)	116	size_t * __restrict nresult, struct iconv_hooks *hooks)
117	{	117	{
118	wchar_t wc;	118	wchar_t wc;
Lines 151-157 _FUNCNAME(stdenc_cstomb)(struct _citrus_ Link Here
151		151
152	static int	152	static int
153	_FUNCNAME(stdenc_mbtowc)(struct _citrus_stdenc * __restrict ce,	153	_FUNCNAME(stdenc_mbtowc)(struct _citrus_stdenc * __restrict ce,
154	_citrus_wc_t * __restrict wc, const char ** __restrict s, size_t n,	154	_citrus_wc_t * __restrict wc, char ** __restrict s, size_t n,
155	void * __restrict ps, size_t * __restrict nresult,	155	void * __restrict ps, size_t * __restrict nresult,
156	struct iconv_hooks *hooks)	156	struct iconv_hooks *hooks)
157	{	157	{

Lines 29-39 Link Here

(-)lib/libc/iconv/iconv-internal.h (-2 / +2 lines)
29	/*	29	/*
30	* Interal prototypes for our back-end functions.	30	* Interal prototypes for our back-end functions.
31	*/	31	*/
32	size_t __bsd___iconv(iconv_t, const char *, size_t , char **,	32	size_t __bsd___iconv(iconv_t, char *, size_t , char **,
33	size_t , __uint32_t, size_t );	33	size_t , __uint32_t, size_t );
34	void __bsd___iconv_free_list(char **, size_t);	34	void __bsd___iconv_free_list(char **, size_t);
35	int __bsd___iconv_get_list(char **, size_t , __iconv_bool);	35	int __bsd___iconv_get_list(char **, size_t , __iconv_bool);
36	size_t __bsd_iconv(iconv_t, const char ** __restrict,	36	size_t __bsd_iconv(iconv_t, char ** __restrict,
37	size_t * __restrict, char ** __restrict,	37	size_t * __restrict, char ** __restrict,
38	size_t * __restrict);	38	size_t * __restrict);
39	const char __bsd_iconv_canonicalize(const char );	39	const char __bsd_iconv_canonicalize(const char );

Lines 48-54 Link Here

(-)lib/libc/iconv/iconv.3 (-1 / +1 lines)
48	.Ft size_t	48	.Ft size_t
49	.Fn iconv "iconv_t cd" "char ** restrict src" "size_t * restrict srcleft" "char ** restrict dst" "size_t * restrict dstleft"	49	.Fn iconv "iconv_t cd" "char ** restrict src" "size_t * restrict srcleft" "char ** restrict dst" "size_t * restrict dstleft"
50	.Ft size_t	50	.Ft size_t
51	.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"	51	.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"
52	.Sh DESCRIPTION	52	.Sh DESCRIPTION
53	The	53	The
54	.Fn iconv_open	54	.Fn iconv_open

Lines 31-37 Link Here

(-)lib/libc/iconv/iconv.c (-1 / +1 lines)
31	#include "iconv-internal.h"	31	#include "iconv-internal.h"
32		32
33	size_t	33	size_t
34	iconv(iconv_t a, const char ** __restrict b,	34	iconv(iconv_t a, char ** __restrict b,
35	size_t * __restrict c, char ** __restrict d,	35	size_t * __restrict c, char ** __restrict d,
36	size_t * __restrict e)	36	size_t * __restrict e)
37	{	37	{

Lines 37-43 Link Here

(-)lib/libc/iconv/iconv_compat.c (-2 / +2 lines)
37	#include "iconv-internal.h"	37	#include "iconv-internal.h"
38		38
39	size_t	39	size_t
40	__iconv_compat(iconv_t a, const char ** b, size_t * c, char ** d,	40	__iconv_compat(iconv_t a, char ** b, size_t * c, char ** d,
41	size_t * e, __uint32_t f, size_t *g)	41	size_t * e, __uint32_t f, size_t *g)
42	{	42	{
43	return __bsd___iconv(a, b, c, d, e, f, g);	43	return __bsd___iconv(a, b, c, d, e, f, g);
Lines 56-62 __iconv_get_list_compat(char ***a, size_ Link Here
56	}	56	}
57		57
58	size_t	58	size_t
59	iconv_compat(iconv_t a, const char ** __restrict b,	59	iconv_compat(iconv_t a, char ** __restrict b,
60	size_t * __restrict c, char ** __restrict d,	60	size_t * __restrict c, char ** __restrict d,
61	size_t * __restrict e)	61	size_t * __restrict e)
62	{	62	{

Lines 57-64 cXXrtomb_l(char * __restrict s, charXX_t Link Here

(-)lib/libc/locale/cXXrtomb_iconv.h (-2 / +1 lines)
57	{	57	{
58	_ConversionState *cs;	58	_ConversionState *cs;
59	struct _citrus_iconv *handle;	59	struct _citrus_iconv *handle;
60	const char *src;	60	char src, dst;
61	char *dst;
62	size_t srcleft, dstleft, invlen;	61	size_t srcleft, dstleft, invlen;
63	int err;	62	int err;
64		63

Lines 99-106 mbrtocXX_l(charXX_t * __restrict pc, con Link Here

(-)lib/libc/locale/mbrtocXX_iconv.h (-2 / +1 lines)
99		99
100	/* Convert as few characters to the dst buffer as possible. */	100	/* Convert as few characters to the dst buffer as possible. */
101	for (i = 0; ; i++) {	101	for (i = 0; ; i++) {
102	const char *src;	102	char src, dst;
103	char *dst;
104	size_t srcleft, dstleft, invlen;	103	size_t srcleft, dstleft, invlen;
105	int err;	104	int err;
106		105




/*ARGSUSED*/
_citrus_BIG5_mbrtowc_priv(_BIG5EncodingInfo * __restrict ei,
    wchar_t * __restrict pwc,
    char ** __restrict s, size_t n,
    _BIG5State * __restrict psenc,
    size_t * __restrict nresult)
{
	wchar_t wchar;
	char *s0;
	int c, chlenbak;

	s0 = *s;

Lines 165-174 is_94charset(int c) Link Here

(-)lib/libiconv_modules/DECHanyu/citrus_dechanyu.c (-2 / +2 lines)
165	static int	165	static int
166	/ARGSUSED/	166	/ARGSUSED/
167	_citrus_DECHanyu_mbrtowc_priv(_DECHanyuEncodingInfo * __restrict ei,	167	_citrus_DECHanyu_mbrtowc_priv(_DECHanyuEncodingInfo * __restrict ei,
168	wchar_t * __restrict pwc, const char ** __restrict s, size_t n,	168	wchar_t * __restrict pwc, char ** __restrict s, size_t n,
169	_DECHanyuState * __restrict psenc, size_t * __restrict nresult)	169	_DECHanyuState * __restrict psenc, size_t * __restrict nresult)
170	{	170	{
171	const char *s0;	171	char *s0;
172	wchar_t wc;	172	wchar_t wc;
173	int ch;	173	int ch;
174		174




#endif

static int
_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;
	char *s0, *s1 = NULL;

	s0 = *s;


Lines 176-185 _citrus_EUCTW_encoding_module_uninit(_EU Link Here

(-)lib/libiconv_modules/EUCTW/citrus_euctw.c (-2 / +2 lines)
176		176
177	static int	177	static int
178	_citrus_EUCTW_mbrtowc_priv(_EUCTWEncodingInfo * __restrict ei,	178	_citrus_EUCTW_mbrtowc_priv(_EUCTWEncodingInfo * __restrict ei,
179	wchar_t * __restrict pwc, const char ** __restrict s,	179	wchar_t * __restrict pwc, char ** __restrict s,
180	size_t n, _EUCTWState * __restrict psenc, size_t * __restrict nresult)	180	size_t n, _EUCTWState * __restrict psenc, size_t * __restrict nresult)
181	{	181	{
182	const char *s0;	182	char *s0;
183	wchar_t wchar;	183	wchar_t wchar;
184	int c, chlenbak, cs;	184	int c, chlenbak, cs;
185		185

Lines 149-158 _mb_count(wchar_t v) Link Here

(-)lib/libiconv_modules/GBK2K/citrus_gbk2k.c (-2 / +2 lines)
149		149
150	static int	150	static int
151	_citrus_GBK2K_mbrtowc_priv(_GBK2KEncodingInfo * __restrict ei,	151	_citrus_GBK2K_mbrtowc_priv(_GBK2KEncodingInfo * __restrict ei,
152	wchar_t * __restrict pwc, const char ** __restrict s, size_t n,	152	wchar_t * __restrict pwc, char ** __restrict s, size_t n,
153	_GBK2KState * __restrict psenc, size_t * __restrict nresult)	153	_GBK2KState * __restrict psenc, size_t * __restrict nresult)
154	{	154	{
155	const char s0, s1;	155	char s0, s1;
156	wchar_t wc;	156	wchar_t wc;
157	int chlenbak, len;	157	int chlenbak, len;
158		158





static int
_citrus_HZ_mbrtowc_priv(_HZEncodingInfo * __restrict ei,
    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;
	char *s0;
	wchar_t wc;
	int bit, ch, head, len, tail;






static wchar_t
_ISO2022_sgetwchar(_ISO2022EncodingInfo * __restrict ei __unused,
    char * __restrict string, size_t n, char ** __restrict result,
    _ISO2022State * __restrict psenc)
{
	const struct seqtable *sp;


static int
_citrus_ISO2022_mbrtowc_priv(_ISO2022EncodingInfo * __restrict ei,
    wchar_t * __restrict pwc, char ** __restrict s,
    size_t n, _ISO2022State * __restrict psenc, size_t * __restrict nresult)
{
	char *p, *result, *s0;
	wchar_t wchar;
	int c, chlenbak;


Lines 145-154 ishanja(int l, int t) Link Here

(-)lib/libiconv_modules/JOHAB/citrus_johab.c (-2 / +2 lines)
145	static int	145	static int
146	/ARGSUSED/	146	/ARGSUSED/
147	_citrus_JOHAB_mbrtowc_priv(_JOHABEncodingInfo * __restrict ei,	147	_citrus_JOHAB_mbrtowc_priv(_JOHABEncodingInfo * __restrict ei,
148	wchar_t * __restrict pwc, const char ** __restrict s, size_t n,	148	wchar_t * __restrict pwc, char ** __restrict s, size_t n,
149	_JOHABState * __restrict psenc, size_t * __restrict nresult)	149	_JOHABState * __restrict psenc, size_t * __restrict nresult)
150	{	150	{
151	const char *s0;	151	char *s0;
152	int l, t;	152	int l, t;
153		153
154	if (*s == NULL) {	154	if (*s == NULL) {

Lines 153-162 _citrus_MSKanji_unpack_state(_MSKanjiEnc Link Here

(-)lib/libiconv_modules/MSKanji/citrus_mskanji.c (-2 / +2 lines)
153	static int	153	static int
154	/ARGSUSED/	154	/ARGSUSED/
155	_citrus_MSKanji_mbrtowc_priv(_MSKanjiEncodingInfo * __restrict ei,	155	_citrus_MSKanji_mbrtowc_priv(_MSKanjiEncodingInfo * __restrict ei,
156	wchar_t * __restrict pwc, const char ** __restrict s, size_t n,	156	wchar_t * __restrict pwc, char ** __restrict s, size_t n,
157	_MSKanjiState * __restrict psenc, size_t * __restrict nresult)	157	_MSKanjiState * __restrict psenc, size_t * __restrict nresult)
158	{	158	{
159	const char *s0;	159	char *s0;
160	wchar_t wchar;	160	wchar_t wchar;
161	int chlenbak, len;	161	int chlenbak, len;
162		162

Lines 185-194 is_basic(wchar_t wc) Link Here

(-)lib/libiconv_modules/UES/citrus_ues.c (-2 / +2 lines)
185		185
186	static int	186	static int
187	_citrus_UES_mbrtowc_priv(_UESEncodingInfo * __restrict ei,	187	_citrus_UES_mbrtowc_priv(_UESEncodingInfo * __restrict ei,
188	wchar_t * __restrict pwc, const char ** __restrict s, size_t n,	188	wchar_t * __restrict pwc, char ** __restrict s, size_t n,
189	_UESState * __restrict psenc, size_t * __restrict nresult)	189	_UESState * __restrict psenc, size_t * __restrict nresult)
190	{	190	{
191	const char *s0;	191	char *s0;
192	int ch, head, num, tail;	192	int ch, head, num, tail;
193	wchar_t hi, wc;	193	wchar_t hi, wc;
194		194

Lines 97-105 _citrus_UTF1632_init_state(_UTF1632Encod Link Here

(-)lib/libiconv_modules/UTF1632/citrus_utf1632.c (-2 / +2 lines)
97		97
98	static int	98	static int
99	_citrus_UTF1632_mbrtowc_priv(_UTF1632EncodingInfo ei, wchar_t pwc,	99	_citrus_UTF1632_mbrtowc_priv(_UTF1632EncodingInfo ei, wchar_t pwc,
100	const char *s, size_t n, _UTF1632State psenc, size_t *nresult)	100	char *s, size_t n, _UTF1632State psenc, size_t *nresult)
101	{	101	{
102	const char *s0;	102	char *s0;
103	size_t result;	103	size_t result;
104	wchar_t wc = L'\0';	104	wchar_t wc = L'\0';
105	int chlenbak, endian, needlen;	105	int chlenbak, endian, needlen;





static int
_citrus_UTF7_mbtoutf16(_UTF7EncodingInfo * __restrict ei,
    uint16_t * __restrict u16, char ** __restrict s, size_t n,
    _UTF7State * __restrict psenc, size_t * __restrict nresult)
{
	_UTF7State sv;
	char *s0;
	int done, i, len;

	s0 = *s;


static int
_citrus_UTF7_mbrtowc_priv(_UTF7EncodingInfo * __restrict ei,
    wchar_t * __restrict pwc, char ** __restrict s, size_t n,
    _UTF7State * __restrict psenc, size_t * __restrict nresult)
{
	uint32_t u32;

Lines 177-186 _citrus_UTF8_unpack_state(_UTF8EncodingI Link Here

(-)lib/libiconv_modules/UTF8/citrus_utf8.c (-2 / +2 lines)
177	#endif	177	#endif
178		178
179	static int	179	static int
180	_citrus_UTF8_mbrtowc_priv(_UTF8EncodingInfo ei, wchar_t pwc, const char **s,	180	_citrus_UTF8_mbrtowc_priv(_UTF8EncodingInfo ei, wchar_t pwc, char **s,
181	size_t n, _UTF8State psenc, size_t nresult)	181	size_t n, _UTF8State psenc, size_t nresult)
182	{	182	{
183	const char *s0;	183	char *s0;
184	wchar_t wchar;	184	wchar_t wchar;
185	int i;	185	int i;
186	uint8_t c;	186	uint8_t c;

Lines 252-262 _citrus_VIQR_unpack_state(_VIQREncodingI Link Here

(-)lib/libiconv_modules/VIQR/citrus_viqr.c (-2 / +2 lines)
252		252
253	static int	253	static int
254	_citrus_VIQR_mbrtowc_priv(_VIQREncodingInfo * __restrict ei,	254	_citrus_VIQR_mbrtowc_priv(_VIQREncodingInfo * __restrict ei,
255	wchar_t * __restrict pwc, const char ** __restrict s, size_t n,	255	wchar_t * __restrict pwc, char ** __restrict s, size_t n,
256	_VIQRState * __restrict psenc, size_t * __restrict nresult)	256	_VIQRState * __restrict psenc, size_t * __restrict nresult)
257	{	257	{
258	mnemonic_t m, m0;	258	mnemonic_t m, m0;
259	const char *s0;	259	char *s0;
260	wchar_t wc;	260	wchar_t wc;
261	ssize_t i;	261	ssize_t i;
262	int ch, escape;	262	int ch, escape;

Lines 107-116 _citrus_ZW_unpack_state(_ZWEncodingInfo Link Here

(-)lib/libiconv_modules/ZW/citrus_zw.c (-2 / +2 lines)
107		107
108	static int	108	static int
109	_citrus_ZW_mbrtowc_priv(_ZWEncodingInfo * __restrict ei,	109	_citrus_ZW_mbrtowc_priv(_ZWEncodingInfo * __restrict ei,
110	wchar_t * __restrict pwc, const char **__restrict s, size_t n,	110	wchar_t * __restrict pwc, char **__restrict s, size_t n,
111	_ZWState * __restrict psenc, size_t * __restrict nresult)	111	_ZWState * __restrict psenc, size_t * __restrict nresult)
112	{	112	{
113	const char *s0;	113	char *s0;
114	wchar_t wc;	114	wchar_t wc;
115	int ch, len;	115	int ch, len;
116		116

Lines 97-103 _citrus_iconv_none_iconv_uninit_context( Link Here

(-)lib/libiconv_modules/iconv_none/citrus_iconv_none.c (-1 / +1 lines)
97	static int	97	static int
98	/ARGSUSED/	98	/ARGSUSED/
99	_citrus_iconv_none_iconv_convert(struct _citrus_iconv * __restrict ci __unused,	99	_citrus_iconv_none_iconv_convert(struct _citrus_iconv * __restrict ci __unused,
100	const char * __restrict * __restrict in, size_t * __restrict inbytes,	100	char * __restrict * __restrict in, size_t * __restrict inbytes,
101	char * __restrict * __restrict out, size_t * __restrict outbytes,	101	char * __restrict * __restrict out, size_t * __restrict outbytes,
102	uint32_t flags __unused, size_t * __restrict invalids)	102	uint32_t flags __unused, size_t * __restrict invalids)
103	{	103	{





static __inline int
mbtocsx(struct _citrus_iconv_std_encoding *se,
    _csid_t *csid, _index_t *idx, char **s, size_t n, size_t *nresult,
    struct iconv_hooks *hooks)
{



static int
_citrus_iconv_std_iconv_convert(struct _citrus_iconv * __restrict cv,
    char * __restrict * __restrict in, size_t * __restrict inbytes,
    char * __restrict * __restrict out, size_t * __restrict outbytes,
    uint32_t flags, size_t * __restrict invalids)
{

	struct _citrus_iconv_std_context *sc = cv->cv_closure;
	_csid_t csid;
	_index_t idx;
	char *tmpin;
	size_t inval, szrin, szrout;
	int ret, state = 0;





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, char **, size_t *, char **, size_t *);
static int (*my_iconv_close)(iconv_t);
#else
#include <iconv.h>

#define my_iconv iconv
#define my_iconv_close iconv_close
#endif
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)

			src[0] = (u_char)(c >> 8);
			src[1] = (u_char)c;

			ret = my_iconv_char(cd, &srcp, &inbytesleft,
				&dstp, &outbytesleft);
			if (ret == -1) {
				table[us] = 0;
				continue;

#endif

static size_t
my_iconv_char(iconv_t cd, u_char **ibuf, size_t * ilen, u_char **obuf,
	size_t * olen)
{
	u_char *sp, *dp, ilocal[3], olocal[3];
	u_char *dp, ilocal[3], olocal[3];
	u_char c1, c2;
	int ret;
	size_t ir, or;

	ir = *ilen;

	bzero(*obuf, *olen);
	ret = my_iconv(cd, (char **)&sp, ilen, (char **)&dp, olen);
	c1 = (*obuf)[0];
	c2 = (*obuf)[1];


	sp = ilocal;
	dp = olocal;

	if ((my_iconv(cd,(char **)&sp, &ir, (char **)&dp, &or)) != -1) {
		if (olocal[0] != c1)
			return (ret);


	sp = ilocal + 1;
	dp = olocal;

	if ((my_iconv(cd,(char **)&sp, &ir, (char **)&dp, &or)) != -1) {
		if (olocal[0] == c2)
			/*
			 * inbuf is a single byte char

Lines 58-64 Link Here

(-)sys/sys/param.h (-1 / +1 lines)
58	* in the range 5 to 9.	58	* in the range 5 to 9.
59	*/	59	*/
60	#undef __FreeBSD_version	60	#undef __FreeBSD_version
61	#define __FreeBSD_version 1100068 /* Master, propagated to newvers */	61	#define __FreeBSD_version 1100069 /* Master, propagated to newvers */
62		62
63	/*	63	/*
64	* __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD,	64	* __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD,

Lines 71-79 do_conv(FILE fp, const char from, cons Link Here

(-)usr.bin/iconv/iconv.c (-2 / +1 lines)
71	bool hide_invalid)	71	bool hide_invalid)
72	{	72	{
73	iconv_t cd;	73	iconv_t cd;
74	char inbuf[INBUFSIZE], outbuf[OUTBUFSIZE], *out;	74	char inbuf[INBUFSIZE], outbuf[OUTBUFSIZE], in, out;
75	unsigned long long invalids;	75	unsigned long long invalids;
76	const char *in;
77	size_t inbytes, outbytes, ret;	76	size_t inbytes, outbytes, ret;
78		77
79	if ((cd = iconv_open(to, from)) == (iconv_t)-1)	78	if ((cd = iconv_open(to, from)) == (iconv_t)-1)

Return to bug 199099

Lines 269-280 static int Link Here

(-)lib/libiconv_modules/BIG5/citrus_big5.c (-2 / +2 lines)
269	/ARGSUSED/	269	/ARGSUSED/
270	_citrus_BIG5_mbrtowc_priv(_BIG5EncodingInfo * __restrict ei,	270	_citrus_BIG5_mbrtowc_priv(_BIG5EncodingInfo * __restrict ei,
271	wchar_t * __restrict pwc,	271	wchar_t * __restrict pwc,
272	const char ** __restrict s, size_t n,	272	char ** __restrict s, size_t n,
273	_BIG5State * __restrict psenc,	273	_BIG5State * __restrict psenc,
274	size_t * __restrict nresult)	274	size_t * __restrict nresult)
275	{	275	{
276	wchar_t wchar;	276	wchar_t wchar;
277	const char *s0;	277	char *s0;
278	int c, chlenbak;	278	int c, chlenbak;
279		279
280	s0 = *s;	280	s0 = *s;

Lines 574-580 terminate: Link Here

(-)lib/libiconv_modules/ISO2022/citrus_iso2022.c (-3 / +3 lines)
574		574
575	static wchar_t	575	static wchar_t
576	_ISO2022_sgetwchar(_ISO2022EncodingInfo * __restrict ei __unused,	576	_ISO2022_sgetwchar(_ISO2022EncodingInfo * __restrict ei __unused,
577	const char * __restrict string, size_t n, const char ** __restrict result,	577	char * __restrict string, size_t n, char ** __restrict result,
578	_ISO2022State * __restrict psenc)	578	_ISO2022State * __restrict psenc)
579	{	579	{
580	const struct seqtable *sp;	580	const struct seqtable *sp;
Lines 842-851 asis: Link Here
842		842
843	static int	843	static int
844	_citrus_ISO2022_mbrtowc_priv(_ISO2022EncodingInfo * __restrict ei,	844	_citrus_ISO2022_mbrtowc_priv(_ISO2022EncodingInfo * __restrict ei,
845	wchar_t * __restrict pwc, const char ** __restrict s,	845	wchar_t * __restrict pwc, char ** __restrict s,
846	size_t n, _ISO2022State * __restrict psenc, size_t * __restrict nresult)	846	size_t n, _ISO2022State * __restrict psenc, size_t * __restrict nresult)
847	{	847	{
848	const char p, result, *s0;	848	char p, result, *s0;
849	wchar_t wchar;	849	wchar_t wchar;
850	int c, chlenbak;	850	int c, chlenbak;
851		851

Lines 191-197 int smb_ctx_readrc(struct smb_ctx *); Link Here

(-)contrib/smbfs/include/netsmb/smb_lib.h (-7 / +7 lines)
191	int smb_ctx_resolve(struct smb_ctx *);	191	int smb_ctx_resolve(struct smb_ctx *);
192	int smb_ctx_setflags(struct smb_ctx *, int, int, int);	192	int smb_ctx_setflags(struct smb_ctx *, int, int, int);
193		193
194	int smb_smb_open_print_file(struct smb_ctx , int, int, const char , smbfh*);	194	int smb_smb_open_print_file(struct smb_ctx , int, int, char , smbfh*);
195	int smb_smb_close_print_file(struct smb_ctx *, smbfh);	195	int smb_smb_close_print_file(struct smb_ctx *, smbfh);
196		196
197	int smb_read(struct smb_ctx , smbfh, off_t, size_t, char );	197	int smb_read(struct smb_ctx , smbfh, off_t, size_t, char );
Lines 204-211 int smb_rq_init(struct smb_ctx *, u_cha Link Here
204	void smb_rq_done(struct smb_rq *);	204	void smb_rq_done(struct smb_rq *);
205	void smb_rq_wend(struct smb_rq *);	205	void smb_rq_wend(struct smb_rq *);
206	int smb_rq_simple(struct smb_rq *);	206	int smb_rq_simple(struct smb_rq *);
207	int smb_rq_dmem(struct mbdata , const char , size_t);	207	int smb_rq_dmem(struct mbdata , char , size_t);
208	int smb_rq_dstring(struct mbdata , const char );	208	int smb_rq_dstring(struct mbdata , char );
209		209
210	int smb_t2_request(struct smb_ctx , int, int, const char ,	210	int smb_t2_request(struct smb_ctx , int, int, const char ,
211	int, void , int, void , int , void , int , void );	211	int, void , int, void , int , void , int , void );
Lines 246-255 extern u_char nls_lower[256], nls_upper[ Link Here
246		246
247	int nls_setrecode(const char , const char );	247	int nls_setrecode(const char , const char );
248	int nls_setlocale(const char *);	248	int nls_setlocale(const char *);
249	char* nls_str_toext(char , const char );	249	char* nls_str_toext(char , char );
250	char* nls_str_toloc(char , const char );	250	char* nls_str_toloc(char , char );
251	void* nls_mem_toext(void , const void , int);	251	void* nls_mem_toext(void , void , int);
252	void* nls_mem_toloc(void , const void , int);	252	void* nls_mem_toloc(void , void , int);
253	char* nls_str_upper(char , const char );	253	char* nls_str_upper(char , const char );
254	char* nls_str_lower(char , const char );	254	char* nls_str_lower(char , const char );
255		255

Lines 102-108 nls_setrecode(const char *local, const c Link Here

(-)contrib/smbfs/lib/smb/nls.c (-6 / +6 lines)
102	}	102	}
103		103
104	char *	104	char *
105	nls_str_toloc(char dst, const char src)	105	nls_str_toloc(char dst, char src)
106	{	106	{
107	#ifdef HAVE_ICONV	107	#ifdef HAVE_ICONV
108	char *p = dst;	108	char *p = dst;
Lines 125-131 nls_str_toloc(char dst, const char src Link Here
125	}	125	}
126		126
127	char *	127	char *
128	nls_str_toext(char dst, const char src)	128	nls_str_toext(char dst, char src)
129	{	129	{
130	#ifdef HAVE_ICONV	130	#ifdef HAVE_ICONV
131	char *p = dst;	131	char *p = dst;
Lines 148-158 nls_str_toext(char dst, const char src Link Here
148	}	148	}
149		149
150	void *	150	void *
151	nls_mem_toloc(void dst, const void src, int size)	151	nls_mem_toloc(void dst, void src, int size)
152	{	152	{
153	#ifdef HAVE_ICONV	153	#ifdef HAVE_ICONV
154	char *p = dst;	154	char *p = dst;
155	const char *s = src;	155	char *s = src;
156	size_t inlen, outlen;	156	size_t inlen, outlen;
157		157
158	if (size == 0)	158	if (size == 0)
Lines 174-184 nls_mem_toloc(void dst, const void src Link Here
174	}	174	}
175		175
176	void *	176	void *
177	nls_mem_toext(void dst, const void src, int size)	177	nls_mem_toext(void dst, void src, int size)
178	{	178	{
179	#ifdef HAVE_ICONV	179	#ifdef HAVE_ICONV
180	char *p = dst;	180	char *p = dst;
181	const char *s = src;	181	char *s = src;
182	size_t inlen, outlen;	182	size_t inlen, outlen;
183		183
184	if (size == 0)	184	if (size == 0)

Lines 46-52 static void _citrus_##_m_##_iconv_unini Link Here

(-)lib/libc/iconv/citrus_iconv_local.h (-2 / +2 lines)
46	(struct _citrus_iconv_shared *); \	46	(struct _citrus_iconv_shared *); \
47	static int _citrus_##_m_##_iconv_convert \	47	static int _citrus_##_m_##_iconv_convert \
48	(struct _citrus_iconv * __restrict, \	48	(struct _citrus_iconv * __restrict, \
49	const char * __restrict * __restrict, \	49	char * __restrict * __restrict, \
50	size_t * __restrict, \	50	size_t * __restrict, \
51	char * __restrict * __restrict, \	51	char * __restrict * __restrict, \
52	size_t * __restrict outbytes, \	52	size_t * __restrict outbytes, \
Lines 75-81 typedef void (*_citrus_iconv_uninit_shar Link Here
75	(struct _citrus_iconv_shared *);	75	(struct _citrus_iconv_shared *);
76	typedef int (*_citrus_iconv_convert_t)	76	typedef int (*_citrus_iconv_convert_t)
77	(struct _citrus_iconv * __restrict,	77	(struct _citrus_iconv * __restrict,
78	const char __restrict __restrict, size_t * __restrict,	78	char __restrict __restrict, size_t * __restrict,
79	char * __restrict * __restrict, size_t * __restrict, uint32_t,	79	char * __restrict * __restrict, size_t * __restrict, uint32_t,
80	size_t * __restrict);	80	size_t * __restrict);
81	typedef int (_citrus_iconv_init_context_t)(struct _citrus_iconv );	81	typedef int (_citrus_iconv_init_context_t)(struct _citrus_iconv );

Lines 55-61 static int _citrus_##_e_##_stdenc_mbtoc Link Here

(-)lib/libc/iconv/citrus_stdenc_local.h (-4 / +4 lines)
55	(struct _citrus_stdenc * __restrict, \	55	(struct _citrus_stdenc * __restrict, \
56	_citrus_csid_t * __restrict, \	56	_citrus_csid_t * __restrict, \
57	_citrus_index_t * __restrict, \	57	_citrus_index_t * __restrict, \
58	const char ** __restrict, size_t, \	58	char ** __restrict, size_t, \
59	void * __restrict, size_t * __restrict, \	59	void * __restrict, size_t * __restrict, \
60	struct iconv_hooks *); \	60	struct iconv_hooks *); \
61	static int _citrus_##_e_##_stdenc_cstomb \	61	static int _citrus_##_e_##_stdenc_cstomb \
Lines 66-72 static int _citrus_##_e_##_stdenc_cstom Link Here
66	static int _citrus_##_e_##_stdenc_mbtowc \	66	static int _citrus_##_e_##_stdenc_mbtowc \
67	(struct _citrus_stdenc * __restrict, \	67	(struct _citrus_stdenc * __restrict, \
68	_citrus_wc_t * __restrict, \	68	_citrus_wc_t * __restrict, \
69	const char ** __restrict, size_t, \	69	char ** __restrict, size_t, \
70	void * __restrict, size_t * __restrict, \	70	void * __restrict, size_t * __restrict, \
71	struct iconv_hooks *); \	71	struct iconv_hooks *); \
72	static int _citrus_##_e_##_stdenc_wctomb \	72	static int _citrus_##_e_##_stdenc_wctomb \
Lines 106-112 typedef int (*_citrus_stdenc_init_state_ Link Here
106	typedef int (*_citrus_stdenc_mbtocs_t)	106	typedef int (*_citrus_stdenc_mbtocs_t)
107	(struct _citrus_stdenc * __restrict,	107	(struct _citrus_stdenc * __restrict,
108	_citrus_csid_t * __restrict, _citrus_index_t * __restrict,	108	_citrus_csid_t * __restrict, _citrus_index_t * __restrict,
109	const char ** __restrict, size_t,	109	char ** __restrict, size_t,
110	void * __restrict, size_t * __restrict,	110	void * __restrict, size_t * __restrict,
111	struct iconv_hooks *);	111	struct iconv_hooks *);
112	typedef int (*_citrus_stdenc_cstomb_t)	112	typedef int (*_citrus_stdenc_cstomb_t)
Lines 116-122 typedef int (*_citrus_stdenc_cstomb_t) Link Here
116	typedef int (*_citrus_stdenc_mbtowc_t)	116	typedef int (*_citrus_stdenc_mbtowc_t)
117	(struct _citrus_stdenc * __restrict,	117	(struct _citrus_stdenc * __restrict,
118	_citrus_wc_t * __restrict,	118	_citrus_wc_t * __restrict,
119	const char ** __restrict, size_t,	119	char ** __restrict, size_t,
120	void * __restrict, size_t * __restrict,	120	void * __restrict, size_t * __restrict,
121	struct iconv_hooks *);	121	struct iconv_hooks *);
122	typedef int (*_citrus_stdenc_wctomb_t)	122	typedef int (*_citrus_stdenc_wctomb_t)

Lines 190-201 _citrus_EUC_unpack_state(_EUCEncodingInf Link Here

(-)lib/libiconv_modules/EUC/citrus_euc.c (-2 / +2 lines)
190	#endif	190	#endif
191		191
192	static int	192	static int
193	_citrus_EUC_mbrtowc_priv(_EUCEncodingInfo ei, wchar_t pwc, const char **s,	193	_citrus_EUC_mbrtowc_priv(_EUCEncodingInfo ei, wchar_t pwc, char **s,
194	size_t n, _EUCState psenc, size_t nresult)	194	size_t n, _EUCState psenc, size_t nresult)
195	{	195	{
196	wchar_t wchar;	196	wchar_t wchar;
197	int c, chlenbak, cs, len;	197	int c, chlenbak, cs, len;
198	const char s0, s1 = NULL;	198	char s0, s1 = NULL;
199		199
200	s0 = *s;	200	s0 = *s;
201		201

Lines 175-187 _citrus_HZ_unpack_state(_HZEncodingInfo Link Here

(-)lib/libiconv_modules/HZ/citrus_hz.c (-2 / +2 lines)
175		175
176	static int	176	static int
177	_citrus_HZ_mbrtowc_priv(_HZEncodingInfo * __restrict ei,	177	_citrus_HZ_mbrtowc_priv(_HZEncodingInfo * __restrict ei,
178	wchar_t * __restrict pwc, const char ** __restrict s, size_t n,	178	wchar_t * __restrict pwc, char ** __restrict s, size_t n,
179	_HZState * __restrict psenc, size_t * __restrict nresult)	179	_HZState * __restrict psenc, size_t * __restrict nresult)
180	{	180	{
181	escape_t candidate, init;	181	escape_t candidate, init;
182	graphic_t *graphic;	182	graphic_t *graphic;
183	const range_t *range;	183	const range_t *range;
184	const char *s0;	184	char *s0;
185	wchar_t wc;	185	wchar_t wc;
186	int bit, ch, head, len, tail;	186	int bit, ch, head, len, tail;
187		187

Lines 151-161 static const char spaces[] = " \t\r\n"; Link Here

(-)lib/libiconv_modules/UTF7/citrus_utf7.c (-3 / +3 lines)
151		151
152	static int	152	static int
153	_citrus_UTF7_mbtoutf16(_UTF7EncodingInfo * __restrict ei,	153	_citrus_UTF7_mbtoutf16(_UTF7EncodingInfo * __restrict ei,
154	uint16_t * __restrict u16, const char ** __restrict s, size_t n,	154	uint16_t * __restrict u16, char ** __restrict s, size_t n,
155	_UTF7State * __restrict psenc, size_t * __restrict nresult)	155	_UTF7State * __restrict psenc, size_t * __restrict nresult)
156	{	156	{
157	_UTF7State sv;	157	_UTF7State sv;
158	const char *s0;	158	char *s0;
159	int done, i, len;	159	int done, i, len;
160		160
161	s0 = *s;	161	s0 = *s;
Lines 244-250 ilseq: Link Here
244		244
245	static int	245	static int
246	_citrus_UTF7_mbrtowc_priv(_UTF7EncodingInfo * __restrict ei,	246	_citrus_UTF7_mbrtowc_priv(_UTF7EncodingInfo * __restrict ei,
247	wchar_t * __restrict pwc, const char ** __restrict s, size_t n,	247	wchar_t * __restrict pwc, char ** __restrict s, size_t n,
248	_UTF7State * __restrict psenc, size_t * __restrict nresult)	248	_UTF7State * __restrict psenc, size_t * __restrict nresult)
249	{	249	{
250	uint32_t u32;	250	uint32_t u32;

Lines 104-110 init_encoding_state(struct _citrus_iconv Link Here

(-)lib/libiconv_modules/iconv_std/citrus_iconv_std.c (-3 / +3 lines)
104		104
105	static __inline int	105	static __inline int
106	mbtocsx(struct _citrus_iconv_std_encoding *se,	106	mbtocsx(struct _citrus_iconv_std_encoding *se,
107	_csid_t csid, _index_t idx, const char *s, size_t n, size_t nresult,	107	_csid_t csid, _index_t idx, char *s, size_t n, size_t nresult,
108	struct iconv_hooks *hooks)	108	struct iconv_hooks *hooks)
109	{	109	{
110		110
Lines 461-467 _citrus_iconv_std_iconv_uninit_context(s Link Here
461		461
462	static int	462	static int
463	_citrus_iconv_std_iconv_convert(struct _citrus_iconv * __restrict cv,	463	_citrus_iconv_std_iconv_convert(struct _citrus_iconv * __restrict cv,
464	const char * __restrict * __restrict in, size_t * __restrict inbytes,	464	char * __restrict * __restrict in, size_t * __restrict inbytes,
465	char * __restrict * __restrict out, size_t * __restrict outbytes,	465	char * __restrict * __restrict out, size_t * __restrict outbytes,
466	uint32_t flags, size_t * __restrict invalids)	466	uint32_t flags, size_t * __restrict invalids)
467	{	467	{
Lines 469-475 _citrus_iconv_std_iconv_convert(struct _ Link Here
469	struct _citrus_iconv_std_context *sc = cv->cv_closure;	469	struct _citrus_iconv_std_context *sc = cv->cv_closure;
470	_csid_t csid;	470	_csid_t csid;
471	_index_t idx;	471	_index_t idx;
472	const char *tmpin;	472	char *tmpin;
473	size_t inval, szrin, szrout;	473	size_t inval, szrin, szrout;
474	int ret, state = 0;	474	int ret, state = 0;
475		475

Lines 62-68 static int chklocale(int, const char *); Link Here

(-)lib/libkiconv/xlat16_iconv.c (-10 / +9 lines)
62	typedef void *iconv_t;	62	typedef void *iconv_t;
63	static int my_iconv_init(void);	63	static int my_iconv_init(void);
64	static iconv_t (my_iconv_open)(const char , const char *);	64	static iconv_t (my_iconv_open)(const char , const char *);
65	static size_t (my_iconv)(iconv_t, const char , size_t , char *, size_t );	65	static size_t (my_iconv)(iconv_t, char , size_t , char *, size_t );
66	static int (*my_iconv_close)(iconv_t);	66	static int (*my_iconv_close)(iconv_t);
67	#else	67	#else
68	#include <iconv.h>	68	#include <iconv.h>
Lines 71-77 static int (*my_iconv_close)(iconv_t); Link Here
71	#define my_iconv iconv	71	#define my_iconv iconv
72	#define my_iconv_close iconv_close	72	#define my_iconv_close iconv_close
73	#endif	73	#endif
74	static size_t my_iconv_char(iconv_t, const u_char *, size_t , u_char *, size_t );	74	static size_t my_iconv_char(iconv_t, u_char *, size_t , u_char *, size_t );
75		75
76	int	76	int
77	kiconv_add_xlat16_cspair(const char tocode, const char fromcode, int flag)	77	kiconv_add_xlat16_cspair(const char tocode, const char fromcode, int flag)
Lines 221-228 kiconv_xlat16_open(const char *tocode, c Link Here
221	src[0] = (u_char)(c >> 8);	221	src[0] = (u_char)(c >> 8);
222	src[1] = (u_char)c;	222	src[1] = (u_char)c;
223		223
224	ret = my_iconv_char(cd, (const u_char **)&srcp,	224	ret = my_iconv_char(cd, &srcp, &inbytesleft,
225	&inbytesleft, &dstp, &outbytesleft);	225	&dstp, &outbytesleft);
226	if (ret == -1) {	226	if (ret == -1) {
227	table[us] = 0;	227	table[us] = 0;
228	continue;	228	continue;
Lines 338-348 my_iconv_init(void) Link Here
338	#endif	338	#endif
339		339
340	static size_t	340	static size_t
341	my_iconv_char(iconv_t cd, const u_char *ibuf, size_t ilen, u_char **obuf,	341	my_iconv_char(iconv_t cd, u_char *ibuf, size_t ilen, u_char **obuf,
342	size_t * olen)	342	size_t * olen)
343	{	343	{
344	const u_char *sp;	344	u_char sp, dp, ilocal[3], olocal[3];
345	u_char *dp, ilocal[3], olocal[3];
346	u_char c1, c2;	345	u_char c1, c2;
347	int ret;	346	int ret;
348	size_t ir, or;	347	size_t ir, or;
Lines 352-358 my_iconv_char(iconv_t cd, const u_char * Link Here
352	ir = *ilen;	351	ir = *ilen;
353		352
354	bzero(obuf, olen);	353	bzero(obuf, olen);
355	ret = my_iconv(cd, (const char )&sp, ilen, (char )&dp, olen);	354	ret = my_iconv(cd, (char )&sp, ilen, (char )&dp, olen);
356	c1 = (*obuf)[0];	355	c1 = (*obuf)[0];
357	c2 = (*obuf)[1];	356	c2 = (*obuf)[1];
358		357
Lines 375-381 my_iconv_char(iconv_t cd, const u_char * Link Here
375	sp = ilocal;	374	sp = ilocal;
376	dp = olocal;	375	dp = olocal;
377		376
378	if ((my_iconv(cd,(const char )&sp, &ir, (char )&dp, &or)) != -1) {	377	if ((my_iconv(cd,(char )&sp, &ir, (char )&dp, &or)) != -1) {
379	if (olocal[0] != c1)	378	if (olocal[0] != c1)
380	return (ret);	379	return (ret);
381		380
Lines 429-435 my_iconv_char(iconv_t cd, const u_char * Link Here
429	sp = ilocal + 1;	428	sp = ilocal + 1;
430	dp = olocal;	429	dp = olocal;
431		430
432	if ((my_iconv(cd,(const char )&sp, &ir, (char )&dp, &or)) != -1) {	431	if ((my_iconv(cd,(char )&sp, &ir, (char )&dp, &or)) != -1) {
433	if (olocal[0] == c2)	432	if (olocal[0] == c2)
434	/*	433	/*
435	* inbuf is a single byte char	434	* inbuf is a single byte char