From 8a259a2310d269a86c603262e8f2c5f69f2a9c9d Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Wed, 20 Jul 2005 17:51:14 +0000 Subject: * 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. --- sunrpc/auth_unix.c | 3 +-- sunrpc/clnt_perr.c | 6 +++--- sunrpc/clnt_tcp.c | 3 +-- sunrpc/clnt_udp.c | 3 +-- sunrpc/clnt_unix.c | 3 +-- sunrpc/svc_simple.c | 4 ++-- sunrpc/svc_tcp.c | 5 ++--- sunrpc/svc_udp.c | 7 +++---- sunrpc/svc_unix.c | 4 ++-- sunrpc/xdr.c | 6 ++---- sunrpc/xdr_array.c | 3 +-- sunrpc/xdr_rec.c | 3 +-- sunrpc/xdr_ref.c | 2 +- 13 files changed, 21 insertions(+), 31 deletions(-) (limited to 'sunrpc') diff --git a/sunrpc/auth_unix.c b/sunrpc/auth_unix.c index f4ee1b75e4..c5a874bbbe 100644 --- a/sunrpc/auth_unix.c +++ b/sunrpc/auth_unix.c @@ -111,8 +111,7 @@ authunix_create (char *machname, uid_t uid, gid_t gid, int len, if (auth == NULL || au == NULL) { no_memory: - (void) __fxprintf (NULL, "%s", L"%s", - _("authunix_create: out of memory\n")); + (void) __fxprintf (NULL, "%s", _("authunix_create: out of memory\n")); mem_free (auth, sizeof (*auth)); mem_free (au, sizeof (*au)); return NULL; diff --git a/sunrpc/clnt_perr.c b/sunrpc/clnt_perr.c index 7fe498f5c5..6446b32740 100644 --- a/sunrpc/clnt_perr.c +++ b/sunrpc/clnt_perr.c @@ -155,7 +155,7 @@ libc_hidden_def (clnt_sperror) void clnt_perror (CLIENT * rpch, const char *msg) { - (void) __fxprintf (NULL, "%s", L"%s", clnt_sperror (rpch, msg)); + (void) __fxprintf (NULL, "%s", clnt_sperror (rpch, msg)); } libc_hidden_def (clnt_perror) @@ -284,7 +284,7 @@ libc_hidden_def (clnt_sperrno) void clnt_perrno (enum clnt_stat num) { - (void) __fxprintf (NULL, "%s", L"%s", clnt_sperrno (num)); + (void) __fxprintf (NULL, "%s", clnt_sperrno (num)); } @@ -327,7 +327,7 @@ libc_hidden_def (clnt_spcreateerror) void clnt_pcreateerror (const char *msg) { - (void) __fxprintf (NULL, "%s", L"%s", clnt_spcreateerror (msg)); + (void) __fxprintf (NULL, "%s", clnt_spcreateerror (msg)); } struct auth_errtab diff --git a/sunrpc/clnt_tcp.c b/sunrpc/clnt_tcp.c index f9a64f5de1..095baa87aa 100644 --- a/sunrpc/clnt_tcp.c +++ b/sunrpc/clnt_tcp.c @@ -128,8 +128,7 @@ clnttcp_create (struct sockaddr_in *raddr, u_long prog, u_long vers, if (h == NULL || ct == NULL) { struct rpc_createerr *ce = &get_rpc_createerr (); - (void) __fxprintf (NULL, "%s", L"%s", - _("clnttcp_create: out of memory\n")); + (void) __fxprintf (NULL, "%s", _("clnttcp_create: out of memory\n")); ce->cf_stat = RPC_SYSTEMERROR; ce->cf_error.re_errno = ENOMEM; goto fooy; diff --git a/sunrpc/clnt_udp.c b/sunrpc/clnt_udp.c index fa30a6cb93..f4a46b5036 100644 --- a/sunrpc/clnt_udp.c +++ b/sunrpc/clnt_udp.c @@ -136,8 +136,7 @@ clntudp_bufcreate (struct sockaddr_in *raddr, u_long program, u_long version, if (cl == NULL || cu == NULL) { struct rpc_createerr *ce = &get_rpc_createerr (); - (void) __fxprintf (NULL, "%s", L"%s", - _("clntudp_create: out of memory\n")); + (void) __fxprintf (NULL, "%s", _("clntudp_create: out of memory\n")); ce->cf_stat = RPC_SYSTEMERROR; ce->cf_error.re_errno = ENOMEM; goto fooy; diff --git a/sunrpc/clnt_unix.c b/sunrpc/clnt_unix.c index eb96656215..4e93e0d855 100644 --- a/sunrpc/clnt_unix.c +++ b/sunrpc/clnt_unix.c @@ -125,8 +125,7 @@ clntunix_create (struct sockaddr_un *raddr, u_long prog, u_long vers, if (h == NULL || ct == NULL) { struct rpc_createerr *ce = &get_rpc_createerr (); - (void) __fxprintf (NULL, "%s", L"%s", - _("clntunix_create: out of memory\n")); + (void) __fxprintf (NULL, "%s", _("clntunix_create: out of memory\n")); ce->cf_stat = RPC_SYSTEMERROR; ce->cf_error.re_errno = ENOMEM; goto fooy; diff --git a/sunrpc/svc_simple.c b/sunrpc/svc_simple.c index 1344c0bd55..6c1c9c914e 100644 --- a/sunrpc/svc_simple.c +++ b/sunrpc/svc_simple.c @@ -125,7 +125,7 @@ registerrpc (u_long prognum, u_long versnum, u_long procnum, err_out: if (buf == NULL) return -1; - (void) __fxprintf (NULL, "%s", L"%s", buf); + (void) __fxprintf (NULL, "%s", buf); free (buf); return -1; } @@ -184,7 +184,7 @@ universal (struct svc_req *rqstp, SVCXPRT *transp_l) err_out2: if (buf == NULL) exit (1); - __fxprintf (NULL, "%s", L"%s", buf); + __fxprintf (NULL, "%s", buf); free (buf); exit (1); } diff --git a/sunrpc/svc_tcp.c b/sunrpc/svc_tcp.c index 5c646a46c7..539a2b8d98 100644 --- a/sunrpc/svc_tcp.c +++ b/sunrpc/svc_tcp.c @@ -176,8 +176,7 @@ svctcp_create (int sock, u_int sendsize, u_int recvsize) xprt = (SVCXPRT *) mem_alloc (sizeof (SVCXPRT)); if (r == NULL || xprt == NULL) { - (void) __fxprintf (NULL, "%s", L"%s", - _("svctcp_create: out of memory\n")); + (void) __fxprintf (NULL, "%s", _("svctcp_create: out of memory\n")); mem_free (r, sizeof (*r)); mem_free (xprt, sizeof (SVCXPRT)); return NULL; @@ -215,7 +214,7 @@ makefd_xprt (int fd, u_int sendsize, u_int recvsize) cd = (struct tcp_conn *) mem_alloc (sizeof (struct tcp_conn)); if (xprt == (SVCXPRT *) NULL || cd == NULL) { - (void) __fxprintf (NULL, "%s", L"%s", + (void) __fxprintf (NULL, "%s", _("svc_tcp: makefd_xprt: out of memory\n")); mem_free (xprt, sizeof (SVCXPRT)); mem_free (cd, sizeof (struct tcp_conn)); diff --git a/sunrpc/svc_udp.c b/sunrpc/svc_udp.c index 62fd97e2f7..c0c115abeb 100644 --- a/sunrpc/svc_udp.c +++ b/sunrpc/svc_udp.c @@ -149,8 +149,7 @@ svcudp_bufcreate (sock, sendsz, recvsz) buf = mem_alloc (((MAX (sendsz, recvsz) + 3) / 4) * 4); if (xprt == NULL || su == NULL || buf == NULL) { - (void) __fxprintf (NULL, "%s", L"%s", - _("svcudp_create: out of memory\n")); + (void) __fxprintf (NULL, "%s", _("svcudp_create: out of memory\n")); mem_free (xprt, sizeof (SVCXPRT)); mem_free (su, sizeof (*su)); mem_free (buf, ((MAX (sendsz, recvsz) + 3) / 4) * 4); @@ -172,7 +171,7 @@ svcudp_bufcreate (sock, sendsz, recvsz) + sizeof(struct cmsghdr) + sizeof (struct in_pktinfo)) > sizeof (xprt->xp_pad)) { - (void) __fxprintf (NULL,"%s", L"%s", _("\ + (void) __fxprintf (NULL,"%s", _("\ svcudp_create: xp_pad is too small for IP_PKTINFO\n")); return NULL; } @@ -402,7 +401,7 @@ svcudp_destroy (xprt) #define SPARSENESS 4 /* 75% sparse */ #define CACHE_PERROR(msg) \ - (void) __fxprintf(NULL, "%s\n", L"%s\n", msg) + (void) __fxprintf(NULL, "%s\n", msg) #define ALLOC(type, size) \ (type *) mem_alloc((unsigned) (sizeof(type) * (size))) diff --git a/sunrpc/svc_unix.c b/sunrpc/svc_unix.c index 7672fcda48..1b7b1fbd4f 100644 --- a/sunrpc/svc_unix.c +++ b/sunrpc/svc_unix.c @@ -173,7 +173,7 @@ svcunix_create (int sock, u_int sendsize, u_int recvsize, char *path) xprt = (SVCXPRT *) mem_alloc (sizeof (SVCXPRT)); if (r == NULL || xprt == NULL) { - __fxprintf (NULL, "%s", L"%s", _("svcunix_create: out of memory\n")); + __fxprintf (NULL, "%s", _("svcunix_create: out of memory\n")); mem_free (r, sizeof (*r)); mem_free (xprt, sizeof (SVCXPRT)); return NULL; @@ -211,7 +211,7 @@ makefd_xprt (int fd, u_int sendsize, u_int recvsize) cd = (struct unix_conn *) mem_alloc (sizeof (struct unix_conn)); if (xprt == (SVCXPRT *) NULL || cd == (struct unix_conn *) NULL) { - (void) __fxprintf (NULL, "%s", L"%s", + (void) __fxprintf (NULL, "%s", _("svc_unix: makefd_xprt: out of memory\n")); mem_free (xprt, sizeof (SVCXPRT)); mem_free (cd, sizeof (struct unix_conn)); diff --git a/sunrpc/xdr.c b/sunrpc/xdr.c index 2f64c5b3fa..21e339b4ee 100644 --- a/sunrpc/xdr.c +++ b/sunrpc/xdr.c @@ -563,8 +563,7 @@ xdr_bytes (xdrs, cpp, sizep, maxsize) } if (sp == NULL) { - (void) __fxprintf (NULL, "%s", L"%s", - _("xdr_bytes: out of memory\n")); + (void) __fxprintf (NULL, "%s", _("xdr_bytes: out of memory\n")); return FALSE; } /* fall into ... */ @@ -716,8 +715,7 @@ xdr_string (xdrs, cpp, maxsize) *cpp = sp = (char *) mem_alloc (nodesize); if (sp == NULL) { - (void) __fxprintf (NULL, "%s", L"%s", - _("xdr_string: out of memory\n")); + (void) __fxprintf (NULL, "%s", _("xdr_string: out of memory\n")); return FALSE; } sp[size] = 0; diff --git a/sunrpc/xdr_array.c b/sunrpc/xdr_array.c index 12c78d4218..765f8995d3 100644 --- a/sunrpc/xdr_array.c +++ b/sunrpc/xdr_array.c @@ -105,8 +105,7 @@ xdr_array (xdrs, addrp, sizep, maxsize, elsize, elproc) *addrp = target = mem_alloc (nodesize); if (target == NULL) { - (void) __fxprintf (NULL, "%s", L"%s", - _("xdr_array: out of memory\n")); + (void) __fxprintf (NULL, "%s", _("xdr_array: out of memory\n")); return FALSE; } __bzero (target, nodesize); diff --git a/sunrpc/xdr_rec.c b/sunrpc/xdr_rec.c index e841faa6f1..1be3a4ad26 100644 --- a/sunrpc/xdr_rec.c +++ b/sunrpc/xdr_rec.c @@ -153,8 +153,7 @@ xdrrec_create (XDR *xdrs, u_int sendsize, if (rstrm == NULL || buf == NULL) { - (void) __fxprintf (NULL, "%s", L"%s", - _("xdrrec_create: out of memory\n")); + (void) __fxprintf (NULL, "%s", _("xdrrec_create: out of memory\n")); mem_free (rstrm, sizeof (RECSTREAM)); mem_free (buf, sendsize + recvsize + BYTES_PER_XDR_UNIT); /* diff --git a/sunrpc/xdr_ref.c b/sunrpc/xdr_ref.c index 68460bdc39..961c82edd2 100644 --- a/sunrpc/xdr_ref.c +++ b/sunrpc/xdr_ref.c @@ -82,7 +82,7 @@ xdr_reference (xdrs, pp, size, proc) *pp = loc = (caddr_t) mem_alloc (size); if (loc == NULL) { - (void) __fxprintf (NULL, "%s", L"%s", + (void) __fxprintf (NULL, "%s", _("xdr_reference: out of memory\n")); return FALSE; } -- cgit v1.2.1