summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorPaul Bolle <pebolle@tiscali.nl>2016-03-16 21:27:27 +0100
committerMichal Marek <mmarek@suse.com>2016-05-10 17:20:19 +0200
commita4663911392efdc504ce97b192d46f2677a6fe35 (patch)
tree00a29ed653e959ebee9bccaf50b8f3f2626f9a7f /scripts
parentf55532a0c0b8bb6148f4e07853b876ef73bc69ca (diff)
downloadlinux-stable-a4663911392efdc504ce97b192d46f2677a6fe35.tar.gz
linux-stable-a4663911392efdc504ce97b192d46f2677a6fe35.tar.bz2
linux-stable-a4663911392efdc504ce97b192d46f2677a6fe35.zip
kconfig: add unexpected data itself to warning
If the .config parser runs into unexpected data it emits warnings like: .config:6911:warning: unexpected data Add the unexpected data itself to this warning. That makes it easier to discover what is actually going wrong: .config:6911:warning: unexpected data: CONFOG_CHARGER_TPS65217=m Signed-off-by: Paul Bolle <pebolle@tiscali.nl> Signed-off-by: Michal Marek <mmarek@suse.com>
Diffstat (limited to 'scripts')
-rw-r--r--scripts/kconfig/confdata.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/scripts/kconfig/confdata.c b/scripts/kconfig/confdata.c
index dd243d2abd87..297b079ae4d9 100644
--- a/scripts/kconfig/confdata.c
+++ b/scripts/kconfig/confdata.c
@@ -375,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: