emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cleanup patch from Denis Vlasenko. Mostly variants of removing the if(x)

Browse Source 
from before "if(x) free(x)".
This commit is contained in:
Rob Landley
2006-03-01 16:39:45 +00:00
parent 93f2286e6e
commit e7c43b66d7
33 changed files with 139 additions and 281 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
e2fsprogs/blkid/tag.c
View File

@@ -41,11 +41,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);
}
@@ -112,8 +109,7 @@ int blkid_set_tag(blkid_dev dev, const char *name,
return -BLKID_ERR_MEM;
t = blkid_find_tag_dev(dev, name);
if (!value) {
if (t)
blkid_free_tag(t);
blkid_free_tag(t);
} else if (t) {
if (!strcmp(t->bit_val, val)) {
/* Same thing, exit */
@@ -165,12 +161,10 @@ int blkid_set_tag(blkid_dev dev, const char *name,
return 0;
errout:
if (t)
blkid_free_tag(t);
else if (val)
blkid_free_tag(t);
if (!t)
free(val);
if (head)
blkid_free_tag(head);
blkid_free_tag(head);
return -BLKID_ERR_MEM;
}