From: Ahmad Fatoum <a.fatoum@pengutronix.de>
To: barebox@lists.infradead.org
Cc: Ahmad Fatoum <a.fatoum@pengutronix.de>
Subject: [PATCH] boot: omit menu freeing loop when CONFIG_MENU is disabled
Date: Fri, 14 Feb 2025 10:54:12 +0100 [thread overview]
Message-ID: <20250214095412.2852561-1-a.fatoum@pengutronix.de> (raw)
While free() can handle NULL pointers, it's better to not even call
free() when we know at compile-time that the pointers are NULL.
Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
---
common/boot.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/common/boot.c b/common/boot.c
index f6ac4779cc33..ced3b3a3477c 100644
--- a/common/boot.c
+++ b/common/boot.c
@@ -50,13 +50,14 @@ void bootentries_free(struct bootentries *bootentries)
be->release(be);
}
- if (bootentries->menu) {
+ if (IS_ENABLED(CONFIG_MENU) && bootentries->menu) {
int i;
for (i = 0; i < bootentries->menu->display_lines; i++)
free_const(bootentries->menu->display[i]);
free_const(bootentries->menu->display);
+ free(bootentries->menu);
}
- free(bootentries->menu);
+
free(bootentries);
}
--
2.39.5
next reply other threads:[~2025-02-14 10:01 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-02-14 9:54 Ahmad Fatoum [this message]
2025-02-17 9:49 ` Sascha Hauer
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=20250214095412.2852561-1-a.fatoum@pengutronix.de \
--to=a.fatoum@pengutronix.de \
--cc=barebox@lists.infradead.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