OpenE2K
/
glibc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* locale/programs/ld-collate.c (collate_read): Goto sym_equiv_free 

rather than col_sym_free.  Move seqp declaration earlier.

	* resolv/gai_suspend.c (gai_suspend): Make sure result is initialized.
This commit is contained in:
Ulrich Drepper 2006-09-06 16:51:47 +00:00
parent b051fc4438
commit 243b9ac192
3 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
2006-09-06 Jakub Jelinek <jakub@redhat.com>
* locale/programs/ld-collate.c (collate_read): Goto sym_equiv_free
rather than col_sym_free. Move seqp declaration earlier.
* resolv/gai_suspend.c (gai_suspend): Make sure result is initialized.
2006-09-05 Jakub Jelinek <jakub@redhat.com>
* nscd/initgrcache.c (addinitgroupsX): Move any_success

5
locale/programs/ld-collate.c
View File

@ -3068,7 +3068,7 @@ collate_read (struct linereader *ldfile, struct localedef_t *result,
lr_error (ldfile, _("\
%s: unknown symbol `%s' in equivalent definition"),
"LC_COLLATE", symname);
goto col_sym_free;
goto sym_equiv_free;
}
if (insert_entry (&collate->sym_table,
@ -3533,13 +3533,13 @@ error while adding equivalent collating symbol"));
break;
}
struct element_t *seqp;
if (state == 0)
{
/* We are outside an `order_start' region. This means
we must only accept definitions of values for
collation symbols since these are purely abstract
values and don't need directions associated. */
struct element_t *seqp;
void *ptr;
if (find_entry (&collate->seq_table, symstr, symlen, &ptr) == 0)
@ -3586,7 +3586,6 @@ error while adding equivalent collating symbol"));
{
/* It is possible that we already have this collation sequence.
In this case we move the entry. */
struct element_t *seqp = NULL;
void *sym;
void *ptr;

1
resolv/gai_suspend.c
View File

@ -83,6 +83,7 @@ gai_suspend (const struct gaicb *const list[], int ent,
pthread_setcancelstate (PTHREAD_CANCEL_DISABLE, &oldstate);
#ifdef DONT_NEED_GAI_MISC_COND
result = 0;
GAI_MISC_WAIT (result, cntr, timeout, 1);
#else
if (timeout == NULL)