From 0fabedf085591b50994e4f8c133bfa87f1777ee4 Mon Sep 17 00:00:00 2001 From: Maninder Singh Date: Mon, 1 Jun 2015 10:38:07 +0000 Subject: fix if(p)/free(p) construct No need of explicit NULL check before free. Signed-off-by: Maninder Singh Signed-off-by: Akhilesh Kumar Signed-off-by: Denys Vlasenko --- scripts/kconfig/confdata.c | 3 +-- scripts/kconfig/util.c | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) (limited to 'scripts/kconfig') diff --git a/scripts/kconfig/confdata.c b/scripts/kconfig/confdata.c index 303df0be7..8f4ecbd33 100644 --- a/scripts/kconfig/confdata.c +++ b/scripts/kconfig/confdata.c @@ -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; diff --git a/scripts/kconfig/util.c b/scripts/kconfig/util.c index 263091945..13369e6a1 100644 --- a/scripts/kconfig/util.c +++ b/scripts/kconfig/util.c @@ -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; } -- cgit v1.2.3