Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

kconfig: improve error messages for bad source statements

Browse source 
We now say where we detect the second source of a file,
and where we detect a recursively source of the same file.
This makes it easier to fix such errors.

Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Cc: Roman Zippel <zippel@linux-m68k.org>
This commit is contained in:
Sam Ravnborg 2008-12-27 21:51:59 +01:00
parent cf82607a90
commit 7826005e5a
2 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
scripts/kconfig/lex.zconf.c_shipped
View file

@ -2370,11 +2370,14 @@ void zconf_nextfile(const char *name)
current_buf = buf; current_buf = buf;
if (file->flags & FILE_BUSY) { if (file->flags & FILE_BUSY) {
printf("recursive scan (%s)?\n", name); printf("%s:%d: do not source '%s' from itself\n",
zconf_curname(), zconf_lineno(), name);
exit(1); exit(1);
} }
if (file->flags & FILE_SCANNED) { if (file->flags & FILE_SCANNED) {
printf("file %s already scanned?\n", name); printf("%s:%d: file '%s' is already sourced from '%s'\n",
zconf_curname(), zconf_lineno(), name,
file->parent->name);
exit(1); exit(1);
} }
file->flags |= FILE_BUSY; file->flags |= FILE_BUSY;

7
scripts/kconfig/zconf.l
View file

@ -314,11 +314,14 @@ void zconf_nextfile(const char *name)
current_buf = buf; current_buf = buf;
if (file->flags & FILE_BUSY) { if (file->flags & FILE_BUSY) {
printf("recursive scan (%s)?\n", name); printf("%s:%d: do not source '%s' from itself\n",
zconf_curname(), zconf_lineno(), name);
exit(1); exit(1);
} }
if (file->flags & FILE_SCANNED) { if (file->flags & FILE_SCANNED) {
printf("file %s already scanned?\n", name); printf("%s:%d: file '%s' is already sourced from '%s'\n",
zconf_curname(), zconf_lineno(), name,
file->parent->name);
exit(1); exit(1);
} }
file->flags |= FILE_BUSY; file->flags |= FILE_BUSY;