aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>1999-01-23 22:50:17 +0000
committerUlrich Drepper <drepper@redhat.com>1999-01-23 22:50:17 +0000
commitd74e76f9f6b05428358a6248ac506dc38c323c7e (patch)
treefcaf79e75b038c550015f200838057561e17308e
parent8ba3c7d939fd02e4bef1f311d941fc04bf5e19e8 (diff)
downloadglibc-d74e76f9f6b05428358a6248ac506dc38c323c7e.tar
glibc-d74e76f9f6b05428358a6248ac506dc38c323c7e.tar.gz
glibc-d74e76f9f6b05428358a6248ac506dc38c323c7e.tar.bz2
glibc-d74e76f9f6b05428358a6248ac506dc38c323c7e.zip
Update.
* sunrpc/rpc_main.c (open_output): Allow better translation of error message. (close_output): Likewise. * locale/programs/localedef.c: Unify messages. * malloc/obstack.c: Likewise. Suggested by Vladimir Michl <Vladimir.Michl@upol.cz>.
-rw-r--r--ChangeLog7
-rw-r--r--locale/programs/localedef.c7
-rw-r--r--malloc/obstack.c5
-rw-r--r--sunrpc/rpc_main.c7
4 files changed, 17 insertions, 9 deletions
diff --git a/ChangeLog b/ChangeLog
index 1e67612a7d..7baae4fce5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
1999-01-23 Ulrich Drepper <drepper@cygnus.com>
+ * sunrpc/rpc_main.c (open_output): Allow better translation of
+ error message.
+ (close_output): Likewise.
+ * locale/programs/localedef.c: Unify messages.
+ * malloc/obstack.c: Likewise.
+ Suggested by Vladimir Michl <Vladimir.Michl@upol.cz>.
+
* grp/putgrent.c (putgrent): Don't insert extra colon.
Patch by Michael Schaefer <michael.schaefer@dlr.de>.
diff --git a/locale/programs/localedef.c b/locale/programs/localedef.c
index 5a7035dc13..fc9683f69d 100644
--- a/locale/programs/localedef.c
+++ b/locale/programs/localedef.c
@@ -92,10 +92,11 @@ void (*argp_program_version_hook) (FILE *, struct argp_state *) = print_version;
static const struct argp_option options[] =
{
{ NULL, 0, NULL, 0, N_("Input Files:") },
- { "charmap", 'f', "FILE", 0,
+ { "charmap", 'f', N_("FILE"), 0,
N_("Symbolic character names defined in FILE") },
- { "inputfile", 'i', "FILE", 0, N_("Source definitions are found in FILE") },
- { "repertoire-map", 'u', "FILE", 0,
+ { "inputfile", 'i', N_("FILE"), 0,
+ N_("Source definitions are found in FILE") },
+ { "repertoire-map", 'u', N_("FILE"), 0,
N_("FILE contains mapping from symbolic names to UCS4 values") },
{ NULL, 0, NULL, 0, N_("Output control:") },
diff --git a/malloc/obstack.c b/malloc/obstack.c
index 76b7a95cd4..17c6313431 100644
--- a/malloc/obstack.c
+++ b/malloc/obstack.c
@@ -1,5 +1,5 @@
/* obstack.c - subroutines used implicitly by object stack macros
- Copyright (C) 1988,89,90,91,92,93,94,96,97,98 Free Software Foundation, Inc.
+ Copyright (C) 1988-1994,96,97,98,99 Free Software Foundation, Inc.
This file is part of the GNU C Library. Its master source is NOT part of
the C library, however. The master source lives in /gd/gnu/lib.
@@ -468,7 +468,8 @@ _obstack_memory_used (h)
static void
print_and_abort ()
{
- fputs (_("memory exhausted\n"), stderr);
+ fputs (_("memory exhausted"), stderr);
+ fputc ('\n', stderr);
exit (obstack_exit_failure);
}
diff --git a/sunrpc/rpc_main.c b/sunrpc/rpc_main.c
index 2229c564fe..aec153faaa 100644
--- a/sunrpc/rpc_main.c
+++ b/sunrpc/rpc_main.c
@@ -291,8 +291,7 @@ open_output (const char *infile, const char *outfile)
fout = fopen (outfile, "w");
if (fout == NULL)
{
- fprintf (stderr, _ ("%s: unable to open "), cmdname);
- perror (outfile);
+ fprintf (stderr, _ ("%s: unable to open %s: %m\n"), cmdname, outfile);
crash ();
}
record_open (outfile);
@@ -304,8 +303,8 @@ close_output (const char *outfile)
{
if (fclose (fout) == EOF)
{
- fprintf (stderr, _("%s: while writing output: "), cmdname);
- perror (outfile ?: "<stdout>");
+ fprintf (stderr, _("%s: while writing output %s: %m"), cmdname,
+ outfile ?: "<stdout>");
crash ();
}
}