mirror of
https://sourceware.org/git/glibc.git
synced 2025-07-29 11:41:21 +03:00
* include/stdio.h (__fxprintf): Remove wfmt argument.
* stdio-common/fxprintf.c: Include assert.h, ctype.h and wchar.h. (__fxprintf): Remove wfmt argument, create wfmt format string on the fly from fmt. * argp/argp-fmtstream.c: Adjust all __fxprintf callers. * argp/argp-help.c: Likewise. * assert/assert-perr.c: Likewise. * assert/assert.c: Likewise. * gmon/gmon.c: Likewise. * inet/rcmd.c: Likewise. * malloc/obstack.c: Likewise. * misc/error.c: Likewise. * misc/getpass.c: Likewise. * posix/getopt.c: Likewise. * resolv/res_hconf.c: Likewise. * stdio-common/perror.c: Likewise. * stdio-common/psignal.c: Likewise. * stdlib/fmtmsg.c: Likewise. * sunrpc/auth_unix.c: Likewise. * sunrpc/clnt_perr.c: Likewise. * sunrpc/clnt_tcp.c: Likewise. * sunrpc/clnt_udp.c: Likewise. * sunrpc/clnt_unix.c: Likewise. * sunrpc/svc_simple.c: Likewise. * sunrpc/svc_tcp.c: Likewise. * sunrpc/svc_udp.c: Likewise. * sunrpc/svc_unix.c: Likewise. * sunrpc/xdr.c: Likewise. * sunrpc/xdr_array.c: Likewise. * sunrpc/xdr_rec.c: Likewise. * sunrpc/xdr_ref.c: Likewise. * sysdeps/generic/wordexp.c: Likewise.
This commit is contained in:
10
misc/error.c
10
misc/error.c
@ -158,7 +158,7 @@ print_errno_message (int errnum)
|
||||
#endif
|
||||
|
||||
#if _LIBC
|
||||
__fxprintf (NULL, ": %s", L": %s", s);
|
||||
__fxprintf (NULL, ": %s", s);
|
||||
#else
|
||||
fprintf (stderr, ": %s", s);
|
||||
#endif
|
||||
@ -243,7 +243,7 @@ error_tail (int status, int errnum, const char *message, va_list args)
|
||||
if (errnum)
|
||||
print_errno_message (errnum);
|
||||
# if _LIBC
|
||||
__fxprintf (NULL, "\n", L"\n");
|
||||
__fxprintf (NULL, "\n");
|
||||
# else
|
||||
putc ('\n', stderr);
|
||||
# endif
|
||||
@ -291,7 +291,7 @@ error (status, errnum, message, va_alist)
|
||||
else
|
||||
{
|
||||
#if _LIBC
|
||||
__fxprintf (NULL, "%s: ", L"%s: ", program_name);
|
||||
__fxprintf (NULL, "%s: ", program_name);
|
||||
#else
|
||||
fprintf (stderr, "%s: ", program_name);
|
||||
#endif
|
||||
@ -374,7 +374,7 @@ error_at_line (status, errnum, file_name, line_number, message, va_alist)
|
||||
else
|
||||
{
|
||||
#if _LIBC
|
||||
__fxprintf (NULL, "%s:", L"%s: ", program_name);
|
||||
__fxprintf (NULL, "%s:", program_name);
|
||||
#else
|
||||
fprintf (stderr, "%s:", program_name);
|
||||
#endif
|
||||
@ -383,7 +383,7 @@ error_at_line (status, errnum, file_name, line_number, message, va_alist)
|
||||
if (file_name != NULL)
|
||||
{
|
||||
#if _LIBC
|
||||
__fxprintf (NULL, "%s:%d: ", L"%s:%d: ", file_name, line_number);
|
||||
__fxprintf (NULL, "%s:%d: ", file_name, line_number);
|
||||
#else
|
||||
fprintf (stderr, "%s:%d: ", file_name, line_number);
|
||||
#endif
|
||||
|
Reference in New Issue
Block a user