diff options
Diffstat (limited to 'newlib/libc/stdio')
| -rw-r--r-- | newlib/libc/stdio/asniprintf.c | 1 | ||||
| -rw-r--r-- | newlib/libc/stdio/fread.c | 2 | ||||
| -rw-r--r-- | newlib/libc/stdio/local.h | 1 | ||||
| -rw-r--r-- | newlib/libc/stdio/open_memstream.c | 1 | ||||
| -rw-r--r-- | newlib/libc/stdio/vasniprintf.c | 1 | ||||
| -rw-r--r-- | newlib/libc/stdio/vfscanf.c | 11 |
6 files changed, 9 insertions, 8 deletions
diff --git a/newlib/libc/stdio/asniprintf.c b/newlib/libc/stdio/asniprintf.c index d4ff901e8..16ccfde63 100644 --- a/newlib/libc/stdio/asniprintf.c +++ b/newlib/libc/stdio/asniprintf.c @@ -11,6 +11,7 @@ #include <stdarg.h> #include <limits.h> #include <errno.h> +#include "local.h" char * _DEFUN(_asniprintf_r, (ptr, buf, lenp, fmt), diff --git a/newlib/libc/stdio/fread.c b/newlib/libc/stdio/fread.c index 15b48bb8b..8919554b9 100644 --- a/newlib/libc/stdio/fread.c +++ b/newlib/libc/stdio/fread.c @@ -87,7 +87,7 @@ _DEFUN(crlf_r, (ptr, fp, buf, count, eof), size_t count _AND int eof) { - int newcount = 0, r; + int r; char *s, *d, *e; if (count == 0) diff --git a/newlib/libc/stdio/local.h b/newlib/libc/stdio/local.h index 8b1516f01..29e7cc6c1 100644 --- a/newlib/libc/stdio/local.h +++ b/newlib/libc/stdio/local.h @@ -33,6 +33,7 @@ #endif +extern u_char *_EXFUN(__sccl, (char *, u_char *fmt)); extern int _EXFUN(__svfscanf_r,(struct _reent *,FILE *, _CONST char *,va_list)); extern int _EXFUN(__ssvfscanf_r,(struct _reent *,FILE *, _CONST char *,va_list)); extern int _EXFUN(__svfiscanf_r,(struct _reent *,FILE *, _CONST char *,va_list)); diff --git a/newlib/libc/stdio/open_memstream.c b/newlib/libc/stdio/open_memstream.c index 6a0680fbd..27ff5be9a 100644 --- a/newlib/libc/stdio/open_memstream.c +++ b/newlib/libc/stdio/open_memstream.c @@ -254,7 +254,6 @@ _DEFUN(_open_memstream_r, (ptr, buf, size), { FILE *fp; memstream *c; - int flags; if (!buf || !size) { diff --git a/newlib/libc/stdio/vasniprintf.c b/newlib/libc/stdio/vasniprintf.c index bf9b7c5eb..56db45ec0 100644 --- a/newlib/libc/stdio/vasniprintf.c +++ b/newlib/libc/stdio/vasniprintf.c @@ -11,6 +11,7 @@ #include <stdarg.h> #include <limits.h> #include <errno.h> +#include "local.h" char * _DEFUN(_vasniprintf_r, (ptr, buf, lenp, fmt, ap), diff --git a/newlib/libc/stdio/vfscanf.c b/newlib/libc/stdio/vfscanf.c index cad50988f..98c3db696 100644 --- a/newlib/libc/stdio/vfscanf.c +++ b/newlib/libc/stdio/vfscanf.c @@ -250,8 +250,6 @@ static void * get_arg (int, va_list *, int *, void **); typedef unsigned long long u_long_long; #endif -/*static*/ u_char *__sccl (); - /* * vfscanf */ @@ -452,7 +450,8 @@ _DEFUN(__SVFSCANF_R, (rptr, fp, fmt0, ap), size_t mbslen; /* length of converted multibyte sequence */ mbstate_t state; /* value to keep track of multibyte state */ - u_long (*ccfn) () = 0; /* conversion function (strtol/strtoul) */ + #define CCFN_PARAMS _PARAMS((struct _reent *, const char *, char **, int)) + u_long (*ccfn)CCFN_PARAMS=0; /* conversion function (strtol/strtoul) */ char ccltab[256]; /* character class table for %[...] */ char buf[BUF]; /* buffer for numeric conversions */ char *lptr; /* literal pointer */ @@ -658,13 +657,13 @@ _DEFUN(__SVFSCANF_R, (rptr, fp, fmt0, ap), /* FALLTHROUGH */ case 'd': c = CT_INT; - ccfn = (u_long (*)())_strtol_r; + ccfn = (u_long (*)CCFN_PARAMS)_strtol_r; base = 10; break; case 'i': c = CT_INT; - ccfn = (u_long (*)())_strtol_r; + ccfn = (u_long (*)CCFN_PARAMS)_strtol_r; base = 0; break; @@ -786,7 +785,7 @@ _DEFUN(__SVFSCANF_R, (rptr, fp, fmt0, ap), if (isupper (c)) flags |= LONG; c = CT_INT; - ccfn = (u_long (*)())_strtol_r; + ccfn = (u_long (*)CCFN_PARAMS)_strtol_r; base = 10; break; } |