summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMasahiro Yamada <masahiroy@kernel.org>2023-11-18 10:59:12 +0300
committerMasahiro Yamada <masahiroy@kernel.org>2023-11-28 05:22:51 +0300
commit48ab6c9c9256003a4f2d737ccdcba81e01ba4e68 (patch)
tree5dc8df2ff1b72abbf4e0755fca53d313483ccfb6
parent4aced3ec84a848bd64bfd725e81c54eb31bf8b24 (diff)
downloadlinux-48ab6c9c9256003a4f2d737ccdcba81e01ba4e68.tar.xz
kconfig: massage the loop in conf_read_simple()
Make the while-loop code a little more readable. The gain is that "CONFIG_FOO" without '=' is warned as unexpected data. Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
-rw-r--r--scripts/kconfig/confdata.c19
1 files changed, 13 insertions, 6 deletions
diff --git a/scripts/kconfig/confdata.c b/scripts/kconfig/confdata.c
index 958be12cd621..bd14aae1db58 100644
--- a/scripts/kconfig/confdata.c
+++ b/scripts/kconfig/confdata.c
@@ -443,6 +443,10 @@ load:
while (getline_stripped(&line, &line_asize, in) != -1) {
conf_lineno++;
+
+ if (!line[0]) /* blank line */
+ continue;
+
if (line[0] == '#') {
if (line[1] != ' ')
continue;
@@ -458,17 +462,20 @@ load:
continue;
val = "n";
- } else if (memcmp(line, CONFIG_, strlen(CONFIG_)) == 0) {
+ } else {
+ if (memcmp(line, CONFIG_, strlen(CONFIG_))) {
+ conf_warning("unexpected data: %s", line);
+ continue;
+ }
+
sym_name = line + strlen(CONFIG_);
p = strchr(sym_name, '=');
- if (!p)
+ if (!p) {
+ conf_warning("unexpected data: %s", line);
continue;
+ }
*p = 0;
val = p + 1;
- } else {
- if (line[0] != '\0')
- conf_warning("unexpected data: %s", line);
- continue;
}
sym = sym_find(sym_name);