* 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.
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]
* stdlib/strtod_l.c: Use correct sign for result in one more
underflow case.
-/* 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.
Contributed by Ulrich Drepper <drepper@gnu.org>, 1995.
&& !__isleap (time->era_entries[idx].stop_date[0])))
&& !be_quiet)
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));
}
}
-/* 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.
Contributed by Ulrich Drepper <drepper@gnu.org>, 1996.
now = lr_token (ldfile, charmap, result, NULL, verbose);
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)
{
if (now->val.str.startmb == NULL)
N_("Do not fork and display messages on the current tty") },
{ "nthreads", 't', N_("NUMBER"), 0, N_("Start NUMBER threads") },
{ "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,
N_("Invalidate the specified cache") },
{ "secure", 'S', N_("TABLE,yes"), OPTION_HIDDEN,
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;
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;
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;
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;
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;
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;
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);
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;
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;
}
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 ... */
*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;
*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;
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);
/*
*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;