mirror of
https://sourceware.org/git/glibc.git
synced 2024-12-23 03:10:05 +00:00
Update.
2000-01-26 Ulrich Drepper <drepper@cygnus.com> * locale/programs/ld-collate.c (check_duplicate): Fix printing of error messages. (collate_read): Remove unnecessary `if'.
This commit is contained in:
parent
4e2e99997a
commit
4b1c1a6ffa
@ -1,3 +1,9 @@
|
|||||||
|
2000-01-26 Ulrich Drepper <drepper@cygnus.com>
|
||||||
|
|
||||||
|
* locale/programs/ld-collate.c (check_duplicate): Fix printing of error
|
||||||
|
messages.
|
||||||
|
(collate_read): Remove unnecessary `if'.
|
||||||
|
|
||||||
2000-01-25 Ulrich Drepper <drepper@cygnus.com>
|
2000-01-25 Ulrich Drepper <drepper@cygnus.com>
|
||||||
|
|
||||||
* libio/fileops.c (_IO_new_file_open): Recognize ,ccs= in mode string
|
* libio/fileops.c (_IO_new_file_open): Recognize ,ccs= in mode string
|
||||||
|
@ -342,26 +342,29 @@ check_duplicate (struct linereader *ldfile, struct locale_collate_t *collate,
|
|||||||
|
|
||||||
if (find_entry (&charmap->char_table, symbol, symbol_len, &ignore) == 0)
|
if (find_entry (&charmap->char_table, symbol, symbol_len, &ignore) == 0)
|
||||||
{
|
{
|
||||||
lr_error (ldfile, _("`%s' already defined in charmap"), symbol);
|
lr_error (ldfile, _("`%.*s' already defined in charmap"),
|
||||||
|
(int) symbol_len, symbol);
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (find_entry (&repertoire->char_table, symbol, symbol_len, &ignore) == 0)
|
if (find_entry (&repertoire->char_table, symbol, symbol_len, &ignore) == 0)
|
||||||
{
|
{
|
||||||
lr_error (ldfile, _("`%s' already defined in repertoire"), symbol);
|
lr_error (ldfile, _("`%.*s' already defined in repertoire"),
|
||||||
|
(int) symbol_len, symbol);
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (find_entry (&collate->sym_table, symbol, symbol_len, &ignore) == 0)
|
if (find_entry (&collate->sym_table, symbol, symbol_len, &ignore) == 0)
|
||||||
{
|
{
|
||||||
lr_error (ldfile, _("`%s' already defined as collating symbol"), symbol);
|
lr_error (ldfile, _("`%.*s' already defined as collating symbol"),
|
||||||
|
(int) symbol_len, symbol);
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (find_entry (&collate->elem_table, symbol, symbol_len, &ignore) == 0)
|
if (find_entry (&collate->elem_table, symbol, symbol_len, &ignore) == 0)
|
||||||
{
|
{
|
||||||
lr_error (ldfile, _("`%s' already defined as collating element"),
|
lr_error (ldfile, _("`%.*s' already defined as collating element"),
|
||||||
symbol);
|
(int) symbol_len, symbol);
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -2881,57 +2884,52 @@ error while adding collating symbol"));
|
|||||||
symname = arg->val.str.startmb;
|
symname = arg->val.str.startmb;
|
||||||
symname_len = arg->val.str.lenmb;
|
symname_len = arg->val.str.lenmb;
|
||||||
|
|
||||||
if (!ignore_content)
|
if (newname == NULL)
|
||||||
{
|
{
|
||||||
if (newname == NULL)
|
lr_error (ldfile, _("\
|
||||||
{
|
|
||||||
lr_error (ldfile, _("\
|
|
||||||
%s: unknown character in equivalent definition name"),
|
%s: unknown character in equivalent definition name"),
|
||||||
"LC_COLLATE");
|
"LC_COLLATE");
|
||||||
goto sym_equiv_free;
|
|
||||||
}
|
|
||||||
if (symname == NULL)
|
|
||||||
{
|
|
||||||
lr_error (ldfile, _("\
|
|
||||||
%s: unknown character in equivalent definition value"),
|
|
||||||
"LC_COLLATE");
|
|
||||||
goto sym_equiv_free;
|
|
||||||
}
|
|
||||||
/* The name is already defined. */
|
|
||||||
if (check_duplicate (ldfile, collate, charmap,
|
|
||||||
repertoire, symname, symname_len))
|
|
||||||
goto col_sym_free;
|
|
||||||
|
|
||||||
/* See whether the symbol name is already defined. */
|
|
||||||
if (find_entry (&collate->sym_table, symname, symname_len,
|
|
||||||
(void **) &symval) != 0)
|
|
||||||
{
|
|
||||||
lr_error (ldfile, _("\
|
|
||||||
%s: unknown symbol `%s' in equivalent definition"),
|
|
||||||
"LC_COLLATE", symname);
|
|
||||||
goto col_sym_free;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (insert_entry (&collate->sym_table,
|
|
||||||
newname, newname_len, symval) < 0)
|
|
||||||
{
|
|
||||||
lr_error (ldfile, _("\
|
|
||||||
error while adding equivalent collating symbol"));
|
|
||||||
goto sym_equiv_free;
|
|
||||||
}
|
|
||||||
|
|
||||||
free ((char *) symname);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
sym_equiv_free:
|
sym_equiv_free:
|
||||||
if (newname != NULL)
|
if (newname != NULL)
|
||||||
free ((char *) newname);
|
free ((char *) newname);
|
||||||
if (symname != NULL)
|
if (symname != NULL)
|
||||||
free ((char *) symname);
|
free ((char *) symname);
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
lr_ignore_rest (ldfile, 1);
|
if (symname == NULL)
|
||||||
|
{
|
||||||
|
lr_error (ldfile, _("\
|
||||||
|
%s: unknown character in equivalent definition value"),
|
||||||
|
"LC_COLLATE");
|
||||||
|
goto sym_equiv_free;
|
||||||
|
}
|
||||||
|
/* The name is already defined. */
|
||||||
|
if (check_duplicate (ldfile, collate, charmap,
|
||||||
|
repertoire, symname, symname_len))
|
||||||
|
goto col_sym_free;
|
||||||
|
|
||||||
|
/* See whether the symbol name is already defined. */
|
||||||
|
if (find_entry (&collate->sym_table, symname, symname_len,
|
||||||
|
(void **) &symval) != 0)
|
||||||
|
{
|
||||||
|
lr_error (ldfile, _("\
|
||||||
|
%s: unknown symbol `%s' in equivalent definition"),
|
||||||
|
"LC_COLLATE", symname);
|
||||||
|
goto col_sym_free;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (insert_entry (&collate->sym_table,
|
||||||
|
newname, newname_len, symval) < 0)
|
||||||
|
{
|
||||||
|
lr_error (ldfile, _("\
|
||||||
|
error while adding equivalent collating symbol"));
|
||||||
|
goto sym_equiv_free;
|
||||||
|
}
|
||||||
|
|
||||||
|
free ((char *) symname);
|
||||||
}
|
}
|
||||||
|
lr_ignore_rest (ldfile, 1);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case tok_order_start:
|
case tok_order_start:
|
||||||
|
Loading…
Reference in New Issue
Block a user