From: Masahiro Yamada <masahiroy@kernel.org>
To: linux-kbuild@vger.kernel.org
Cc: Masahiro Yamada <masahiroy@kernel.org>, linux-kernel@vger.kernel.org
Subject: [PATCH 6/6] kconfig: remove redundant NULL pointer check before free()
Date: Sun, 3 Dec 2023 19:25:28 +0900 [thread overview]
Message-ID: <20231203102528.1913822-6-masahiroy@kernel.org> (raw)
In-Reply-To: <20231203102528.1913822-1-masahiroy@kernel.org>
Passing NULL to free() is allowed and is a no-op.
Remove redundant NULL pointer checks.
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
---
scripts/kconfig/confdata.c | 3 +--
scripts/kconfig/util.c | 3 +--
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/scripts/kconfig/confdata.c b/scripts/kconfig/confdata.c
index bd14aae1db58..f1197e672431 100644
--- a/scripts/kconfig/confdata.c
+++ b/scripts/kconfig/confdata.c
@@ -432,8 +432,7 @@ int conf_read_simple(const char *name, int def)
case S_INT:
case S_HEX:
case S_STRING:
- if (sym->def[def].val)
- free(sym->def[def].val);
+ free(sym->def[def].val);
/* fall through */
default:
sym->def[def].val = NULL;
diff --git a/scripts/kconfig/util.c b/scripts/kconfig/util.c
index b78f114ad48c..92e5b2b9761d 100644
--- a/scripts/kconfig/util.c
+++ b/scripts/kconfig/util.c
@@ -42,8 +42,7 @@ struct gstr str_new(void)
/* 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;
}
--
2.40.1
prev parent reply other threads:[~2023-12-03 10:26 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-12-03 10:25 [PATCH 1/6] kconfig: factor out common code shared by mconf and nconf Masahiro Yamada
2023-12-03 10:25 ` [PATCH 2/6] kconfig: make menu_warn() static function Masahiro Yamada
2023-12-03 10:25 ` [PATCH 3/6] kconfig: squash menu_has_help() and menu_get_help() Masahiro Yamada
2023-12-03 10:25 ` [PATCH 4/6] kconfig: add include guard to lkc_proto.h Masahiro Yamada
2023-12-03 10:25 ` [PATCH 5/6] kconfig: remove unreachable printf() Masahiro Yamada
2023-12-03 10:25 ` Masahiro Yamada [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231203102528.1913822-6-masahiroy@kernel.org \
--to=masahiroy@kernel.org \
--cc=linux-kbuild@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®