Re: [RESEND PATCH] tools/bootconfig: Fix a compilation issue with missing variable

[Masami Hiramatsu]

On Wed, 8 Sep 2021 09:13:46 +0900
Masami Hiramatsu <mhiramat@xxxxxxxxxx> wrote:

> Hi Punit,
> 
> This has been fixed by Julio's patch and we are waiting for merge.
> 
> https://lore.kernel.org/all/20210831033256.5973-1-jcfaracco@xxxxxxxxx/T/#u

Sorry, I missed thank you message on my previous message.
That's my bad point...

Anyway thanks for the report!


> 
> Thank you,
> 
> On Wed,  8 Sep 2021 08:07:10 +0900
> Punit Agrawal <punitagrawal@xxxxxxxxx> wrote:
> 
> > 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@xxxxxxxxx>
> > Cc: Masami Hiramatsu <mhiramat@xxxxxxxxxx>
> > Cc: Steven Rostedt <rostedt@xxxxxxxxxxx>
> > ---
> > 
> > (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
> > 
> 
> 
> -- 
> Masami Hiramatsu <mhiramat@xxxxxxxxxx>


-- 
Masami Hiramatsu <mhiramat@xxxxxxxxxx>