Attachment 155505 Details for Bug 199099 – base patch2

[patch] base patch2

iconvbase.patch (text/plain), 7.85 KB, created by Tijl Coosemans on 2015-04-12 08:59:39 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tijl Coosemans

Created: 2015-04-12 08:59:39 UTC

Size: 7.85 KB

patch

obsolete

>Index: include/iconv.h
>===================================================================
>--- include/iconv.h	(revision 281460)
>+++ include/iconv.h	(working copy)
>@@ -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
> 
>Index: lib/libiconv_modules/iconv_none/citrus_iconv_none.c
>===================================================================
>--- lib/libiconv_modules/iconv_none/citrus_iconv_none.c	(revision 281460)
>+++ lib/libiconv_modules/iconv_none/citrus_iconv_none.c	(working copy)
>@@ -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)
> {
>Index: lib/libiconv_modules/iconv_std/citrus_iconv_std.c
>===================================================================
>--- lib/libiconv_modules/iconv_std/citrus_iconv_std.c	(revision 281460)
>+++ lib/libiconv_modules/iconv_std/citrus_iconv_std.c	(working copy)
>@@ -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)
> {
>Index: lib/libc/iconv/__iconv.c
>===================================================================
>--- lib/libc/iconv/__iconv.c	(revision 281460)
>+++ lib/libc/iconv/__iconv.c	(working copy)
>@@ -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);
>Index: lib/libc/iconv/bsd_iconv.c
>===================================================================
>--- lib/libc/iconv/bsd_iconv.c	(revision 281460)
>+++ lib/libc/iconv/bsd_iconv.c	(working copy)
>@@ -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;
>Index: lib/libc/iconv/citrus_iconv.h
>===================================================================
>--- lib/libc/iconv/citrus_iconv.h	(revision 281460)
>+++ lib/libc/iconv/citrus_iconv.h	(working copy)
>@@ -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)
> {
>Index: lib/libc/iconv/citrus_iconv_local.h
>===================================================================
>--- lib/libc/iconv/citrus_iconv_local.h	(revision 281460)
>+++ lib/libc/iconv/citrus_iconv_local.h	(working copy)
>@@ -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 *);
>Index: lib/libc/iconv/iconv-internal.h
>===================================================================
>--- lib/libc/iconv/iconv-internal.h	(revision 281460)
>+++ lib/libc/iconv/iconv-internal.h	(working copy)
>@@ -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 *);
>Index: lib/libc/iconv/iconv.3
>===================================================================
>--- lib/libc/iconv/iconv.3	(revision 281460)
>+++ lib/libc/iconv/iconv.3	(working copy)
>@@ -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
>Index: lib/libc/iconv/iconv.c
>===================================================================
>--- lib/libc/iconv/iconv.c	(revision 281460)
>+++ lib/libc/iconv/iconv.c	(working copy)
>@@ -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)
> {
>Index: lib/libc/iconv/iconv_compat.c
>===================================================================
>--- lib/libc/iconv/iconv_compat.c	(revision 281460)
>+++ lib/libc/iconv/iconv_compat.c	(working copy)
>@@ -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);
>Index: usr.bin/iconv/iconv.c
>===================================================================
>--- usr.bin/iconv/iconv.c	(revision 281460)
>+++ usr.bin/iconv/iconv.c	(working copy)
>@@ -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)

Actions: View | Diff

Attachments on bug 199099: 155100 | 155101 | 155168 | 155184 | 155201 | 155205 | 155228 | 155413 | 155482 | 155505 | 155544 | 155545