aboutsummaryrefslogtreecommitdiff
path: root/stdio-common/vfscanf.c
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2000-08-21 04:18:25 +0000
committerUlrich Drepper <drepper@redhat.com>2000-08-21 04:18:25 +0000
commit4aebaa6bd906383aca1b7a5e1251b0d1652f9f7c (patch)
tree046f117d02a6ce4b2dd47c26270592f9ce9be5e0 /stdio-common/vfscanf.c
parenta785f6c56e7be1b07ee099ee3982e84d8b538ef4 (diff)
downloadglibc-4aebaa6bd906383aca1b7a5e1251b0d1652f9f7c.tar
glibc-4aebaa6bd906383aca1b7a5e1251b0d1652f9f7c.tar.gz
glibc-4aebaa6bd906383aca1b7a5e1251b0d1652f9f7c.tar.bz2
glibc-4aebaa6bd906383aca1b7a5e1251b0d1652f9f7c.zip
Update.
* argp/argp-help.c: Unify use of function aliases to make more compact PLT. * include/libintl.h: Likewise. * inet/rcmd.c: Likewise. * intl/dcigettext.c: Likewise. * libio/iofputws.c: Likewise. * libio/iofputws_u.c: Likewise. * libio/iogetwline.c: Likewise. * libio/swprintf.c: Likewise. * malloc/malloc.c: Likewise. * nss/digits_dots.c: Likewise. * posix/fnmatch.c: Likewise. * posix/spawn_faction_addclose.c: Likewise. * posix/spawn_faction_adddup2.c: Likewise. * posix/spawn_faction_addopen.c: Likewise. * posix/spawni.c: Likewise. * posix/wordexp.c: Likewise. * posix/spawni.c: Likewise. * resolv/res_hconf.c: Likewise. * resolv/res_init.c: Likewise. * shadow/lckpwdf.c: Likewise. * signal/sighold.c: Likewise. * signal/sigrelse.c: Likewise. * stdio-common/printf-parse.h: Likewise. * stdio-common/printf-prs.c: Likewise. * stdio-common/printf_fp.c: Likewise. * stdio-common/vfprintf.c: Likewise. * stdio-common/vfscanf.c: Likewise. * stdlib/rpmatch.c: Likewise. * sunrpc/create_xid.c: Likewise. * sunrpc/key_call.c: Likewise. * sysdeps/generic/setrlimit64.c: Likewise. * sysdeps/generic/utmp_file.c: Likewise. * sysdeps/generic/vlimit.c: Likewise. * sysdeps/posix/posix_fallocate.c: Likewise. * sysdeps/posix/posix_fallocate64.c: Likewise. * sysdeps/posix/sigpause.c: Likewise. * sysdeps/posix/sigset.c: Likewise. * sysdeps/unix/grantpt.c: Likewise. * sysdeps/unix/bsd/ualarm.c: Likewise. * sysdeps/unix/sysv/linux/dl-origin.c: Likewise. * sysdeps/unix/sysv/linux/getloadavg.c: Likewise. * sysdeps/unix/sysv/linux/ttyname.c: Likewise. * sysdeps/unix/sysv/linux/ulimit.c: Likewise. * time/strftime.c: Likewise. * wcsmbs/wcscoll.c: Likewise. * wcsmbs/wcsxfrm.c: Likewise. * sysdeps/powerpc/fpu_control.h (_FPU_GETCW): Allow gcc to generate postinc/predec instruction.
Diffstat (limited to 'stdio-common/vfscanf.c')
-rw-r--r--stdio-common/vfscanf.c13
1 files changed, 7 insertions, 6 deletions
diff --git a/stdio-common/vfscanf.c b/stdio-common/vfscanf.c
index d618851a89..0731c5656e 100644
--- a/stdio-common/vfscanf.c
+++ b/stdio-common/vfscanf.c
@@ -80,7 +80,7 @@
: ((c = _IO_getwc_unlocked (s)), \
(void) (c != WEOF && ++read_in), c))
-# define MEMCPY(d, s, n) wmemcpy (d, s, n)
+# define MEMCPY(d, s, n) __wmemcpy (d, s, n)
# define ISSPACE(Ch) iswspace (Ch)
# define ISDIGIT(Ch) iswdigit (Ch)
# define ISXDIGIT(Ch) iswxdigit (Ch)
@@ -696,7 +696,7 @@ __vfscanf (FILE *s, const char *format, va_list argptr)
{
size_t n;
- n = wcrtomb (!(flags & SUPPRESS) ? str : NULL, c, &state);
+ n = __wcrtomb (!(flags & SUPPRESS) ? str : NULL, c, &state);
if (n == (size_t) -1)
/* No valid wide character. */
input_error ();
@@ -883,7 +883,8 @@ __vfscanf (FILE *s, const char *format, va_list argptr)
}
}
- n = wcrtomb (!(flags & SUPPRESS) ? str : NULL, c, &state);
+ n = __wcrtomb (!(flags & SUPPRESS) ? str : NULL, c,
+ &state);
if (n == (size_t) -1)
encode_error ();
@@ -939,7 +940,7 @@ __vfscanf (FILE *s, const char *format, va_list argptr)
/* We have to emit the code to get into the intial
state. */
char buf[MB_LEN_MAX];
- size_t n = wcrtomb (buf, L'\0', &state);
+ size_t n = __wcrtomb (buf, L'\0', &state);
if (n > 0 && (flags & MALLOC)
&& str + n >= *strptr + strsize)
{
@@ -2251,7 +2252,7 @@ __vfscanf (FILE *s, const char *format, va_list argptr)
}
}
- n = wcrtomb (!(flags & SUPPRESS) ? str : NULL, c, &state);
+ n = __wcrtomb (!(flags & SUPPRESS) ? str : NULL, c, &state);
if (n == (size_t) -1)
encode_error ();
@@ -2324,7 +2325,7 @@ __vfscanf (FILE *s, const char *format, va_list argptr)
/* We have to emit the code to get into the intial
state. */
char buf[MB_LEN_MAX];
- size_t n = wcrtomb (buf, L'\0', &state);
+ size_t n = __wcrtomb (buf, L'\0', &state);
if (n > 0 && (flags & MALLOC)
&& str + n >= *strptr + strsize)
{