diff options
| author | Sam Ravnborg <sam@ravnborg.org> | 2008-12-27 21:51:59 +0100 |
|---|---|---|
| committer | Sam Ravnborg <sam@ravnborg.org> | 2009-01-02 20:43:22 +0100 |
| commit | 7826005e5a53645d7aab7c13eda76126eadebf0b (patch) | |
| tree | 26d19c6a188ed91f4d1db57f82b5a7cba2bedafe | |
| parent | cf82607a904d3b2ed3d66f8799f00d1099c1849c (diff) | |
| download | kernel_samsung_crespo-7826005e5a53645d7aab7c13eda76126eadebf0b.zip kernel_samsung_crespo-7826005e5a53645d7aab7c13eda76126eadebf0b.tar.gz kernel_samsung_crespo-7826005e5a53645d7aab7c13eda76126eadebf0b.tar.bz2 | |
kconfig: improve error messages for bad source statements
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>
| -rw-r--r-- | scripts/kconfig/lex.zconf.c_shipped | 7 | ||||
| -rw-r--r-- | scripts/kconfig/zconf.l | 7 |
2 files changed, 10 insertions, 4 deletions
diff --git a/scripts/kconfig/lex.zconf.c_shipped b/scripts/kconfig/lex.zconf.c_shipped index 7342ce0..dc3e818 100644 --- a/scripts/kconfig/lex.zconf.c_shipped +++ b/scripts/kconfig/lex.zconf.c_shipped @@ -2370,11 +2370,14 @@ void zconf_nextfile(const char *name) current_buf = buf; 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); } 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); } file->flags |= FILE_BUSY; diff --git a/scripts/kconfig/zconf.l b/scripts/kconfig/zconf.l index 5164ef7..21ff69c 100644 --- a/scripts/kconfig/zconf.l +++ b/scripts/kconfig/zconf.l @@ -314,11 +314,14 @@ void zconf_nextfile(const char *name) current_buf = buf; 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); } 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); } file->flags |= FILE_BUSY; |