mirror of
https://git.busybox.net/busybox.git
synced 2024-11-23 13:43:28 +08:00
fix if(p)/free(p) construct
No need of explicit NULL check before free. Signed-off-by: Maninder Singh <maninder1.s@samsung.com> Signed-off-by: Akhilesh Kumar <akhilesh.k@samsung.com> Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
parent
d90899206d
commit
0fabedf085
@ -44,8 +44,7 @@ void blkid_free_dev(blkid_dev dev)
|
||||
bit_tags);
|
||||
blkid_free_tag(tag);
|
||||
}
|
||||
if (dev->bid_name)
|
||||
free(dev->bid_name);
|
||||
free(dev->bid_name);
|
||||
free(dev);
|
||||
}
|
||||
|
||||
|
@ -354,12 +354,9 @@ static void parse_escape(char *word)
|
||||
|
||||
static void free_instance(struct fsck_instance *i)
|
||||
{
|
||||
if (i->prog)
|
||||
free(i->prog);
|
||||
if (i->device)
|
||||
free(i->device);
|
||||
if (i->base_device)
|
||||
free(i->base_device);
|
||||
free(i->prog);
|
||||
free(i->device);
|
||||
free(i->base_device);
|
||||
free(i);
|
||||
}
|
||||
|
||||
@ -432,8 +429,7 @@ static int parse_fstab_line(char *line, struct fs_info **ret_fs)
|
||||
fs = create_fs_device(device, mntpnt, type ? type : "auto", opts,
|
||||
freq ? atoi(freq) : -1,
|
||||
passno ? atoi(passno) : -1);
|
||||
if (dev)
|
||||
free(dev);
|
||||
free(dev);
|
||||
|
||||
if (!fs)
|
||||
return -1;
|
||||
|
@ -124,8 +124,7 @@ int conf_read_simple(const char *name)
|
||||
case S_INT:
|
||||
case S_HEX:
|
||||
case S_STRING:
|
||||
if (sym->user.val)
|
||||
free(sym->user.val);
|
||||
free(sym->user.val);
|
||||
default:
|
||||
sym->user.val = NULL;
|
||||
sym->user.tri = no;
|
||||
|
@ -79,8 +79,7 @@ struct gstr str_assign(const char *s)
|
||||
/* Free storage for growable string */
|
||||
void str_free(struct gstr *gs)
|
||||
{
|
||||
if (gs->s)
|
||||
free(gs->s);
|
||||
free(gs->s);
|
||||
gs->s = NULL;
|
||||
gs->len = 0;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user