diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2005-07-20 17:51:14 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2005-07-20 17:51:14 +0000 |
| commit | 8a259a2310d269a86c603262e8f2c5f69f2a9c9d (patch) | |
| tree | e2718944bb69323ba381e1d80160e490e7b8167c /misc | |
| parent | df6f89692fd7e802f38f944ed73942354a9911f8 (diff) | |
| download | glibc-8a259a2310d269a86c603262e8f2c5f69f2a9c9d.tar.gz glibc-8a259a2310d269a86c603262e8f2c5f69f2a9c9d.tar.xz glibc-8a259a2310d269a86c603262e8f2c5f69f2a9c9d.zip | |
* 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.
Diffstat (limited to 'misc')
| -rw-r--r-- | misc/error.c | 10 | ||||
| -rw-r--r-- | misc/getpass.c | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/misc/error.c b/misc/error.c index 5f00ae97de..29060e94de 100644 --- a/misc/error.c +++ b/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 diff --git a/misc/getpass.c b/misc/getpass.c index a6e568ac08..5290c3c7d3 100644 --- a/misc/getpass.c +++ b/misc/getpass.c @@ -91,7 +91,7 @@ getpass (prompt) tty_changed = 0; /* Write the prompt. */ - __fxprintf (out, "%s", L"%s", prompt); + __fxprintf (out, "%s", prompt); fflush_unlocked (out); /* Read the password. */ @@ -106,7 +106,7 @@ getpass (prompt) buf[nread - 1] = '\0'; if (tty_changed) /* Write the newline that was not echoed. */ - __fxprintf (out, "%c", L"%c", '\n'); + __fxprintf (out, "\n"); } } |