openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

kconfig: replace a `switch()' statement by a more flexible `if()' statement 

With the upcoming dynamical configuration prefix, we can no longer assume that
the prefix will start by a 'C'. As such, we can no longer hardcode this value in
the `case ...:', so replace the `switch() { ... }' statement by a more flexible
'if () { ... }' statement.

Signed-off-by: Arnaud Lacombe <lacombar@gmail.com>
Reviewed-by: Sam Ravnborg <sam@ravnborg.org>
Reviewed-by: Michal Marek <mmarek@suse.cz>
This commit is contained in:
Arnaud Lacombe 2010-08-24 00:14:47 -04:00
parent 71d8066265
commit 8baefd30b5
1 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
scripts/kconfig/confdata.c
View File

@ -221,8 +221,7 @@ int conf_read_simple(const char *name, int def)
while (fgets(line, sizeof(line), in)) { while (fgets(line, sizeof(line), in)) {
conf_lineno++; conf_lineno++;
sym = NULL; sym = NULL;
switch (line[0]) { if (line[0] == '#') {
case '#':
if (memcmp(line + 2, "CONFIG_", 7)) if (memcmp(line + 2, "CONFIG_", 7))
continue; continue;
p = strchr(line + 9, ' '); p = strchr(line + 9, ' ');
@ -254,12 +253,7 @@ int conf_read_simple(const char *name, int def)
default: default:
; ;
} }
break; } else if (memcmp(line, "CONFIG_", 7) == 0) {
case 'C':
if (memcmp(line, "CONFIG_", 7)) {
conf_warning("unexpected data");
continue;
}
p = strchr(line + 7, '='); p = strchr(line + 7, '=');
if (!p) if (!p)
continue; continue;
@ -286,12 +280,9 @@ int conf_read_simple(const char *name, int def)
} }
if (conf_set_sym_val(sym, def, def_flags, p)) if (conf_set_sym_val(sym, def, def_flags, p))
continue; continue;
break; } else {
case '\r': if (line[0] != '\r' && line[0] != '\n')
case '\n': conf_warning("unexpected data");
break;
default:
conf_warning("unexpected data");
continue; continue;
} }
if (sym && sym_is_choice_value(sym)) { if (sym && sym_is_choice_value(sym)) {