diff options
| author |   Bryan Hundven <bryanhundven@gmail.com> | 2016-12-01 16:31:08 (GMT) |
|---|---|---|
| committer |   GitHub <noreply@github.com> | 2016-12-01 16:31:08 (GMT) |
| commit | 812ed6856edef9b77442c5d55e85829f98780f2b (patch) | |
| tree | 0076c63cb51e396b43ae2271bb624f9b595f3e4d /kconfig/confdata.c | |
| parent | 6785440c767c7c0411bbe6e89d60320b8b8161cd (diff) | |
| parent | 89a2182f14dec1f8dd2ff633c65449ca5efda95b (diff) | |
Merge pull request #485 from bhundven/update_kconfig
kconfig: sync upstream changes
Diffstat (limited to 'kconfig/confdata.c')
| -rw-r--r-- | kconfig/confdata.c | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/kconfig/confdata.c b/kconfig/confdata.c index 0b7dc2f..297b079 100644 --- a/kconfig/confdata.c +++ b/kconfig/confdata.c @@ -267,10 +267,8 @@ int conf_read_simple(const char *name, int def) if (in) goto load; sym_add_change_count(1); - if (!sym_defconfig_list) { - sym_calc_value(modules_sym); + if (!sym_defconfig_list) return 1; - } for_all_defaults(sym_defconfig_list, prop) { if (expr_calc_value(prop->visible.expr) == no || @@ -377,7 +375,9 @@ load: continue; } else { if (line[0] != '\r' && line[0] != '\n') - conf_warning("unexpected data"); + conf_warning("unexpected data: %.*s", + (int)strcspn(line, "\r\n"), line); + continue; } setsym: @@ -403,7 +403,6 @@ setsym: } free(line); fclose(in); - sym_calc_value(modules_sym); return 0; } @@ -414,8 +413,12 @@ int conf_read(const char *name) sym_set_change_count(0); - if (conf_read_simple(name, S_DEF_USER)) + if (conf_read_simple(name, S_DEF_USER)) { + sym_calc_value(modules_sym); return 1; + } + + sym_calc_value(modules_sym); for_all_symbols(i, sym) { sym_calc_value(sym); @@ -846,6 +849,7 @@ static int conf_split_config(void) name = conf_get_autoconfig_name(); conf_read_simple(name, S_DEF_AUTO); + sym_calc_value(modules_sym); if (chdir("include/config")) return 1; |