2013-11-18 Sahil Patnayakuni <sahilp@oarcorp.com>

	* libc/include/stdio.h, libc/machine/powerpc/vfscanf.c,
	libc/machine/spu/fgetpos.c, libc/machine/spu/fgets.c,
	libc/machine/spu/fopen.c, libc/machine/spu/fputs.c,
	libc/machine/spu/fread.c, libc/machine/spu/freopen.c,
	libc/machine/spu/fwrite.c, libc/machine/spu/setbuf.c,
	libc/machine/spu/vfprintf.c, libc/machine/spu/vfscanf.c,
	libc/machine/spu/vsnprintf.c, libc/machine/spu/vsprintf.c,
	libc/machine/spu/vsscanf.c, libc/stdio/asnprintf.c,
	libc/stdio/asprintf.c, libc/stdio/dprintf.c,
	libc/stdio/fgetpos.c, libc/stdio/fgets.c,
	libc/stdio/fmemopen.c, libc/stdio/fopen.c,
	libc/stdio/fprintf.c, libc/stdio/fputs.c,
	libc/stdio/fread.c, libc/stdio/freopen.c,
	libc/stdio/fscanf.c, libc/stdio/fwrite.c,
	libc/stdio/printf.c, libc/stdio/scanf.c,
	libc/stdio/setbuf.c, libc/stdio/snprintf.c,
	libc/stdio/sprintf.c, libc/stdio/sscanf.c,
	libc/stdio/vdprintf.c, libc/stdio/vprintf.c,
	libc/stdio/vscanf.c, libc/stdio/vsnprintf.c,
	libc/stdio/vsprintf.c, libc/stdio/vsscanf.c: Add restrict keyword.

14 files changed, 36 insertions, 36 deletions

diff --git a/newlib/libc/machine/powerpc/vfscanf.c b/newlib/libc/machine/powerpc/vfscanf.c
index f759506e1..6794f9b7e 100644
--- a/newlib/libc/machine/powerpc/vfscanf.c
+++ b/newlib/libc/machine/powerpc/vfscanf.c
@@ -12,15 +12,15 @@ INDEX
 ANSI_SYNOPSIS
 	#include <stdio.h>
 	#include <stdarg.h>
-	int vscanf(const char *<[fmt]>, va_list <[list]>);
-	int vfscanf(FILE *<[fp]>, const char *<[fmt]>, va_list <[list]>);
-	int vsscanf(const char *<[str]>, const char *<[fmt]>, va_list <[list]>);
+	int vscanf(const char *restrict <[fmt]>, va_list <[list]>);
+	int vfscanf(FILE *restrict <[fp]>, const char *restrict <[fmt]>, va_list <[list]>);
+	int vsscanf(const char *restrict <[str]>, const char *restrict <[fmt]>, va_list <[list]>);
 
