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

fix if(p)/free(p) construct

Browse Source 
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:
Maninder Singh 2015-06-01 10:38:07 +00:00 committed by Denys Vlasenko
parent d90899206d
commit 0fabedf085
4 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
e2fsprogs/old_e2fsprogs/blkid/dev.c
View File

@ -44,8 +44,7 @@ void blkid_free_dev(blkid_dev dev)
bit_tags); bit_tags);
blkid_free_tag(tag); blkid_free_tag(tag);
} }
if (dev->bid_name) free(dev->bid_name);
free(dev->bid_name);
free(dev); free(dev);
} }

12
e2fsprogs/old_e2fsprogs/fsck.c
View File

@ -354,12 +354,9 @@ static void parse_escape(char *word)
static void free_instance(struct fsck_instance *i) static void free_instance(struct fsck_instance *i)
{ {
if (i->prog) free(i->prog);
free(i->prog); free(i->device);
if (i->device) free(i->base_device);
free(i->device);
if (i->base_device)
free(i->base_device);
free(i); 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, fs = create_fs_device(device, mntpnt, type ? type : "auto", opts,
freq ? atoi(freq) : -1, freq ? atoi(freq) : -1,
passno ? atoi(passno) : -1); passno ? atoi(passno) : -1);
if (dev) free(dev);
free(dev);
if (!fs) if (!fs)
return -1; return -1;

3
scripts/kconfig/confdata.c
View File

@ -124,8 +124,7 @@ int conf_read_simple(const char *name)
case S_INT: case S_INT:
case S_HEX: case S_HEX:
case S_STRING: case S_STRING:
if (sym->user.val) free(sym->user.val);
free(sym->user.val);
default: default:
sym->user.val = NULL; sym->user.val = NULL;
sym->user.tri = no; sym->user.tri = no;

3
scripts/kconfig/util.c
View File

@ -79,8 +79,7 @@ struct gstr str_assign(const char *s)
/* Free storage for growable string */ /* Free storage for growable string */
void str_free(struct gstr *gs) void str_free(struct gstr *gs)
{ {
if (gs->s) free(gs->s);
free(gs->s);
gs->s = NULL; gs->s = NULL;
gs->len = 0; gs->len = 0;
} }