From 1d20f7f83495af86d393d97620a89f48a3163291 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Sat, 29 Mar 2008 18:12:46 +0000 Subject: [BZ #5979] * sunrpc/auth_unix.c: Unify printed strings. * sunrpc/clnt_tcp.c: Likewise. * sunrpc/clnt_udp.c: Likewise. * sunrpc/clnt_unix.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. * locale/programs/ld-time.c (time_finish): Unify messages. * locale/programs/locfile.c (handle_copy): Fix typo. * nscd/nscd.c (options): Fix typo. --- sunrpc/auth_unix.c | 2 +- sunrpc/clnt_tcp.c | 2 +- sunrpc/clnt_udp.c | 3 ++- sunrpc/clnt_unix.c | 2 +- sunrpc/svc_tcp.c | 6 +++--- sunrpc/svc_udp.c | 3 ++- sunrpc/svc_unix.c | 6 +++--- sunrpc/xdr.c | 4 ++-- sunrpc/xdr_array.c | 2 +- sunrpc/xdr_rec.c | 2 +- sunrpc/xdr_ref.c | 3 +-- 11 files changed, 18 insertions(+), 17 deletions(-) (limited to 'sunrpc') diff --git a/sunrpc/auth_unix.c b/sunrpc/auth_unix.c index 3eaf0a2..734eb08 100644 --- a/sunrpc/auth_unix.c +++ b/sunrpc/auth_unix.c @@ -111,7 +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", _("authunix_create: out of memory\n")); + (void) __fxprintf (NULL, "%s: %s", __func__, _("out of memory\n")); mem_free (auth, sizeof (*auth)); mem_free (au, sizeof (*au)); return NULL; diff --git a/sunrpc/clnt_tcp.c b/sunrpc/clnt_tcp.c index 5bec3bc..6825ca5 100644 --- a/sunrpc/clnt_tcp.c +++ b/sunrpc/clnt_tcp.c @@ -128,7 +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", _("clnttcp_create: out of memory\n")); + (void) __fxprintf (NULL, "%s: %s", __func__, _("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 70ee0ea..6343132 100644 --- a/sunrpc/clnt_udp.c +++ b/sunrpc/clnt_udp.c @@ -136,7 +136,8 @@ 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", _("clntudp_create: out of memory\n")); + (void) __fxprintf (NULL, "%s: %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 848a480..4107c62 100644 --- a/sunrpc/clnt_unix.c +++ b/sunrpc/clnt_unix.c @@ -125,7 +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", _("clntunix_create: out of memory\n")); + (void) __fxprintf (NULL, "%s: %s", __func__, _("out of memory\n")); ce->cf_stat = RPC_SYSTEMERROR; ce->cf_error.re_errno = ENOMEM; goto fooy; diff --git a/sunrpc/svc_tcp.c b/sunrpc/svc_tcp.c index 539a2b8..beeb106 100644 --- a/sunrpc/svc_tcp.c +++ b/sunrpc/svc_tcp.c @@ -176,7 +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", _("svctcp_create: out of memory\n")); + (void) __fxprintf (NULL, "%s: %s", __func__, _("out of memory\n")); mem_free (r, sizeof (*r)); mem_free (xprt, sizeof (SVCXPRT)); return NULL; @@ -214,8 +214,8 @@ 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", - _("svc_tcp: makefd_xprt: out of memory\n")); + (void) __fxprintf (NULL, "%s: %s", "svc_tcp: makefd_xprt", + _("out of memory\n")); mem_free (xprt, sizeof (SVCXPRT)); mem_free (cd, sizeof (struct tcp_conn)); return NULL; diff --git a/sunrpc/svc_udp.c b/sunrpc/svc_udp.c index dfeb6de..496d6d9 100644 --- a/sunrpc/svc_udp.c +++ b/sunrpc/svc_udp.c @@ -149,7 +149,8 @@ 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", _("svcudp_create: out of memory\n")); + (void) __fxprintf (NULL, "%s: %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); diff --git a/sunrpc/svc_unix.c b/sunrpc/svc_unix.c index 1b7b1fb..f103ed9 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", _("svcunix_create: out of memory\n")); + __fxprintf (NULL, "%s: %s", __func__, _("out of memory\n")); mem_free (r, sizeof (*r)); mem_free (xprt, sizeof (SVCXPRT)); return NULL; @@ -211,8 +211,8 @@ 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", - _("svc_unix: makefd_xprt: out of memory\n")); + (void) __fxprintf (NULL, "%s: %s", "svc_unix: makefd_xprt", + _("out of memory\n")); mem_free (xprt, sizeof (SVCXPRT)); mem_free (cd, sizeof (struct unix_conn)); return NULL; diff --git a/sunrpc/xdr.c b/sunrpc/xdr.c index 21e339b..8a70d2e 100644 --- a/sunrpc/xdr.c +++ b/sunrpc/xdr.c @@ -563,7 +563,7 @@ xdr_bytes (xdrs, cpp, sizep, maxsize) } if (sp == NULL) { - (void) __fxprintf (NULL, "%s", _("xdr_bytes: out of memory\n")); + (void) __fxprintf (NULL, "%s: %s", __func__, _("out of memory\n")); return FALSE; } /* fall into ... */ @@ -715,7 +715,7 @@ xdr_string (xdrs, cpp, maxsize) *cpp = sp = (char *) mem_alloc (nodesize); if (sp == NULL) { - (void) __fxprintf (NULL, "%s", _("xdr_string: out of memory\n")); + (void) __fxprintf (NULL, "%s: %s", __func__, _("out of memory\n")); return FALSE; } sp[size] = 0; diff --git a/sunrpc/xdr_array.c b/sunrpc/xdr_array.c index 44abdbc..e7c8925 100644 --- a/sunrpc/xdr_array.c +++ b/sunrpc/xdr_array.c @@ -103,7 +103,7 @@ xdr_array (xdrs, addrp, sizep, maxsize, elsize, elproc) *addrp = target = calloc (c, elsize); if (target == NULL) { - (void) __fxprintf (NULL, "%s", _("xdr_array: out of memory\n")); + (void) __fxprintf (NULL, "%s: %s", __func__, _("out of memory\n")); return FALSE; } break; diff --git a/sunrpc/xdr_rec.c b/sunrpc/xdr_rec.c index e847e9b..6854034 100644 --- a/sunrpc/xdr_rec.c +++ b/sunrpc/xdr_rec.c @@ -153,7 +153,7 @@ xdrrec_create (XDR *xdrs, u_int sendsize, if (rstrm == NULL || buf == NULL) { - (void) __fxprintf (NULL, "%s", _("xdrrec_create: out of memory\n")); + (void) __fxprintf (NULL, "%s: %s", __func__, _("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 bc5f72d..532804f 100644 --- a/sunrpc/xdr_ref.c +++ b/sunrpc/xdr_ref.c @@ -82,8 +82,7 @@ xdr_reference (xdrs, pp, size, proc) *pp = loc = (caddr_t) calloc (1, size); if (loc == NULL) { - (void) __fxprintf (NULL, "%s", - _("xdr_reference: out of memory\n")); + (void) __fxprintf (NULL, "%s: %s", __func__, _("out of memory\n")); return FALSE; } break; -- cgit v1.1