-	int _vscanf_r(void *<[reent]>, const char *<[fmt]>, 
+	int _vscanf_r(void *<[reent]>, const char *restrict <[fmt]>, 
                        va_list <[list]>);
-	int _vfscanf_r(void *<[reent]>, FILE *<[fp]>, const char *<[fmt]>, 
+	int _vfscanf_r(void *<[reent]>, FILE *restrict <[fp]>, const char *restrict <[fmt]>, 
                        va_list <[list]>);
-	int _vsscanf_r(void *<[reent]>, const char *<[str]>, const char *<[fmt]>, 
+	int _vsscanf_r(void *<[reent]>, const char *restrict <[str]>, const char *restrict <[fmt]>, 
                        va_list <[list]>);
 
 TRAD_SYNOPSIS
@@ -218,8 +218,8 @@ typedef union
 
 int
 _DEFUN (vfscanf, (fp, fmt, ap), 
-    register FILE *fp _AND 
-    _CONST char *fmt _AND 
+    register FILE *__restrict fp _AND 
+    _CONST char *__restrict fmt _AND 
     va_list ap)
 {
   CHECK_INIT(_REENT, fp);
@@ -240,8 +240,8 @@ __svfscanf (fp, fmt0, ap)
 int
 _DEFUN (_vfscanf_r, (data, fp, fmt, ap),
     struct _reent *data _AND 
-    register FILE *fp _AND 
-    _CONST char *fmt _AND 
+    register FILE *__restrict fp _AND 
+    _CONST char *__restrict fmt _AND 
     va_list ap)
 {
   return __svfscanf_r (data, fp, fmt, ap);
diff --git a/newlib/libc/machine/spu/fgetpos.c b/newlib/libc/machine/spu/fgetpos.c
index aa7b6f001..694400e48 100644
--- a/newlib/libc/machine/spu/fgetpos.c
+++ b/newlib/libc/machine/spu/fgetpos.c
@@ -45,8 +45,8 @@ typedef struct
 
 int
 _DEFUN (fgetpos, (fp, pos),
-	FILE * fp _AND
-	_fpos_t * pos)
+	FILE *__restrict fp _AND
+	_fpos_t *__restrict pos)
 {
   c99_fgetpos_t arg;
 
diff --git a/newlib/libc/machine/spu/fgets.c b/newlib/libc/machine/spu/fgets.c
index 8167fd174..2b0ca417e 100644
--- a/newlib/libc/machine/spu/fgets.c
+++ b/newlib/libc/machine/spu/fgets.c
@@ -47,9 +47,9 @@ typedef struct
 
 char *
 _DEFUN (fgets, (buf, n, fp),
-	char *buf _AND
+	char *__restrict buf _AND
 	int n _AND
-	FILE * fp)
+	FILE *__restrict fp)
 {
   c99_fgets_t args;
 
diff --git a/newlib/libc/machine/spu/fopen.c b/newlib/libc/machine/spu/fopen.c
index 20b36678a..821d7c201 100644
--- a/newlib/libc/machine/spu/fopen.c
+++ b/newlib/libc/machine/spu/fopen.c
@@ -46,8 +46,8 @@ typedef struct
 #ifndef _REENT_ONLY
 FILE *
 _DEFUN (fopen, (file, mode),
-	_CONST char *file _AND
-	_CONST char *mode)
+	_CONST char *__restrict file _AND
+	_CONST char *__restrict mode)
 {
   int ret;
   c99_fopen_t args;
diff --git a/newlib/libc/machine/spu/fputs.c b/newlib/libc/machine/spu/fputs.c
index 2b5d17587..9ed796894 100644
--- a/newlib/libc/machine/spu/fputs.c
+++ b/newlib/libc/machine/spu/fputs.c
@@ -47,8 +47,8 @@ typedef struct
 
 int
 _DEFUN (fputs, (s, fp),
-	char _CONST * s _AND
-	FILE * fp)
+	char _CONST *__restrict s _AND
+	FILE *__restrict fp)
 {
   c99_fputs_t args;
 
diff --git a/newlib/libc/machine/spu/fread.c b/newlib/libc/machine/spu/fread.c
index f3c420f76..eb3966c19 100644
--- a/newlib/libc/machine/spu/fread.c
+++ b/newlib/libc/machine/spu/fread.c
@@ -50,10 +50,10 @@ typedef struct
 
 size_t
 _DEFUN (fread, (buf, size, count, fp),
-	_PTR buf _AND
+	_PTR __restrict  buf _AND
 	size_t size _AND
 	size_t count _AND
-	FILE * fp)
+	FILE *__restrict fp)
 {
   c99_fread_t args;
 
diff --git a/newlib/libc/machine/spu/freopen.c b/newlib/libc/machine/spu/freopen.c
index 9f19a68f5..53dd2bc1d 100644
--- a/newlib/libc/machine/spu/freopen.c
+++ b/newlib/libc/machine/spu/freopen.c
@@ -48,9 +48,9 @@ typedef struct
 
 FILE *
 _DEFUN (freopen, (file, mode, fp),
-	const char *file _AND
-	const char *mode _AND
-	FILE *fp)
+	const char *__restrict file _AND
+	const char *__restrict mode _AND
+	FILE *__restrict fp)
 {
   int ret;
   c99_freopen_t args;
diff --git a/newlib/libc/machine/spu/fwrite.c b/newlib/libc/machine/spu/fwrite.c
index 3804165c8..58aab9f0a 100644
--- a/newlib/libc/machine/spu/fwrite.c
+++ b/newlib/libc/machine/spu/fwrite.c
@@ -50,7 +50,7 @@ typedef struct
 
 size_t
 _DEFUN (fwrite, (buf, size, count, fp),
-	_CONST _PTR buf _AND
+	_CONST _PTR __restrict buf _AND
 	size_t size _AND
 	size_t count _AND
 	FILE * fp)
diff --git a/newlib/libc/machine/spu/setbuf.c b/newlib/libc/machine/spu/setbuf.c
index 555568154..84430fc73 100644
--- a/newlib/libc/machine/spu/setbuf.c
+++ b/newlib/libc/machine/spu/setbuf.c
@@ -47,8 +47,8 @@ typedef struct
 
 void
 _DEFUN (setbuf, (fp, buf),
-	FILE * fp _AND
-	char *buf)
+	FILE *__restrict fp _AND
+	char *__restrict buf)
 {
   c99_setbuf_t args;
 
diff --git a/newlib/libc/machine/spu/vfprintf.c b/newlib/libc/machine/spu/vfprintf.c
index f46c802b0..128d0b3eb 100644
--- a/newlib/libc/machine/spu/vfprintf.c
+++ b/newlib/libc/machine/spu/vfprintf.c
@@ -58,8 +58,8 @@ typedef struct
 
 int
 _DEFUN (vfprintf, (fp, fmt0, ap),
-	FILE * fp _AND
-	_CONST char *fmt0 _AND
+	FILE *__restrict fp _AND
+	_CONST char *__restrict fmt0 _AND
 	va_list ap)
 {
   c99_vfprintf_t args;
diff --git a/newlib/libc/machine/spu/vfscanf.c b/newlib/libc/machine/spu/vfscanf.c
index 4de496b11..0f728969f 100644
--- a/newlib/libc/machine/spu/vfscanf.c
+++ b/newlib/libc/machine/spu/vfscanf.c
@@ -58,8 +58,8 @@ typedef struct
 
 int
 _DEFUN (vfscanf, (fp, fmt, ap),
-    FILE *fp _AND
-    _CONST char *fmt _AND
+    FILE *__restrict fp _AND
+    _CONST char *__restrict fmt _AND
     va_list ap)
 {
   c99_vfscanf_t args;
diff --git a/newlib/libc/machine/spu/vsnprintf.c b/newlib/libc/machine/spu/vsnprintf.c
index 575cf82d2..cf4f5e709 100644
--- a/newlib/libc/machine/spu/vsnprintf.c
+++ b/newlib/libc/machine/spu/vsnprintf.c
@@ -28,9 +28,9 @@ typedef struct
 
 int
 _DEFUN (vsnprintf, (str, size, fmt, ap),
-     char *str _AND
+     char *__restrict str _AND
      size_t size _AND
-     _CONST char *fmt _AND
+     _CONST char *__restrict fmt _AND
      va_list ap)
 {
   c99_vsnprintf_t args;
diff --git a/newlib/libc/machine/spu/vsprintf.c b/newlib/libc/machine/spu/vsprintf.c
index f69b9400c..0719d38f5 100644
--- a/newlib/libc/machine/spu/vsprintf.c
+++ b/newlib/libc/machine/spu/vsprintf.c
@@ -27,8 +27,8 @@ typedef struct
 
 int
 _DEFUN (vsprintf, (str, fmt, ap),
-     char *str _AND
-     _CONST char *fmt _AND
+     char *__restrict str _AND
+     _CONST char *__restrict fmt _AND
      va_list ap)
 {
   c99_vsprintf_t args;
diff --git a/newlib/libc/machine/spu/vsscanf.c b/newlib/libc/machine/spu/vsscanf.c
index bd76cfc9e..2f7380ff4 100644
--- a/newlib/libc/machine/spu/vsscanf.c
+++ b/newlib/libc/machine/spu/vsscanf.c
@@ -58,8 +58,8 @@ typedef struct
 
 int
 _DEFUN (vsscanf, (str, fmt, ap),
-    _CONST char *str _AND
-    _CONST char *fmt _AND
+    _CONST char *__restrict str _AND
+    _CONST char *__restrict fmt _AND
     va_list ap)
 {
   c99_vsscanf_t args;