Skip to content

Commit

Permalink
kconfig: massage the loop in conf_read_simple()
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Masahiro Yamada committed Nov 28, 2023
1 parent 4aced3e commit 48ab6c9
Showing 1 changed file with 13 additions and 6 deletions.
19 changes: 13 additions & 6 deletions scripts/kconfig/confdata.c
Original file line number Diff line number Diff line change
Expand Up @@ -443,6 +443,10 @@ int conf_read_simple(const char *name, int def)

while (getline_stripped(&line, &line_asize, in) != -1) {
conf_lineno++;

if (!line[0]) /* blank line */
continue;

if (line[0] == '#') {
if (line[1] != ' ')
continue;
Expand All @@ -458,17 +462,20 @@ int conf_read_simple(const char *name, int def)
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);
Expand Down

0 comments on commit 48ab6c9

Please sign in to comment.