diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2006-09-06 16:51:47 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2006-09-06 16:51:47 +0000 |
| commit | 243b9ac19241ace83c566c51eb53e3e53413c897 (patch) | |
| tree | 03525e967fe50dcc7ee87ab6049021729c686d10 /locale/programs/ld-collate.c | |
| parent | b051fc4438e7e7ef248a1d03a9b2bd397bc916f3 (diff) | |
| download | glibc-243b9ac19241ace83c566c51eb53e3e53413c897.tar.gz glibc-243b9ac19241ace83c566c51eb53e3e53413c897.tar.xz glibc-243b9ac19241ace83c566c51eb53e3e53413c897.zip | |
* locale/programs/ld-collate.c (collate_read): Goto sym_equiv_free cvs/fedora-glibc-20060907T0853
rather than col_sym_free. Move seqp declaration earlier. * resolv/gai_suspend.c (gai_suspend): Make sure result is initialized.
Diffstat (limited to 'locale/programs/ld-collate.c')
| -rw-r--r-- | locale/programs/ld-collate.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/locale/programs/ld-collate.c b/locale/programs/ld-collate.c index e69ac85a95..a1401013e0 100644 --- a/locale/programs/ld-collate.c +++ b/locale/programs/ld-collate.c @@ -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; |