JehanneOS
/
newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

iconv: match SUSv3 prototype 

* libc/include/iconv.h (iconv): Match POSIX prototype.
* libc/iconv/lib/iconv.c (iconv): Likewise.
This commit is contained in:
Eric Blake 2009-08-21 20:27:10 +00:00
parent c11ba63d52
commit 3584ff9cb2
3 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
newlib/ChangeLog
View File

@ -1,3 +1,8 @@
2009-08-21 Eric Blake <ebb9@byu.net>
* libc/include/iconv.h (iconv): Match POSIX prototype.
* libc/iconv/lib/iconv.c (iconv): Likewise.
2009-08-21 Craig Howland <howland@LGSInnovations.com> 2009-08-21 Craig Howland <howland@LGSInnovations.com>
* libm/common/s_remquo.c (remquo): Fix sign of quotient when |x|==|y|. * libm/common/s_remquo.c (remquo): Fix sign of quotient when |x|==|y|.

9
newlib/libc/iconv/lib/iconv.c
View File

@ -45,7 +45,7 @@ ANSI_SYNOPSIS
#include <iconv.h> #include <iconv.h>
iconv_t iconv_open (const char *<[to]>, const char *<[from]>); iconv_t iconv_open (const char *<[to]>, const char *<[from]>);
int iconv_close (iconv_t <[cd]>); int iconv_close (iconv_t <[cd]>);
size_t iconv (iconv_t <[cd]>, const char **<[inbuf]>, size_t iconv (iconv_t <[cd]>, char **<[inbuf]>,
size_t *<[inbytesleft]>, size_t *<[inbytesleft]>,
char **<[outbuf]>, size_t *<[outbytesleft]>), char **<[outbuf]>, size_t *<[outbytesleft]>),
@ -61,7 +61,7 @@ TRAD_SYNOPSIS
#include <iconv.h> #include <iconv.h>
size_t iconv (<[cd]>, <[in]>, <[inleft]>, <[out]>, <[outleft]>) size_t iconv (<[cd]>, <[in]>, <[inleft]>, <[out]>, <[outleft]>)
iconv_t <[cd]>; iconv_t <[cd]>;
const char **<[in]>; char **<[in]>;
size_t *<[inleft]>; size_t *<[inleft]>;
char **<[out]>; char **<[out]>;
size_t *<[outleft]>); size_t *<[outleft]>);
@ -168,12 +168,13 @@ _DEFUN(iconv_open, (to, from),
size_t size_t
_DEFUN(iconv, (cd, inbuf, inbytesleft, outbuf, outbytesleft), _DEFUN(iconv, (cd, inbuf, inbytesleft, outbuf, outbytesleft),
iconv_t cd _AND iconv_t cd _AND
_CONST char **inbuf _AND char **inbuf _AND
size_t *inbytesleft _AND size_t *inbytesleft _AND
char **outbuf _AND char **outbuf _AND
size_t *outbytesleft) size_t *outbytesleft)
{ {
return _iconv_r (_REENT, cd, inbuf, inbytesleft, outbuf, outbytesleft); return _iconv_r (_REENT, cd, (_CONST char **) inbuf, inbytesleft,
outbuf, outbytesleft);
} }

2
newlib/libc/include/iconv.h
View File

@ -41,7 +41,7 @@ iconv_t
_EXFUN(iconv_open, (_CONST char *, _CONST char *)); _EXFUN(iconv_open, (_CONST char *, _CONST char *));
size_t size_t
_EXFUN(iconv, (iconv_t, _CONST char **, size_t *, char **, size_t *)); _EXFUN(iconv, (iconv_t, char **, size_t *, char **, size_t *));
int int
_EXFUN(iconv_close, (iconv_t)); _EXFUN(iconv_close, (iconv_t));