mirror of
https://sourceware.org/git/glibc.git
synced 2025-08-08 17:42:12 +03:00
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.
This commit is contained in:
@@ -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;
|
||||
|
@@ -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)
|
||||
|
@@ -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
|
||||
|
@@ -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; \
|
||||
|
@@ -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)
|
||||
{
|
||||
|
Reference in New Issue
Block a user