aboutsummaryrefslogtreecommitdiff
path: root/argp
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2005-07-20 17:51:14 +0000
committerUlrich Drepper <drepper@redhat.com>2005-07-20 17:51:14 +0000
commit8a259a2310d269a86c603262e8f2c5f69f2a9c9d (patch)
treee2718944bb69323ba381e1d80160e490e7b8167c /argp
parentdf6f89692fd7e802f38f944ed73942354a9911f8 (diff)
downloadglibc-8a259a2310d269a86c603262e8f2c5f69f2a9c9d.tar
glibc-8a259a2310d269a86c603262e8f2c5f69f2a9c9d.tar.gz
glibc-8a259a2310d269a86c603262e8f2c5f69f2a9c9d.tar.bz2
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 'argp')
-rw-r--r--argp/argp-fmtstream.c8
-rw-r--r--argp/argp-help.c8
2 files changed, 7 insertions, 9 deletions
diff --git a/argp/argp-fmtstream.c b/argp/argp-fmtstream.c
index efa8388a84..1004e6762a 100644
--- a/argp/argp-fmtstream.c
+++ b/argp/argp-fmtstream.c
@@ -102,8 +102,7 @@ __argp_fmtstream_free (argp_fmtstream_t fs)
if (fs->p > fs->buf)
{
#ifdef USE_IN_LIBIO
- __fxprintf (fs->stream, "%.*s", L"%.*s",
- (int) (fs->p - fs->buf), fs->buf);
+ __fxprintf (fs->stream, "%.*s", (int) (fs->p - fs->buf), fs->buf);
#else
fwrite_unlocked (fs->buf, 1, fs->p - fs->buf, fs->stream);
#endif
@@ -292,7 +291,7 @@ __argp_fmtstream_update (argp_fmtstream_t fs)
/* Output the first line so we can use the space. */
{
#ifdef _LIBC
- __fxprintf (fs->stream, "%.*s\n", L"%.*s\n",
+ __fxprintf (fs->stream, "%.*s\n",
(int) (nl - fs->buf), fs->buf);
#else
if (nl > fs->buf)
@@ -359,8 +358,7 @@ __argp_fmtstream_ensure (struct argp_fmtstream *fs, size_t amount)
__argp_fmtstream_update (fs);
#ifdef _LIBC
- __fxprintf (fs->stream, "%.*s", L"%.*s",
- (int) (fs->p - fs->buf), fs->buf);
+ __fxprintf (fs->stream, "%.*s", (int) (fs->p - fs->buf), fs->buf);
wrote = fs->p - fs->buf;
#else
wrote = fwrite_unlocked (fs->buf, 1, fs->p - fs->buf, fs->stream);
diff --git a/argp/argp-help.c b/argp/argp-help.c
index c5a9e84f7e..ee61ed4d5c 100644
--- a/argp/argp-help.c
+++ b/argp/argp-help.c
@@ -1769,7 +1769,7 @@ __argp_error (const struct argp_state *state, const char *fmt, ...)
if (__asprintf (&buf, fmt, ap) < 0)
buf = NULL;
- __fxprintf (stream, "%s: %s\n", L"%s: %s\n",
+ __fxprintf (stream, "%s: %s\n",
state ? state->name : __argp_short_program_name (), buf);
free (buf);
@@ -1821,7 +1821,7 @@ __argp_failure (const struct argp_state *state, int status, int errnum,
#endif
#ifdef _LIBC
- __fxprintf (stream, "%s", L"%s",
+ __fxprintf (stream, "%s",
state ? state->name : __argp_short_program_name ());
#else
fputs_unlocked (state ? state->name : __argp_short_program_name (),
@@ -1839,7 +1839,7 @@ __argp_failure (const struct argp_state *state, int status, int errnum,
if (__asprintf (&buf, fmt, ap) < 0)
buf = NULL;
- __fxprintf (stream, ": %s", L": %s", buf);
+ __fxprintf (stream, ": %s", buf);
free (buf);
#else
@@ -1857,7 +1857,7 @@ __argp_failure (const struct argp_state *state, int status, int errnum,
char buf[200];
#ifdef _LIBC
- __fxprintf (stream, ": %s", L": %s",
+ __fxprintf (stream, ": %s",
__strerror_r (errnum, buf, sizeof (buf)));
#else
putc_unlocked (':', stream);