diff options
| author | Jim Meyering | 2009-02-24 15:58:37 +0100 |
|---|---|---|
| committer | Karel Zak | 2009-02-24 16:07:03 +0100 |
| commit | 0e4ed1aab091de221bd54a188691943b1d1c803f (patch) | |
| tree | 328dcb00eef1327797217b867a7cddd37a6d67c1 /libs/blkid/src/tag.c | |
| parent | blkid: don't dereference NULL upon slashless module dependency line (diff) | |
| download | kernel-qcow2-util-linux-0e4ed1aab091de221bd54a188691943b1d1c803f.tar.gz kernel-qcow2-util-linux-0e4ed1aab091de221bd54a188691943b1d1c803f.tar.xz kernel-qcow2-util-linux-0e4ed1aab091de221bd54a188691943b1d1c803f.zip | |
blkid: remove useless if-before-free tests
[kzak@redhat.com: - port the original e2fsprogs patch to util-linux-ng]
Signed-off-by: Jim Meyering <meyering@redhat.com>
Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'libs/blkid/src/tag.c')
| -rw-r--r-- | libs/blkid/src/tag.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/libs/blkid/src/tag.c b/libs/blkid/src/tag.c index 3de6bfa2a..bb9171d99 100644 --- a/libs/blkid/src/tag.c +++ b/libs/blkid/src/tag.c @@ -54,10 +54,8 @@ void blkid_free_tag(blkid_tag tag) list_del(&tag->bit_tags); /* list of tags for this device */ list_del(&tag->bit_names); /* list of tags with this type */ - if (tag->bit_name) - free(tag->bit_name); - if (tag->bit_val) - free(tag->bit_val); + free(tag->bit_name); + free(tag->bit_val); free(tag); } @@ -206,8 +204,7 @@ int blkid_set_tag(blkid_dev dev, const char *name, errout: if (t) blkid_free_tag(t); - else if (val) - free(val); + else free(val); if (head) blkid_free_tag(head); return -BLKID_ERR_MEM; |