kevin/linux
1
Fork 0
Code

kconfig: massage the loop in conf_read_simple()

Browse Source 
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>
This commit is contained in:
Masahiro Yamada 2023-11-18 16:59:12 +09:00
parent 4aced3ec84
commit 48ab6c9c92
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
scripts/kconfig/confdata.c
View File

@ -443,6 +443,10 @@ load:
while (getline_stripped(&line, &line_asize, in) != -1) { while (getline_stripped(&line, &line_asize, in) != -1) {
conf_lineno++; conf_lineno++;
if (!line[0]) /* blank line */
continue;
if (line[0] == '#') { if (line[0] == '#') {
if (line[1] != ' ') if (line[1] != ' ')
continue; continue;
@ -458,19 +462,22 @@ load:
continue; continue;
val = "n"; val = "n";
} else if (memcmp(line, CONFIG_, strlen(CONFIG_)) == 0) {
sym_name = line + strlen(CONFIG_);
p = strchr(sym_name, '=');
if (!p)
continue;
*p = 0;
val = p + 1;
} else { } else {
if (line[0] != '\0') if (memcmp(line, CONFIG_, strlen(CONFIG_))) {
conf_warning("unexpected data: %s", line); conf_warning("unexpected data: %s", line);
continue; continue;
} }
sym_name = line + strlen(CONFIG_);
p = strchr(sym_name, '=');
if (!p) {
conf_warning("unexpected data: %s", line);
continue;
}
*p = 0;
val = p + 1;
}
sym = sym_find(sym_name); sym = sym_find(sym_name);
if (!sym) { if (!sym) {
if (def == S_DEF_AUTO) { if (def == S_DEF_AUTO) {