LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
* [RESEND PATCH] tools/bootconfig: Fix a compilation issue with missing variable
@ 2021-09-07 23:07 Punit Agrawal
  2021-09-08  0:13 ` Masami Hiramatsu
                   ` (2 more replies)
  0 siblings, 3 replies; 9+ messages in thread
From: Punit Agrawal @ 2021-09-07 23:07 UTC (permalink / raw)
  To: mhiramat; +Cc: linux-kernel, Punit Agrawal, Steven Rostedt

While looking to build bootconfig tool in order to debug a kernel boot
time issue I noticed that tool fails to compile. The broken changes
were introduced by commit e5efaeb8a8f5 ("bootconfig: Support mixing a
value and subkeys under a key").

Fix the compile issue by introducing a "ret" variable to track the
return value from xbc_node_compose_key().

Fixes: e5efaeb8a8f5 ("bootconfig: Support mixing a value and subkeys under a key")
Signed-off-by: Punit Agrawal <punitagrawal@gmail.com>
Cc: Masami Hiramatsu <mhiramat@kernel.org>
Cc: Steven Rostedt <rostedt@goodmis.org>
---

(Apologies for the resend. I fat-fingered the email address for lkml)

Hi Masami,

I am not sure what went wrong but the patch in the lore link[0]
doesn't match the end result (bad merge?). You may want to recheck the
other changes to make sure it all looks sane.

Regards,
Punit

[0] https://lkml.kernel.org/r/162262194685.264090.7738574774030567419.stgit@devnote2
---
 tools/bootconfig/main.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tools/bootconfig/main.c b/tools/bootconfig/main.c
index f45fa992e01d..fd67496a947f 100644
--- a/tools/bootconfig/main.c
+++ b/tools/bootconfig/main.c
@@ -111,9 +111,11 @@ static void xbc_show_list(void)
 	char key[XBC_KEYLEN_MAX];
 	struct xbc_node *leaf;
 	const char *val;
+	int ret;
 
 	xbc_for_each_key_value(leaf, val) {
-		if (xbc_node_compose_key(leaf, key, XBC_KEYLEN_MAX) < 0) {
+		ret = xbc_node_compose_key(leaf, key, XBC_KEYLEN_MAX);
+		if (ret < 0) {
 			fprintf(stderr, "Failed to compose key %d\n", ret);
 			break;
 		}
-- 
2.32.0


^ permalink raw reply	[flat|nested] 9+ messages in thread

end of thread, other threads:[~2021-09-09  8:31 UTC | newest]

Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-09-07 23:07 [RESEND PATCH] tools/bootconfig: Fix a compilation issue with missing variable Punit Agrawal
2021-09-08  0:13 ` Masami Hiramatsu
2021-09-08  0:27   ` Steven Rostedt
2021-09-08  0:34   ` Masami Hiramatsu
2021-09-08  0:24 ` Steven Rostedt
2021-09-08  0:41   ` Masami Hiramatsu
2021-09-08  0:45     ` Steven Rostedt
2021-09-09  8:31       ` Punit Agrawal
2021-09-08  0:44 ` Steven Rostedt

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).