diff options
Diffstat (limited to 'stdio-common')
| -rw-r--r-- | stdio-common/printf-parse.h | 2 | ||||
| -rw-r--r-- | stdio-common/printf-prs.c | 4 | ||||
| -rw-r--r-- | stdio-common/printf_fp.c | 4 | ||||
| -rw-r--r-- | stdio-common/vfprintf.c | 5 | ||||
| -rw-r--r-- | stdio-common/vfscanf.c | 13 |
5 files changed, 15 insertions, 13 deletions
diff --git a/stdio-common/printf-parse.h b/stdio-common/printf-parse.h index 45bcc3a9bb..1f2878a5fc 100644 --- a/stdio-common/printf-parse.h +++ b/stdio-common/printf-parse.h @@ -106,7 +106,7 @@ find_spec (const UCHAR_T *format, mbstate_t *ps) /* Remove any hints of a wrong encoding. */ ps->__count = 0; - if (! isascii (*format) && (len = mbrlen (format, MB_CUR_MAX, ps)) > 0) + if (! isascii (*format) && (len = __mbrlen (format, MB_CUR_MAX, ps)) > 0) format += len; else ++format; diff --git a/stdio-common/printf-prs.c b/stdio-common/printf-prs.c index 19869cad19..c41b60e997 100644 --- a/stdio-common/printf-prs.c +++ b/stdio-common/printf-prs.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991, 1992, 1995, 1996, 1999 Free Software Foundation, Inc. +/* Copyright (C) 1991,1992,1995,1996,1999,2000 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -30,7 +30,7 @@ # define L_(Str) Str # define ISDIGIT(Ch) isdigit (Ch) # define ISASCII(Ch) isascii (Ch) -# define MBRLEN(Cp, L, St) mbrlen (Cp, L, St) +# define MBRLEN(Cp, L, St) __mbrlen (Cp, L, St) # ifdef USE_IN_LIBIO # define PUT(F, S, N) _IO_sputn (F, S, N) diff --git a/stdio-common/printf_fp.c b/stdio-common/printf_fp.c index 47052d7797..557a02224b 100644 --- a/stdio-common/printf_fp.c +++ b/stdio-common/printf_fp.c @@ -1186,8 +1186,8 @@ group_number (wchar_t *buf, wchar_t *bufend, unsigned int intdig_no, return bufend; /* Move the fractional part down. */ - wmemmove (buf + intdig_no + ngroups, buf + intdig_no, - bufend - (buf + intdig_no)); + __wmemmove (buf + intdig_no + ngroups, buf + intdig_no, + bufend - (buf + intdig_no)); p = buf + intdig_no + ngroups - 1; do diff --git a/stdio-common/vfprintf.c b/stdio-common/vfprintf.c index 216ab291fa..3f13026e14 100644 --- a/stdio-common/vfprintf.c +++ b/stdio-common/vfprintf.c @@ -969,9 +969,10 @@ vfprintf (FILE *s, const CHAR_T *format, va_list ap) if (!left) \ PAD (L' '); \ if (fspec == NULL) \ - outchar (btowc ((unsigned char) va_arg (ap, int))); /* Promoted. */ \ + outchar (__btowc ((unsigned char) va_arg (ap, int))); /* Promoted. */ \ else \ - outchar (btowc ((unsigned char) args_value[fspec->data_arg].pa_char));\ + outchar (__btowc ((unsigned char) \ + args_value[fspec->data_arg].pa_char)); \ if (left) \ PAD (L' '); \ break; \ 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) { |