projects
/
carl9170fw.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
kconfig: remove duplicated file name and lineno of recursive inclusion
[carl9170fw.git]
/
config
/
zconf.l
diff --git
a/config/zconf.l
b/config/zconf.l
index cb495790f447267c23c61ba5bd3df03406521af1..0e8b892ba68303899890321b9c02341e166a4bae 100644
(file)
--- a/
config/zconf.l
+++ b/
config/zconf.l
@@
-328,14
+328,13
@@
void zconf_nextfile(const char *name)
for (iter = current_file->parent; iter; iter = iter->parent ) {
if (!strcmp(current_file->name,iter->name) ) {
fprintf(stderr,
for (iter = current_file->parent; iter; iter = iter->parent ) {
if (!strcmp(current_file->name,iter->name) ) {
fprintf(stderr,
- "%s:%d: recursive inclusion detected. "
- "Inclusion path:\n current file : '%s'\n",
- zconf_curname(), zconf_lineno(),
- zconf_curname());
+ "Recursive inclusion detected.\n"
+ "Inclusion path:\n"
+ " current file : %s\n", zconf_curname());
iter = current_file;
do {
iter = iter->parent;
iter = current_file;
do {
iter = iter->parent;
- fprintf(stderr, " included from:
'%s:%d'
\n",
+ fprintf(stderr, " included from:
%s:%d
\n",
iter->name, iter->lineno - 1);
} while (strcmp(iter->name, current_file->name));
exit(1);
iter->name, iter->lineno - 1);
} while (strcmp(iter->name, current_file->name));
exit(1);