diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2008-06-12 16:53:43 +0000 |
|---|---|---|
| committer | Jakub Jelinek <jakub@redhat.com> | 2008-06-12 16:53:43 +0000 |
| commit | 72d4ac23660326e76443cf18f0ed8c2e4792d268 (patch) | |
| tree | dec24311250bb61298456c3eb0e8937c3a4b7561 /locale | |
| parent | 8ba7d5cebbd4acf40dc8d22982baa50c2e1fd194 (diff) | |
Updated to fedora-glibc-20080612T1619cvs/fedora-glibc-2_8_90-6
Diffstat (limited to 'locale')
| -rw-r--r-- | locale/programs/ld-collate.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/locale/programs/ld-collate.c b/locale/programs/ld-collate.c index 7af3b8aa92..bf50e77aab 100644 --- a/locale/programs/ld-collate.c +++ b/locale/programs/ld-collate.c @@ -2961,8 +2961,7 @@ collate_read (struct linereader *ldfile, struct localedef_t *result, else { col_elem_free: - if (symbol != NULL) - free ((char *) symbol); + free ((char *) symbol); free (arg->val.str.startmb); free (arg->val.str.startwc); } @@ -3142,8 +3141,7 @@ collate_read (struct linereader *ldfile, struct localedef_t *result, arg = lr_token (ldfile, charmap, result, repertoire, verbose); if (arg->tok != tok_bsymbol) { - if (newname != NULL) - free ((char *) newname); + free ((char *) newname); goto err_label; } @@ -3157,10 +3155,8 @@ collate_read (struct linereader *ldfile, struct localedef_t *result, "LC_COLLATE"); sym_equiv_free: - if (newname != NULL) - free ((char *) newname); - if (symname != NULL) - free ((char *) symname); + free ((char *) newname); + free ((char *) symname); break; } if (symname == NULL) |