diff options
| author | Masahiro Yamada <masahiroy@kernel.org> | 2024-02-02 16:58:13 +0100 |
|---|---|---|
| committer | Masahiro Yamada <masahiroy@kernel.org> | 2024-02-19 10:20:40 +0100 |
| commit | 4ff7ceae83bea6afcd0325b88e3f3d9f168cc432 (patch) | |
| tree | 28ad2f97d5bd99b0d60da74091b4c1284d22d7f6 /scripts | |
| parent | kconfig: do not delay the cur_filename update (diff) | |
| download | linux-4ff7ceae83bea6afcd0325b88e3f3d9f168cc432.tar.xz linux-4ff7ceae83bea6afcd0325b88e3f3d9f168cc432.zip | |
kconfig: replace remaining current_file->name with cur_filename
Replace the remaining current_file->name in the lexer context.
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/kconfig/lexer.l | 4 | ||||
| -rw-r--r-- | scripts/kconfig/preprocess.c | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/scripts/kconfig/lexer.l b/scripts/kconfig/lexer.l index 28e279cd5a22..db2397c4e343 100644 --- a/scripts/kconfig/lexer.l +++ b/scripts/kconfig/lexer.l @@ -84,7 +84,7 @@ static void warn_ignored_character(char chr) { fprintf(stderr, "%s:%d:warning: ignoring unsupported character '%c'\n", - current_file->name, yylineno, chr); + cur_filename, yylineno, chr); } %} @@ -253,7 +253,7 @@ n [A-Za-z0-9_-] if (prev_token != T_EOL && prev_token != T_HELPTEXT) fprintf(stderr, "%s:%d:warning: no new line at end of file\n", - current_file->name, yylineno); + cur_filename, yylineno); if (current_file) { zconf_endfile(); diff --git a/scripts/kconfig/preprocess.c b/scripts/kconfig/preprocess.c index 12665b981c3e..69b806a6d8b7 100644 --- a/scripts/kconfig/preprocess.c +++ b/scripts/kconfig/preprocess.c @@ -9,6 +9,7 @@ #include <stdlib.h> #include <string.h> +#include "internal.h" #include "list.h" #include "lkc.h" #include "preprocess.h" @@ -22,7 +23,7 @@ static void __attribute__((noreturn)) pperror(const char *format, ...) { va_list ap; - fprintf(stderr, "%s:%d: ", current_file->name, yylineno); + fprintf(stderr, "%s:%d: ", cur_filename, yylineno); va_start(ap, format); vfprintf(stderr, format, ap); va_end(ap); @@ -123,7 +124,7 @@ static char *do_error_if(int argc, char *argv[]) static char *do_filename(int argc, char *argv[]) { - return xstrdup(current_file->name); + return xstrdup(cur_filename); } static char *do_info(int argc, char *argv[]) @@ -185,8 +186,7 @@ static char *do_shell(int argc, char *argv[]) static char *do_warning_if(int argc, char *argv[]) { if (!strcmp(argv[0], "y")) - fprintf(stderr, "%s:%d: %s\n", - current_file->name, yylineno, argv[1]); + fprintf(stderr, "%s:%d: %s\n", cur_filename, yylineno, argv[1]); return xstrdup(""); } |