From: Josh Law <objecting@objecting.org>
To: Masami Hiramatsu <mhiramat@kernel.org>,
Andrew Morton <akpm@linux-foundation.org>
Cc: linux-trace-kernel@vger.kernel.org, linux-kernel@vger.kernel.org,
Josh Law <objecting@objecting.org>
Subject: [PATCH 05/15] lib/bootconfig: fix inconsistent if/else bracing
Date: Sat, 14 Mar 2026 21:45:45 +0000 [thread overview]
Message-ID: <20260314214555.96217-6-objecting@objecting.org> (raw)
In-Reply-To: <20260314214555.96217-1-objecting@objecting.org>
When one branch of a conditional uses braces, both branches should
use them per kernel coding style.
Signed-off-by: Josh Law <objecting@objecting.org>
---
lib/bootconfig.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/lib/bootconfig.c b/lib/bootconfig.c
index e955d2f7e7ca..45db51bc9cc7 100644
--- a/lib/bootconfig.c
+++ b/lib/bootconfig.c
@@ -473,8 +473,9 @@ static struct xbc_node * __init __xbc_add_sibling(char *data, uint32_t flag, boo
sib->next = xbc_node_index(node);
}
}
- } else
+ } else {
xbc_parse_error("Too many nodes", data);
+ }
return node;
}
@@ -992,8 +993,9 @@ int __init xbc_init(const char *data, size_t size, const char **emsg, int *epos)
if (emsg)
*emsg = xbc_err_msg;
_xbc_exit(true);
- } else
+ } else {
ret = xbc_node_num;
+ }
return ret;
}
--
2.34.1
next prev parent reply other threads:[~2026-03-14 21:46 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-03-14 21:45 [PATCH 00/15] bootconfig: fixes, cleanups, and modernization Josh Law
2026-03-14 21:45 ` [PATCH 01/15] lib/bootconfig: add missing __init annotations to static helpers Josh Law
2026-03-14 21:45 ` [PATCH 02/15] lib/bootconfig: fix typo "initiized" in xbc_root_node() kerneldoc Josh Law
2026-03-14 21:45 ` [PATCH 03/15] lib/bootconfig: fix typo "uder" in xbc_node_find_next_leaf() Josh Law
2026-03-14 21:45 ` [PATCH 04/15] lib/bootconfig: add blank line before xbc_get_info() kerneldoc Josh Law
2026-03-14 21:45 ` Josh Law [this message]
2026-03-14 21:45 ` [PATCH 06/15] lib/bootconfig: narrow flag parameter type from uint32_t to uint16_t Josh Law
2026-03-14 21:45 ` [PATCH 07/15] lib/bootconfig: fix inconsistent if/else bracing in __xbc_add_key() Josh Law
2026-03-14 21:45 ` [PATCH 08/15] lib/bootconfig: fix off-by-one in xbc_verify_tree() next node check Josh Law
2026-03-14 21:45 ` [PATCH 09/15] lib/bootconfig: increment xbc_node_num after node init succeeds Josh Law
2026-03-14 21:45 ` [PATCH 10/15] lib/bootconfig: drop redundant memset of xbc_nodes Josh Law
2026-03-14 21:45 ` [PATCH 11/15] bootconfig: use __packed macro for struct xbc_node Josh Law
2026-03-14 21:45 ` [PATCH 12/15] bootconfig: constify xbc_calc_checksum() data parameter Josh Law
2026-03-14 21:45 ` [PATCH 13/15] lib/bootconfig: replace linux/kernel.h with specific includes Josh Law
2026-03-14 21:45 ` [PATCH 14/15] bootconfig: add __packed definition to tools/bootconfig shim header Josh Law
2026-03-14 21:45 ` [PATCH 15/15] lib/bootconfig: return empty string instead of NULL from xbc_node_get_data() Josh Law
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=20260314214555.96217-6-objecting@objecting.org \
--to=objecting@objecting.org \
--cc=akpm@linux-foundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-trace-kernel@vger.kernel.org \
--cc=mhiramat@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