mirror of
https://sourceware.org/git/glibc.git
synced 2025-01-18 06:30:05 +00:00
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>.
This commit is contained in:
parent
8ba3c7d939
commit
d74e76f9f6
@ -1,5 +1,12 @@
|
|||||||
1999-01-23 Ulrich Drepper <drepper@cygnus.com>
|
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.
|
* grp/putgrent.c (putgrent): Don't insert extra colon.
|
||||||
Patch by Michael Schaefer <michael.schaefer@dlr.de>.
|
Patch by Michael Schaefer <michael.schaefer@dlr.de>.
|
||||||
|
|
||||||
|
@ -92,10 +92,11 @@ void (*argp_program_version_hook) (FILE *, struct argp_state *) = print_version;
|
|||||||
static const struct argp_option options[] =
|
static const struct argp_option options[] =
|
||||||
{
|
{
|
||||||
{ NULL, 0, NULL, 0, N_("Input Files:") },
|
{ NULL, 0, NULL, 0, N_("Input Files:") },
|
||||||
{ "charmap", 'f', "FILE", 0,
|
{ "charmap", 'f', N_("FILE"), 0,
|
||||||
N_("Symbolic character names defined in FILE") },
|
N_("Symbolic character names defined in FILE") },
|
||||||
{ "inputfile", 'i', "FILE", 0, N_("Source definitions are found in FILE") },
|
{ "inputfile", 'i', N_("FILE"), 0,
|
||||||
{ "repertoire-map", 'u', "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") },
|
N_("FILE contains mapping from symbolic names to UCS4 values") },
|
||||||
|
|
||||||
{ NULL, 0, NULL, 0, N_("Output control:") },
|
{ NULL, 0, NULL, 0, N_("Output control:") },
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
/* obstack.c - subroutines used implicitly by object stack macros
|
/* 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
|
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.
|
the C library, however. The master source lives in /gd/gnu/lib.
|
||||||
@ -468,7 +468,8 @@ _obstack_memory_used (h)
|
|||||||
static void
|
static void
|
||||||
print_and_abort ()
|
print_and_abort ()
|
||||||
{
|
{
|
||||||
fputs (_("memory exhausted\n"), stderr);
|
fputs (_("memory exhausted"), stderr);
|
||||||
|
fputc ('\n', stderr);
|
||||||
exit (obstack_exit_failure);
|
exit (obstack_exit_failure);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -291,8 +291,7 @@ open_output (const char *infile, const char *outfile)
|
|||||||
fout = fopen (outfile, "w");
|
fout = fopen (outfile, "w");
|
||||||
if (fout == NULL)
|
if (fout == NULL)
|
||||||
{
|
{
|
||||||
fprintf (stderr, _ ("%s: unable to open "), cmdname);
|
fprintf (stderr, _ ("%s: unable to open %s: %m\n"), cmdname, outfile);
|
||||||
perror (outfile);
|
|
||||||
crash ();
|
crash ();
|
||||||
}
|
}
|
||||||
record_open (outfile);
|
record_open (outfile);
|
||||||
@ -304,8 +303,8 @@ close_output (const char *outfile)
|
|||||||
{
|
{
|
||||||
if (fclose (fout) == EOF)
|
if (fclose (fout) == EOF)
|
||||||
{
|
{
|
||||||
fprintf (stderr, _("%s: while writing output: "), cmdname);
|
fprintf (stderr, _("%s: while writing output %s: %m"), cmdname,
|
||||||
perror (outfile ?: "<stdout>");
|
outfile ?: "<stdout>");
|
||||||
crash ();
|
crash ();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user