diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2008-03-19 06:43:34 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2008-03-19 06:43:34 +0000 |
| commit | 72e6cdfa2cd95240439c72705ab28a2eebb7d04e (patch) | |
| tree | ae830b7817948dc795cc92ec98216c478dde57e3 /locale | |
| parent | 354b75277bc86768eafbbf5f590deb27e0a71d89 (diff) | |
| download | glibc-72e6cdfa2cd95240439c72705ab28a2eebb7d04e.zip glibc-72e6cdfa2cd95240439c72705ab28a2eebb7d04e.tar.gz glibc-72e6cdfa2cd95240439c72705ab28a2eebb7d04e.tar.bz2 | |
Remove useless "if" before "free".
Diffstat (limited to 'locale')
| -rw-r--r-- | locale/programs/ld-collate.c | 12 | ||||
| -rw-r--r-- | locale/programs/linereader.c | 3 |
2 files changed, 5 insertions, 10 deletions
diff --git a/locale/programs/ld-collate.c b/locale/programs/ld-collate.c index 227e764..f72516c 100644 --- a/locale/programs/ld-collate.c +++ b/locale/programs/ld-collate.c @@ -2963,10 +2963,8 @@ collate_read (struct linereader *ldfile, struct localedef_t *result, col_elem_free: if (symbol != NULL) free ((char *) symbol); - if (arg->val.str.startmb != NULL) - free (arg->val.str.startmb); - if (arg->val.str.startwc != NULL) - free (arg->val.str.startwc); + free (arg->val.str.startmb); + free (arg->val.str.startwc); } lr_ignore_rest (ldfile, 1); } @@ -3112,10 +3110,8 @@ collate_read (struct linereader *ldfile, struct localedef_t *result, else { col_sym_free: - if (symbol != NULL) - free (symbol); - if (endsymbol != NULL) - free (endsymbol); + free (symbol); + free (endsymbol); } } break; diff --git a/locale/programs/linereader.c b/locale/programs/linereader.c index 8a04e32..2e20e5d 100644 --- a/locale/programs/linereader.c +++ b/locale/programs/linereader.c @@ -859,8 +859,7 @@ non-symbolic character value should not be used")); if (illegal_string) { free (buf); - if (buf2 != NULL) - free (buf2); + free (buf2); lr->token.val.str.startmb = NULL; lr->token.val.str.lenmb = 0; lr->token.val.str.startwc = NULL; |