mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2025-01-06 05:06:29 +00:00
kconfig: replace file->name with name in zconf_nextfile()
The 'file->name' and 'name' are the same in this function. Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
This commit is contained in:
parent
1a90b0cdc0
commit
fe273c6fc3
@ -420,10 +420,10 @@ void zconf_nextfile(const char *name)
|
||||
buf->yylineno = yylineno;
|
||||
buf->parent = current_buf;
|
||||
current_buf = buf;
|
||||
yyin = zconf_fopen(file->name);
|
||||
yyin = zconf_fopen(name);
|
||||
if (!yyin) {
|
||||
fprintf(stderr, "%s:%d: can't open file \"%s\"\n",
|
||||
cur_filename, cur_lineno, file->name);
|
||||
cur_filename, cur_lineno, name);
|
||||
exit(1);
|
||||
}
|
||||
yy_switch_to_buffer(yy_create_buffer(yyin, YY_BUF_SIZE));
|
||||
@ -432,17 +432,17 @@ void zconf_nextfile(const char *name)
|
||||
file->parent = current_file;
|
||||
|
||||
for (iter = current_file; iter; iter = iter->parent) {
|
||||
if (!strcmp(iter->name, file->name)) {
|
||||
if (!strcmp(iter->name, name)) {
|
||||
fprintf(stderr,
|
||||
"Recursive inclusion detected.\n"
|
||||
"Inclusion path:\n"
|
||||
" current file : %s\n", file->name);
|
||||
" current file : %s\n", name);
|
||||
iter = file;
|
||||
do {
|
||||
iter = iter->parent;
|
||||
fprintf(stderr, " included from: %s:%d\n",
|
||||
iter->name, iter->lineno);
|
||||
} while (strcmp(iter->name, file->name));
|
||||
} while (strcmp(iter->name, name));
|
||||
exit(1);
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user