2016-03-16 20:27:34

by Paul Bolle

[permalink] [raw]
Subject: [PATCH v2] 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 <[email protected]>
---
This v2 uses strcspn, as Michal suggesed. That turns a two patch series into a
more elegant oneliner. It apparently pays off to know what string.h has to
offer!

scripts/kconfig/confdata.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/scripts/kconfig/confdata.c b/scripts/kconfig/confdata.c
index 0b7dc2fd7bac..6e22176cd6d6 100644
--- a/scripts/kconfig/confdata.c
+++ b/scripts/kconfig/confdata.c
@@ -377,7 +377,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:
--
2.4.3


2016-04-27 19:20:23

by Paul Bolle

[permalink] [raw]
Subject: Re: [PATCH v2] kconfig: add unexpected data itself to warning

Hi Michal,

On wo, 2016-03-16 at 21:27 +0100, Paul Bolle wrote:
> 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 <[email protected]>
> ---
> This v2 uses strcspn, as Michal suggesed. That turns a two patch series into a
> more elegant oneliner. It apparently pays off to know what string.h has to
> offer!

Nothing happened after I sent v2, as far as I can tell. Did this
oneliner fall through the cracks?

Thanks,


Paul Bolle