diff options
| author | "Steven J. Hill" <sjhill@realitydiluted.com> | 2005-11-18 03:14:53 +0000 |
|---|---|---|
| committer | "Steven J. Hill" <sjhill@realitydiluted.com> | 2005-11-18 03:14:53 +0000 |
| commit | f87c7bd4133a2b3ad9b45c32fab33d167a348c4b (patch) | |
| tree | 7259957b97704c375b3d8ab42f8da3d52665845e /libc/stdio/scanf.c | |
| parent | 164a928b77f596b6617a4bbf43a2c06bc35a5602 (diff) | |
| download | uClibc-alpine-f87c7bd4133a2b3ad9b45c32fab33d167a348c4b.tar.bz2 uClibc-alpine-f87c7bd4133a2b3ad9b45c32fab33d167a348c4b.tar.xz | |
Massive merge from trunk.
Diffstat (limited to 'libc/stdio/scanf.c')
| -rw-r--r-- | libc/stdio/scanf.c | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/libc/stdio/scanf.c b/libc/stdio/scanf.c index feaec3b44..d99896893 100644 --- a/libc/stdio/scanf.c +++ b/libc/stdio/scanf.c @@ -46,7 +46,6 @@ #define _ISOC99_SOURCE /* for LLONG_MAX primarily... */ #define _GNU_SOURCE -#define _STDIO_UTILITY #include <features.h> #include "_stdio.h" #include <stdlib.h> @@ -661,16 +660,16 @@ typedef struct { /**********************************************************************/ extern void __init_scan_cookie(register struct scan_cookie *sc, - register FILE *fp); -extern int __scan_getc(register struct scan_cookie *sc); -extern void __scan_ungetc(register struct scan_cookie *sc); + register FILE *fp) attribute_hidden; +extern int __scan_getc(register struct scan_cookie *sc) attribute_hidden; +extern void __scan_ungetc(register struct scan_cookie *sc) attribute_hidden; #ifdef __UCLIBC_HAS_FLOATS__ extern int __scan_strtold(long double *ld, struct scan_cookie *sc); #endif /* __UCLIBC_HAS_FLOATS__ */ -extern int __psfs_parse_spec(psfs_t *psfs); -extern int __psfs_do_numeric(psfs_t *psfs, struct scan_cookie *sc); +extern int __psfs_parse_spec(psfs_t *psfs) attribute_hidden; +extern int __psfs_do_numeric(psfs_t *psfs, struct scan_cookie *sc) attribute_hidden; /**********************************************************************/ #ifdef L___scan_cookie @@ -682,7 +681,7 @@ extern int __psfs_do_numeric(psfs_t *psfs, struct scan_cookie *sc); static const char decpt_str[] = "."; #endif -void __init_scan_cookie(register struct scan_cookie *sc, +void attribute_hidden __init_scan_cookie(register struct scan_cookie *sc, register FILE *fp) { sc->fp = fp; @@ -723,7 +722,7 @@ void __init_scan_cookie(register struct scan_cookie *sc, } -int __scan_getc(register struct scan_cookie *sc) +int attribute_hidden __scan_getc(register struct scan_cookie *sc) { int c; @@ -771,7 +770,7 @@ int __scan_getc(register struct scan_cookie *sc) return sc->cc = sc->ungot_char; } -void __scan_ungetc(register struct scan_cookie *sc) +void attribute_hidden __scan_ungetc(register struct scan_cookie *sc) { ++sc->width; if (sc->ungot_flag == 2) { /* last was EOF */ @@ -797,7 +796,7 @@ static const unsigned char qual_chars[] = QUAL_CHARS; static const unsigned char spec_ranges[] = SPEC_RANGES; static const unsigned short spec_allowed[] = SPEC_ALLOWED_FLAGS; -int __psfs_parse_spec(register psfs_t *psfs) +int attribute_hidden __psfs_parse_spec(register psfs_t *psfs) { const unsigned char *p; const unsigned char *fmt0 = psfs->fmt; @@ -1756,7 +1755,7 @@ int VFSCANF (FILE *__restrict fp, const Wchar *__restrict format, va_list arg) static const unsigned char spec_base[] = SPEC_BASE; static const unsigned char nil_string[] = "(nil)"; -int __psfs_do_numeric(psfs_t *psfs, struct scan_cookie *sc) +int attribute_hidden __psfs_do_numeric(psfs_t *psfs, struct scan_cookie *sc) { unsigned char *b; const unsigned char *p; |