diff options
Diffstat (limited to 'newlib/libc/stdio')
-rw-r--r-- | newlib/libc/stdio/diprintf.c | 6 | ||||
-rw-r--r-- | newlib/libc/stdio/dprintf.c | 4 | ||||
-rw-r--r-- | newlib/libc/stdio/fflush.c | 2 | ||||
-rw-r--r-- | newlib/libc/stdio/fopencookie.c | 13 | ||||
-rw-r--r-- | newlib/libc/stdio/fread.c | 3 | ||||
-rw-r--r-- | newlib/libc/stdio/fsetpos.c | 2 | ||||
-rw-r--r-- | newlib/libc/stdio/getc_u.c | 2 | ||||
-rw-r--r-- | newlib/libc/stdio/getchar_u.c | 2 | ||||
-rw-r--r-- | newlib/libc/stdio/putc_u.c | 2 | ||||
-rw-r--r-- | newlib/libc/stdio/putchar_u.c | 2 | ||||
-rw-r--r-- | newlib/libc/stdio/remove.c | 2 | ||||
-rw-r--r-- | newlib/libc/stdio/siprintf.c | 44 | ||||
-rw-r--r-- | newlib/libc/stdio/siscanf.c | 22 | ||||
-rw-r--r-- | newlib/libc/stdio/sprintf.c | 44 | ||||
-rw-r--r-- | newlib/libc/stdio/sscanf.c | 22 | ||||
-rw-r--r-- | newlib/libc/stdio/vfprintf.c | 18 | ||||
-rw-r--r-- | newlib/libc/stdio/vfscanf.c | 6 | ||||
-rw-r--r-- | newlib/libc/stdio/viprintf.c | 18 | ||||
-rw-r--r-- | newlib/libc/stdio/viscanf.c | 6 |
19 files changed, 146 insertions, 74 deletions
diff --git a/newlib/libc/stdio/diprintf.c b/newlib/libc/stdio/diprintf.c index 171bf6414..e0a5595e1 100644 --- a/newlib/libc/stdio/diprintf.c +++ b/newlib/libc/stdio/diprintf.c @@ -10,7 +10,11 @@ FUNCTION INDEX diprintf INDEX + _diprintf_r +INDEX vdiprintf +INDEX + _vdiprintf_r ANSI_SYNOPSIS #include <stdio.h> @@ -19,7 +23,7 @@ ANSI_SYNOPSIS int vdiprintf(int <[fd]>, const char *<[format]>, va_list <[ap]>); int _diprintf_r(struct _reent *<[ptr]>, int <[fd]>, const char *<[format]>, ...); - int _vidprintf_r(struct _reent *<[ptr]>, int <[fd]>, + int _vdiprintf_r(struct _reent *<[ptr]>, int <[fd]>, const char *<[format]>, va_list <[ap]>); DESCRIPTION diff --git a/newlib/libc/stdio/dprintf.c b/newlib/libc/stdio/dprintf.c index b0eb19192..e2d8b36ca 100644 --- a/newlib/libc/stdio/dprintf.c +++ b/newlib/libc/stdio/dprintf.c @@ -10,7 +10,11 @@ FUNCTION INDEX dprintf INDEX + _dprintf_r +INDEX vdprintf +INDEX + _vdprintf_r ANSI_SYNOPSIS #include <stdio.h> diff --git a/newlib/libc/stdio/fflush.c b/newlib/libc/stdio/fflush.c index 33e2e7b26..218940dcf 100644 --- a/newlib/libc/stdio/fflush.c +++ b/newlib/libc/stdio/fflush.c @@ -21,6 +21,8 @@ FUNCTION INDEX fflush +INDEX + _fflush_r ANSI_SYNOPSIS #include <stdio.h> diff --git a/newlib/libc/stdio/fopencookie.c b/newlib/libc/stdio/fopencookie.c index 854bb49e9..5148c8a1a 100644 --- a/newlib/libc/stdio/fopencookie.c +++ b/newlib/libc/stdio/fopencookie.c @@ -12,6 +12,13 @@ INDEX ANSI_SYNOPSIS #include <stdio.h> + FILE *fopencookie(const void *<[cookie]>, const char *<[mode]>, + cookie_io_functions_t <[functions]>); + +DESCRIPTION +<<fopencookie>> creates a <<FILE>> stream where I/O is performed using +custom callbacks. The callbacks are registered via the structure: + typedef ssize_t (*cookie_read_function_t)(void *_cookie, char *_buf, size_t _n); typedef ssize_t (*cookie_write_function_t)(void *_cookie, @@ -19,12 +26,6 @@ ANSI_SYNOPSIS typedef int (*cookie_seek_function_t)(void *_cookie, off_t *_off, int _whence); typedef int (*cookie_close_function_t)(void *_cookie); - FILE *fopencookie(const void *<[cookie]>, const char *<[mode]>, - cookie_io_functions_t <[functions]>); - -DESCRIPTION -<<fopencookie>> creates a <<FILE>> stream where I/O is performed using -custom callbacks. The callbacks are registered via the structure: . typedef struct . { diff --git a/newlib/libc/stdio/fread.c b/newlib/libc/stdio/fread.c index 596952bec..8c0697c5c 100644 --- a/newlib/libc/stdio/fread.c +++ b/newlib/libc/stdio/fread.c @@ -31,8 +31,7 @@ ANSI_SYNOPSIS #include <stdio.h> size_t _fread_r(struct _reent *<[ptr]>, void *<[buf]>, - size_t <[size]>, size_t <[count]>, - FILE *<[fp]>); + size_t <[size]>, size_t <[count]>, FILE *<[fp]>); TRAD_SYNOPSIS #include <stdio.h> diff --git a/newlib/libc/stdio/fsetpos.c b/newlib/libc/stdio/fsetpos.c index e2dd39bc8..d1596293b 100644 --- a/newlib/libc/stdio/fsetpos.c +++ b/newlib/libc/stdio/fsetpos.c @@ -27,7 +27,7 @@ INDEX ANSI_SYNOPSIS #include <stdio.h> int fsetpos(FILE *<[fp]>, const fpos_t *<[pos]>); - int _fsetpos_r(struct _reent *<[ptr]>, FILE *<[fp]>, l + int _fsetpos_r(struct _reent *<[ptr]>, FILE *<[fp]>, const fpos_t *<[pos]>); TRAD_SYNOPSIS diff --git a/newlib/libc/stdio/getc_u.c b/newlib/libc/stdio/getc_u.c index 7d7adde60..6b71ce52d 100644 --- a/newlib/libc/stdio/getc_u.c +++ b/newlib/libc/stdio/getc_u.c @@ -24,7 +24,7 @@ INDEX INDEX _getc_unlocked_r -POSIX_SYNOPSIS +SYNOPSIS #include <stdio.h> int getc_unlocked(FILE *<[fp]>); diff --git a/newlib/libc/stdio/getchar_u.c b/newlib/libc/stdio/getchar_u.c index ce4014519..22254cbf5 100644 --- a/newlib/libc/stdio/getchar_u.c +++ b/newlib/libc/stdio/getchar_u.c @@ -24,7 +24,7 @@ INDEX INDEX _getchar_unlocked_r -POSIX_SYNOPSIS +SYNOPSIS #include <stdio.h> int getchar_unlocked(); diff --git a/newlib/libc/stdio/putc_u.c b/newlib/libc/stdio/putc_u.c index 9960654d7..f710aaf57 100644 --- a/newlib/libc/stdio/putc_u.c +++ b/newlib/libc/stdio/putc_u.c @@ -24,7 +24,7 @@ INDEX INDEX _putc_unlocked_r -POSIX_SYNOPSIS +SYNOPSIS #include <stdio.h> int putc_unlocked(int <[ch]>, FILE *<[fp]>); diff --git a/newlib/libc/stdio/putchar_u.c b/newlib/libc/stdio/putchar_u.c index 423ad77f1..a866c7799 100644 --- a/newlib/libc/stdio/putchar_u.c +++ b/newlib/libc/stdio/putchar_u.c @@ -22,7 +22,7 @@ FUNCTION INDEX putchar_unlocked -POSIX_SYNOPSIS +SYNOPSIS #include <stdio.h> int putchar_unlocked(int <[ch]>); diff --git a/newlib/libc/stdio/remove.c b/newlib/libc/stdio/remove.c index e026ce567..5a3e16be9 100644 --- a/newlib/libc/stdio/remove.c +++ b/newlib/libc/stdio/remove.c @@ -21,6 +21,8 @@ FUNCTION INDEX remove +INDEX + _remove_r ANSI_SYNOPSIS #include <stdio.h> diff --git a/newlib/libc/stdio/siprintf.c b/newlib/libc/stdio/siprintf.c index d6a0e1983..f0a80980c 100644 --- a/newlib/libc/stdio/siprintf.c +++ b/newlib/libc/stdio/siprintf.c @@ -22,41 +22,51 @@ FUNCTION INDEX fiprintf INDEX + _fiprintf_r +INDEX iprintf INDEX + _iprintf_r +INDEX siprintf INDEX + _siprintf_r +INDEX sniprintf INDEX + _sniprintf_r +INDEX asiprintf INDEX + _asiprintf_r +INDEX asniprintf +INDEX + _asniprintf_r ANSI_SYNOPSIS #include <stdio.h> - int iprintf(const char *<[format]> [, <[arg]>, ...]); - int fiprintf(FILE *<[fd]>, const char *<[format]> [, <[arg]>, ...]); - int siprintf(char *<[str]>, const char *<[format]> [, <[arg]>, ...]); - int sniprintf(char *<[str]>, size_t <[size]>, const char *<[format]> - [, <[arg]>, ...]); - int asiprintf(char **<[strp]>, const char *<[format]> [, <[arg]>, ...]); - char *asniprintf(char *<[str]>, size_t *<[size]>, const char *<[format]> - [, <[arg]>, ...]); - - int _iprintf_r(struct _reent *<[ptr]>, const char *<[format]> - [, <[arg]>, ...]); + int iprintf(const char *<[format]>, ...); + int fiprintf(FILE *<[fd]>, const char *<[format]> , ...); + int siprintf(char *<[str]>, const char *<[format]>, ...); + int sniprintf(char *<[str]>, size_t <[size]>, const char *<[format]>, + ...); + int asiprintf(char **<[strp]>, const char *<[format]>, ...); + char *asniprintf(char *<[str]>, size_t *<[size]>, + const char *<[format]>, ...); + + int _iprintf_r(struct _reent *<[ptr]>, const char *<[format]>, ...); int _fiprintf_r(struct _reent *<[ptr]>, FILE *<[fd]>, - const char *<[format]> [, <[arg]>, ...]); + const char *<[format]>, ...); int _siprintf_r(struct _reent *<[ptr]>, char *<[str]>, - const char *<[format]> [, <[arg]>, ...]); + const char *<[format]>, ...); int _sniprintf_r(struct _reent *<[ptr]>, char *<[str]>, size_t <[size]>, - const char *<[format]> [, <[arg]>, ...]); + const char *<[format]>, ...); int _asiprintf_r(struct _reent *<[ptr]>, char **<[strp]>, - const char *<[format]> [, <[arg]>, ...]); + const char *<[format]>, ...); char *_asniprintf_r(struct _reent *<[ptr]>, char *<[str]>, - size_t *<[size]>, const char *<[format]> - [, <[arg]>, ...]); + size_t *<[size]>, const char *<[format]>, ...); DESCRIPTION <<iprintf>>, <<fiprintf>>, <<siprintf>>, <<sniprintf>>, diff --git a/newlib/libc/stdio/siscanf.c b/newlib/libc/stdio/siscanf.c index a64e2a891..cbf434c39 100644 --- a/newlib/libc/stdio/siscanf.c +++ b/newlib/libc/stdio/siscanf.c @@ -22,24 +22,28 @@ FUNCTION INDEX iscanf INDEX + _iscanf_r +INDEX fiscanf INDEX + _fiscanf_r +INDEX siscanf +INDEX + _siscanf_r ANSI_SYNOPSIS #include <stdio.h> - int iscanf(const char *<[format]> [, <[arg]>, ...]); - int fiscanf(FILE *<[fd]>, const char *<[format]> [, <[arg]>, ...]); - int siscanf(const char *<[str]>, const char *<[format]> - [, <[arg]>, ...]); + int iscanf(const char *<[format]>, ...); + int fiscanf(FILE *<[fd]>, const char *<[format]>, ...); + int siscanf(const char *<[str]>, const char *<[format]>, ...); - int _iscanf_r(struct _reent *<[ptr]>, const char *<[format]> - [, <[arg]>, ...]); - int _fiscanf_r(struct _reent *<[ptr]>, FILE *<[fd]>, const char *<[format]> - [, <[arg]>, ...]); + int _iscanf_r(struct _reent *<[ptr]>, const char *<[format]>, ...); + int _fiscanf_r(struct _reent *<[ptr]>, FILE *<[fd]>, + const char *<[format]>, ...); int _siscanf_r(struct _reent *<[ptr]>, const char *<[str]>, - const char *<[format]> [, <[arg]>, ...]); + const char *<[format]>, ...); TRAD_SYNOPSIS diff --git a/newlib/libc/stdio/sprintf.c b/newlib/libc/stdio/sprintf.c index 48d811cf6..1d81ebdf9 100644 --- a/newlib/libc/stdio/sprintf.c +++ b/newlib/libc/stdio/sprintf.c @@ -22,41 +22,51 @@ FUNCTION INDEX fprintf INDEX + _fprintf_r +INDEX printf INDEX + _printf_r +INDEX asprintf INDEX + _asprintf_r +INDEX sprintf INDEX + _sprintf_r +INDEX snprintf INDEX + _snprintf_r +INDEX asnprintf +INDEX + _asnprintf_r ANSI_SYNOPSIS #include <stdio.h> - int printf(const char *<[format]> [, <[arg]>, ...]); - int fprintf(FILE *<[fd]>, const char *<[format]> [, <[arg]>, ...]); - int sprintf(char *<[str]>, const char *<[format]> [, <[arg]>, ...]); - int snprintf(char *<[str]>, size_t <[size]>, const char *<[format]> - [, <[arg]>, ...]); - int asprintf(char **<[strp]>, const char *<[format]> [, <[arg]>, ...]); - char *asnprintf(char *<[str]>, size_t *<[size]>, const char *<[format]> - [, <[arg]>, ...]); - - int _printf_r(struct _reent *<[ptr]>, const char *<[format]> - [, <[arg]>, ...]); + int printf(const char *<[format]>, ...); + int fprintf(FILE *<[fd]>, const char *<[format]>, ...); + int sprintf(char *<[str]>, const char *<[format]>, ...); + int snprintf(char *<[str]>, size_t <[size]>, const char *<[format]>, + ...); + int asprintf(char **<[strp]>, const char *<[format]>, ...); + char *asnprintf(char *<[str]>, size_t *<[size]>, const char *<[format]>, + ...); + + int _printf_r(struct _reent *<[ptr]>, const char *<[format]>, ...); int _fprintf_r(struct _reent *<[ptr]>, FILE *<[fd]>, - const char *<[format]> [, <[arg]>, ...]); + const char *<[format]>, ...); int _sprintf_r(struct _reent *<[ptr]>, char *<[str]>, - const char *<[format]> [, <[arg]>, ...]); + const char *<[format]>, ...); int _snprintf_r(struct _reent *<[ptr]>, char *<[str]>, size_t <[size]>, - const char *<[format]> [, <[arg]>, ...]); + const char *<[format]>, ...); int _asprintf_r(struct _reent *<[ptr]>, char **<[strp]>, - const char *<[format]> [, <[arg]>, ...]); + const char *<[format]>, ...); char *_asnprintf_r(struct _reent *<[ptr]>, char *<[str]>, - size_t *<[size]>, const char *<[format]> - [, <[arg]>, ...]); + size_t *<[size]>, const char *<[format]>, ...); DESCRIPTION <<printf>> accepts a series of arguments, applies to each a diff --git a/newlib/libc/stdio/sscanf.c b/newlib/libc/stdio/sscanf.c index b09390380..37cd7ca30 100644 --- a/newlib/libc/stdio/sscanf.c +++ b/newlib/libc/stdio/sscanf.c @@ -22,24 +22,28 @@ FUNCTION INDEX scanf INDEX + _scanf_r +INDEX fscanf INDEX + _fscanf_r +INDEX sscanf +INDEX + _sscanf_r ANSI_SYNOPSIS #include <stdio.h> - int scanf(const char *<[format]> [, <[arg]>, ...]); - int fscanf(FILE *<[fd]>, const char *<[format]> [, <[arg]>, ...]); - int sscanf(const char *<[str]>, const char *<[format]> - [, <[arg]>, ...]); + int scanf(const char *<[format]>, ...); + int fscanf(FILE *<[fd]>, const char *<[format]>, ...); + int sscanf(const char *<[str]>, const char *<[format]>, ...); - int _scanf_r(struct _reent *<[ptr]>, const char *<[format]> - [, <[arg]>, ...]); - int _fscanf_r(struct _reent *<[ptr]>, FILE *<[fd]>, const char *<[format]> - [, <[arg]>, ...]); + int _scanf_r(struct _reent *<[ptr]>, const char *<[format]>, ...); + int _fscanf_r(struct _reent *<[ptr]>, FILE *<[fd]>, + const char *<[format]>, ...); int _sscanf_r(struct _reent *<[ptr]>, const char *<[str]>, - const char *<[format]> [, <[arg]>, ...]); + const char *<[format]>, ...); TRAD_SYNOPSIS diff --git a/newlib/libc/stdio/vfprintf.c b/newlib/libc/stdio/vfprintf.c index 1846d7c1e..32fc202d5 100644 --- a/newlib/libc/stdio/vfprintf.c +++ b/newlib/libc/stdio/vfprintf.c @@ -41,15 +41,27 @@ FUNCTION INDEX vfprintf INDEX + _vfprintf_r +INDEX vprintf INDEX + _vprintf_r +INDEX vsprintf INDEX + _vsprintf_r +INDEX vsnprintf INDEX + _vsnprintf_r +INDEX vasprintf INDEX + _vasprintf_r +INDEX vasnprintf +INDEX + _vasnprintf_r ANSI_SYNOPSIS #include <stdio.h> @@ -72,11 +84,9 @@ ANSI_SYNOPSIS int _vasprintf_r(struct _reent *<[reent]>, char **<[str]>, const char *<[fmt]>, va_list <[list]>); int _vsnprintf_r(struct _reent *<[reent]>, char *<[str]>, - size_t <[size]>, const char *<[fmt]>, - va_list <[list]>); + size_t <[size]>, const char *<[fmt]>, va_list <[list]>); char *_vasnprintf_r(struct _reent *<[reent]>, char *<[str]>, - size_t *<[size]>, const char *<[fmt]>, - va_list <[list]>); + size_t *<[size]>, const char *<[fmt]>, va_list <[list]>); DESCRIPTION <<vprintf>>, <<vfprintf>>, <<vasprintf>>, <<vsprintf>>, <<vsnprintf>>, diff --git a/newlib/libc/stdio/vfscanf.c b/newlib/libc/stdio/vfscanf.c index 0e6922543..39c5a0a99 100644 --- a/newlib/libc/stdio/vfscanf.c +++ b/newlib/libc/stdio/vfscanf.c @@ -22,9 +22,15 @@ FUNCTION INDEX vfscanf INDEX + _vfscanf_r +INDEX vscanf INDEX + _vscanf_r +INDEX vsscanf +INDEX + _vsscanf_r ANSI_SYNOPSIS #include <stdio.h> diff --git a/newlib/libc/stdio/viprintf.c b/newlib/libc/stdio/viprintf.c index f5c27c89c..3717f3a08 100644 --- a/newlib/libc/stdio/viprintf.c +++ b/newlib/libc/stdio/viprintf.c @@ -22,15 +22,27 @@ FUNCTION INDEX viprintf INDEX + _viprintf_r +INDEX vfiprintf INDEX + _vfiprintf_r +INDEX vsiprintf INDEX + _vsiprintf_r +INDEX vsniprintf INDEX + _vsniprintf_r +INDEX vasiprintf INDEX + _vasiprintf_r +INDEX vasniprintf +INDEX + _vasniprintf_r ANSI_SYNOPSIS #include <stdio.h> @@ -51,13 +63,11 @@ ANSI_SYNOPSIS int _vsiprintf_r(struct _reent *<[reent]>, char *<[str]>, const char *<[fmt]>, va_list <[list]>); int _vsniprintf_r(struct _reent *<[reent]>, char *<[str]>, - size_t <[size]>, const char *<[fmt]>, - va_list <[list]>); + size_t <[size]>, const char *<[fmt]>, va_list <[list]>); int _vasiprintf_r(struct _reent *<[reent]>, char **<[str]>, const char *<[fmt]>, va_list <[list]>); char *_vasniprintf_r(struct _reent *<[reent]>, char *<[str]>, - size_t *<[size]>, const char *<[fmt]>, - va_list <[list]>); + size_t *<[size]>, const char *<[fmt]>, va_list <[list]>); DESCRIPTION <<viprintf>>, <<vfiprintf>>, <<vasiprintf>>, <<vsiprintf>>, diff --git a/newlib/libc/stdio/viscanf.c b/newlib/libc/stdio/viscanf.c index f335f69ff..a60c32ff0 100644 --- a/newlib/libc/stdio/viscanf.c +++ b/newlib/libc/stdio/viscanf.c @@ -24,9 +24,15 @@ FUNCTION INDEX viscanf INDEX + _viscanf_r +INDEX vfiscanf INDEX + _vfiscanf_r +INDEX vsiscanf +INDEX + _vsiscanf_r ANSI_SYNOPSIS #include <stdio.h> |