mirror/glibc
2
0
Fork 0
mirror of git://sourceware.org/git/glibc.git synced 2025-04-24 14:41:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

(parse_charmap): Don't skip error checking when being quiet.

Browse Source 
(collate_order_elem): When processing an ellipsis properly form a
linked list in the result table, fix typo when allocating ordering
array.
This commit is contained in:
Ulrich Drepper 1998-03-02 13:34:22 +00:00
parent 22abb2d7a3
commit 96cb1b6807
1 changed files with 15 additions and 8 deletions

23
locale/programs/ld-collate.c

@ -239,9 +239,13 @@ collate_finish (struct localedef_t *locale, struct charset_t *charset)
else
value = 0;
if (value == 0 && !be_quiet)
error_at_line (0, 0, patch->fname, patch->lineno,
_("no weight defined for symbol `%s'"), patch->token);
if (value == 0)
{
if (!be_quiet)
error_at_line (0, 0, patch->fname, patch->lineno,
_("no weight defined for symbol `%s'"),
patch->token);
}
else
*patch->where.pos = value;
}
@ -1479,7 +1483,7 @@ line after ellipsis must contain character definition"));
pelem->ordering
= (unsigned int *) obstack_copy (&collate->element_mem, data,
(collate->nrules
* pelem->ordering_len)
+ pelem->ordering_len)
* sizeof (unsigned int));
/* `...' weights need to be adjusted. */
@ -1492,13 +1496,16 @@ line after ellipsis must contain character definition"));
(void *) &pelem->next) >= 0)
{
if (set_entry (&collate->result, name, sizeof (wchar_t),
(void *) pelem->next) < 0)
(void *) pelem) < 0)
error (4, 0, _("cannot insert into result table"));
}
else
if (insert_entry (&collate->result, name, sizeof (wchar_t),
(void *) pelem->next) < 0)
error (4, 0, _("cannot insert into result table"));
{
pelem->next = NULL;
if (insert_entry (&collate->result, name, sizeof (wchar_t),
(void *) pelem) < 0)
error (4, 0, _("cannot insert into result table"));
}
/* Increment counter. */
++name[0];