2013-11-20 Daniel Ramirez <javamonn@gmail.com>

	* libc/iconv/lib/iconv.c, libc/include/iconv.h,
	libc/sys/linux/iconv/iconv.c: Add restrict keyword.

diff --git a/newlib/ChangeLog b/newlib/ChangeLog
index b740c8d304ebd3e3777825a3936655c94fa2481a..92c156caa980b5e978fdd09fd7151bdce88fef83 100644 (file)
--- a/newlib/ChangeLog
+++ b/newlib/ChangeLog
@@ -1,3 +1,8 @@
+2013-11-20  Daniel Ramirez <javamonn@gmail.com>
+
+       * libc/iconv/lib/iconv.c, libc/include/iconv.h, 
+       libc/sys/linux/iconv/iconv.c: Add restrict keyword.
+
 2013-11-20  Corinna Vinschen  <vinschen@redhat.com>
 
        * libc/include/stdlib.h: Declare realpath only if !__STRICT_ANSI__.

diff --git a/newlib/libc/iconv/lib/iconv.c b/newlib/libc/iconv/lib/iconv.c
index 8bbcae19281ac83772be0fa4f5cdfb9f7917be75..f8673b7c6d7c9d7b3896078dc7973e0e5d7561b5 100644 (file)
--- a/newlib/libc/iconv/lib/iconv.c
+++ b/newlib/libc/iconv/lib/iconv.c
@@ -45,9 +45,10 @@ ANSI_SYNOPSIS
        #include <iconv.h>
        iconv_t iconv_open (const char *<[to]>, const char *<[from]>);
        int iconv_close (iconv_t <[cd]>);
-        size_t iconv (iconv_t <[cd]>, char **<[inbuf]>, 
-                     size_t *<[inbytesleft]>, 
-                     char **<[outbuf]>, size_t *<[outbytesleft]>),
+        size_t iconv (iconv_t <[cd]>, char **__restrict<[inbuf]>, 
+                     size_t *__restrict<[inbytesleft]>, 
+                     char **__restrict<[outbuf]>, 
+                      size_t *__restrict<[outbytesleft]>),
 
        iconv_t _iconv_open_r (struct _reent *<[rptr]>, 
                               const char *<[to]>, const char *<[from]>);
@@ -168,10 +169,10 @@ _DEFUN(iconv_open, (to, from),
 size_t
 _DEFUN(iconv, (cd, inbuf, inbytesleft, outbuf, outbytesleft),
               iconv_t cd          _AND
-              char **inbuf _AND
-              size_t *inbytesleft _AND
-              char **outbuf       _AND
-              size_t *outbytesleft)
+              char **__restrict inbuf _AND
+              size_t *__restrict inbytesleft _AND
+              char **__restrict outbuf       _AND
+              size_t *__restrict outbytesleft)
 {
     return _iconv_r (_REENT, cd, (_CONST char **) inbuf, inbytesleft,
                     outbuf, outbytesleft);

diff --git a/newlib/libc/include/iconv.h b/newlib/libc/include/iconv.h
index c4a283afaaec61e7b022067654215ec27819925d..4c023e9df77a7c669f191d78b77f02689179c3a4 100644 (file)
--- a/newlib/libc/include/iconv.h
+++ b/newlib/libc/include/iconv.h
@@ -41,7 +41,8 @@ iconv_t
 _EXFUN(iconv_open, (_CONST char *, _CONST char *));
 
 size_t
-_EXFUN(iconv, (iconv_t, char **, size_t *, char **, size_t *));
+_EXFUN(iconv, (iconv_t, char **__restrict, size_t *__restrict, 
+               char **__restrict, size_t *__restrict));
 
 int
 _EXFUN(iconv_close, (iconv_t));

diff --git a/newlib/libc/sys/linux/iconv/iconv.c b/newlib/libc/sys/linux/iconv/iconv.c
index d0f5528f55b7a6b877b6ea7520183cef48904ff3..65c6cfc4e9ed39988a7f54610b4be7fa95041e69 100644 (file)
--- a/newlib/libc/sys/linux/iconv/iconv.c
+++ b/newlib/libc/sys/linux/iconv/iconv.c
@@ -29,8 +29,10 @@
 
 
 size_t
-iconv (iconv_t cd, char **inbuf, size_t *inbytesleft, char **outbuf,
-       size_t *outbytesleft)
+iconv (iconv_t cd, char **__restrict inbuf,
+       size_t *__restrict inbytesleft,
+       char **__restrict outbuf,
+       size_t *__restrict outbytesleft)
 {
   __gconv_t gcd = (__gconv_t) cd;
   char *outstart = outbuf ? *outbuf : NULL;