lib/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-07-29 11:41:21 +03:00
Code Activity

[BZ #5979]

Browse Source 
* 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.
This commit is contained in:
Ulrich Drepper
2008-03-29 18:12:46 +00:00
parent 1c27266549
commit 1d20f7f834
15 changed files with 39 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
ChangeLog
View File

@ -1,5 +1,21 @@
2008-03-29 Ulrich Drepper <drepper@redhat.com> 2008-03-29 Ulrich Drepper <drepper@redhat.com>
[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.
[BZ #5995] [BZ #5995]
* stdlib/strtod_l.c: Use correct sign for result in one more * stdlib/strtod_l.c: Use correct sign for result in one more
underflow case. underflow case.

4
locale/programs/ld-time.c
View File

@ -1,4 +1,4 @@
/* Copyright (C) 1995-2005, 2006, 2007 Free Software Foundation, Inc. /* Copyright (C) 1995-2005, 2006, 2007, 2008 Free Software Foundation, Inc.
This file is part of the GNU C Library. This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@gnu.org>, 1995. Contributed by Ulrich Drepper <drepper@gnu.org>, 1995.
@ -433,7 +433,7 @@ No definition for %s category found"), "LC_TIME"));
&& !__isleap (time->era_entries[idx].stop_date[0]))) && !__isleap (time->era_entries[idx].stop_date[0])))
&& !be_quiet) && !be_quiet)
WITH_CUR_LOCALE (error (0, 0, _("\ WITH_CUR_LOCALE (error (0, 0, _("\
%s: stopping date is invalid in string %Zd in `era' field"), %s: invalid stopping date in string %Zd in `era' field"),
"LC_TIME", idx + 1)); "LC_TIME", idx + 1));
} }
} }

4
locale/programs/locfile.c
View File

@ -1,4 +1,4 @@
/* Copyright (C) 1996-2004, 2005, 2006 Free Software Foundation, Inc. /* Copyright (C) 1996-2004, 2005, 2006, 2008 Free Software Foundation, Inc.
This file is part of the GNU C Library. This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@gnu.org>, 1996. Contributed by Ulrich Drepper <drepper@gnu.org>, 1996.
@ -779,7 +779,7 @@ handle_copy (struct linereader *ldfile, const struct charmap_t *charmap,
now = lr_token (ldfile, charmap, result, NULL, verbose); now = lr_token (ldfile, charmap, result, NULL, verbose);
if (now->tok != tok_string) if (now->tok != tok_string)
lr_error (ldfile, _("expect string argument for `copy'")); lr_error (ldfile, _("expecting string argument for `copy'"));
else if (!ignore_content) else if (!ignore_content)
{ {
if (now->val.str.startmb == NULL) if (now->val.str.startmb == NULL)

2
nscd/nscd.c
View File

@ -100,7 +100,7 @@ static const struct argp_option options[] =
N_("Do not fork and display messages on the current tty") }, N_("Do not fork and display messages on the current tty") },
{ "nthreads", 't', N_("NUMBER"), 0, N_("Start NUMBER threads") }, { "nthreads", 't', N_("NUMBER"), 0, N_("Start NUMBER threads") },
{ "shutdown", 'K', NULL, 0, N_("Shut the server down") }, { "shutdown", 'K', NULL, 0, N_("Shut the server down") },
{ "statistic", 'g', NULL, 0, N_("Print current configuration statistic") }, { "statistics", 'g', NULL, 0, N_("Print current configuration statistics") },
{ "invalidate", 'i', N_("TABLE"), 0, { "invalidate", 'i', N_("TABLE"), 0,
N_("Invalidate the specified cache") }, N_("Invalidate the specified cache") },
{ "secure", 'S', N_("TABLE,yes"), OPTION_HIDDEN, { "secure", 'S', N_("TABLE,yes"), OPTION_HIDDEN,

2
sunrpc/auth_unix.c
View File

@ -111,7 +111,7 @@ authunix_create (char *machname, uid_t uid, gid_t gid, int len,
if (auth == NULL || au == NULL) if (auth == NULL || au == NULL)
{ {
no_memory: 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 (auth, sizeof (*auth));
mem_free (au, sizeof (*au)); mem_free (au, sizeof (*au));
return NULL; return NULL;

2
sunrpc/clnt_tcp.c
View File

@ -128,7 +128,7 @@ clnttcp_create (struct sockaddr_in *raddr, u_long prog, u_long vers,
if (h == NULL || ct == NULL) if (h == NULL || ct == NULL)
{ {
struct rpc_createerr *ce = &get_rpc_createerr (); 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_stat = RPC_SYSTEMERROR;
ce->cf_error.re_errno = ENOMEM; ce->cf_error.re_errno = ENOMEM;
goto fooy; goto fooy;

3
sunrpc/clnt_udp.c
View File

@ -136,7 +136,8 @@ clntudp_bufcreate (struct sockaddr_in *raddr, u_long program, u_long version,
if (cl == NULL || cu == NULL) if (cl == NULL || cu == NULL)
{ {
struct rpc_createerr *ce = &get_rpc_createerr (); 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_stat = RPC_SYSTEMERROR;
ce->cf_error.re_errno = ENOMEM; ce->cf_error.re_errno = ENOMEM;
goto fooy; goto fooy;

2
sunrpc/clnt_unix.c
View File

@ -125,7 +125,7 @@ clntunix_create (struct sockaddr_un *raddr, u_long prog, u_long vers,
if (h == NULL || ct == NULL) if (h == NULL || ct == NULL)
{ {
struct rpc_createerr *ce = &get_rpc_createerr (); 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_stat = RPC_SYSTEMERROR;
ce->cf_error.re_errno = ENOMEM; ce->cf_error.re_errno = ENOMEM;
goto fooy; goto fooy;

6
sunrpc/svc_tcp.c
View File

@ -176,7 +176,7 @@ svctcp_create (int sock, u_int sendsize, u_int recvsize)
xprt = (SVCXPRT *) mem_alloc (sizeof (SVCXPRT)); xprt = (SVCXPRT *) mem_alloc (sizeof (SVCXPRT));
if (r == NULL || xprt == NULL) 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 (r, sizeof (*r));
mem_free (xprt, sizeof (SVCXPRT)); mem_free (xprt, sizeof (SVCXPRT));
return NULL; 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)); cd = (struct tcp_conn *) mem_alloc (sizeof (struct tcp_conn));
if (xprt == (SVCXPRT *) NULL || cd == NULL) if (xprt == (SVCXPRT *) NULL || cd == NULL)
{ {
(void) __fxprintf (NULL, "%s", (void) __fxprintf (NULL, "%s: %s", "svc_tcp: makefd_xprt",
_("svc_tcp: makefd_xprt: out of memory\n")); _("out of memory\n"));
mem_free (xprt, sizeof (SVCXPRT)); mem_free (xprt, sizeof (SVCXPRT));
mem_free (cd, sizeof (struct tcp_conn)); mem_free (cd, sizeof (struct tcp_conn));
return NULL; return NULL;

3
sunrpc/svc_udp.c
View File

@ -149,7 +149,8 @@ svcudp_bufcreate (sock, sendsz, recvsz)
buf = mem_alloc (((MAX (sendsz, recvsz) + 3) / 4) * 4); buf = mem_alloc (((MAX (sendsz, recvsz) + 3) / 4) * 4);
if (xprt == NULL || su == NULL || buf == NULL) 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 (xprt, sizeof (SVCXPRT));
mem_free (su, sizeof (*su)); mem_free (su, sizeof (*su));
mem_free (buf, ((MAX (sendsz, recvsz) + 3) / 4) * 4); mem_free (buf, ((MAX (sendsz, recvsz) + 3) / 4) * 4);

6
sunrpc/svc_unix.c
View File

@ -173,7 +173,7 @@ svcunix_create (int sock, u_int sendsize, u_int recvsize, char *path)
xprt = (SVCXPRT *) mem_alloc (sizeof (SVCXPRT)); xprt = (SVCXPRT *) mem_alloc (sizeof (SVCXPRT));
if (r == NULL || xprt == NULL) 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 (r, sizeof (*r));
mem_free (xprt, sizeof (SVCXPRT)); mem_free (xprt, sizeof (SVCXPRT));
return NULL; 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)); cd = (struct unix_conn *) mem_alloc (sizeof (struct unix_conn));
if (xprt == (SVCXPRT *) NULL || cd == (struct unix_conn *) NULL) if (xprt == (SVCXPRT *) NULL || cd == (struct unix_conn *) NULL)
{ {
(void) __fxprintf (NULL, "%s", (void) __fxprintf (NULL, "%s: %s", "svc_unix: makefd_xprt",
_("svc_unix: makefd_xprt: out of memory\n")); _("out of memory\n"));
mem_free (xprt, sizeof (SVCXPRT)); mem_free (xprt, sizeof (SVCXPRT));
mem_free (cd, sizeof (struct unix_conn)); mem_free (cd, sizeof (struct unix_conn));
return NULL; return NULL;

4
sunrpc/xdr.c
View File

@ -563,7 +563,7 @@ xdr_bytes (xdrs, cpp, sizep, maxsize)
} }
if (sp == NULL) 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; return FALSE;
} }
/* fall into ... */ /* fall into ... */
@ -715,7 +715,7 @@ xdr_string (xdrs, cpp, maxsize)
*cpp = sp = (char *) mem_alloc (nodesize); *cpp = sp = (char *) mem_alloc (nodesize);
if (sp == NULL) 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; return FALSE;
} }
sp[size] = 0; sp[size] = 0;

2
sunrpc/xdr_array.c
View File

@ -103,7 +103,7 @@ xdr_array (xdrs, addrp, sizep, maxsize, elsize, elproc)
*addrp = target = calloc (c, elsize); *addrp = target = calloc (c, elsize);
if (target == NULL) 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; return FALSE;
} }
break; break;

2
sunrpc/xdr_rec.c
View File

@ -153,7 +153,7 @@ xdrrec_create (XDR *xdrs, u_int sendsize,
if (rstrm == NULL || buf == NULL) 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 (rstrm, sizeof (RECSTREAM));
mem_free (buf, sendsize + recvsize + BYTES_PER_XDR_UNIT); mem_free (buf, sendsize + recvsize + BYTES_PER_XDR_UNIT);
/* /*

3
sunrpc/xdr_ref.c
View File

@ -82,8 +82,7 @@ xdr_reference (xdrs, pp, size, proc)
*pp = loc = (caddr_t) calloc (1, size); *pp = loc = (caddr_t) calloc (1, size);
if (loc == NULL) if (loc == NULL)
{ {
(void) __fxprintf (NULL, "%s", (void) __fxprintf (NULL, "%s: %s", __func__, _("out of memory\n"));
_("xdr_reference: out of memory\n"));
return FALSE; return FALSE;
} }
break; break;