Commit 4ff7ceae authored by Masahiro Yamada's avatar Masahiro Yamada

kconfig: replace remaining current_file->name with cur_filename

Replace the remaining current_file->name in the lexer context.
Signed-off-by: default avatarMasahiro Yamada <masahiroy@kernel.org>
parent d3e4a68f
...@@ -84,7 +84,7 @@ static void warn_ignored_character(char chr) ...@@ -84,7 +84,7 @@ static void warn_ignored_character(char chr)
{ {
fprintf(stderr, fprintf(stderr,
"%s:%d:warning: ignoring unsupported character '%c'\n", "%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_-] ...@@ -253,7 +253,7 @@ n [A-Za-z0-9_-]
if (prev_token != T_EOL && prev_token != T_HELPTEXT) if (prev_token != T_EOL && prev_token != T_HELPTEXT)
fprintf(stderr, "%s:%d:warning: no new line at end of file\n", fprintf(stderr, "%s:%d:warning: no new line at end of file\n",
current_file->name, yylineno); cur_filename, yylineno);
if (current_file) { if (current_file) {
zconf_endfile(); zconf_endfile();
......
...@@ -9,6 +9,7 @@ ...@@ -9,6 +9,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include "internal.h"
#include "list.h" #include "list.h"
#include "lkc.h" #include "lkc.h"
#include "preprocess.h" #include "preprocess.h"
...@@ -22,7 +23,7 @@ static void __attribute__((noreturn)) pperror(const char *format, ...) ...@@ -22,7 +23,7 @@ static void __attribute__((noreturn)) pperror(const char *format, ...)
{ {
va_list ap; va_list ap;
fprintf(stderr, "%s:%d: ", current_file->name, yylineno); fprintf(stderr, "%s:%d: ", cur_filename, yylineno);
va_start(ap, format); va_start(ap, format);
vfprintf(stderr, format, ap); vfprintf(stderr, format, ap);
va_end(ap); va_end(ap);
...@@ -123,7 +124,7 @@ static char *do_error_if(int argc, char *argv[]) ...@@ -123,7 +124,7 @@ static char *do_error_if(int argc, char *argv[])
static char *do_filename(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[]) static char *do_info(int argc, char *argv[])
...@@ -185,8 +186,7 @@ static char *do_shell(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[]) static char *do_warning_if(int argc, char *argv[])
{ {
if (!strcmp(argv[0], "y")) if (!strcmp(argv[0], "y"))
fprintf(stderr, "%s:%d: %s\n", fprintf(stderr, "%s:%d: %s\n", cur_filename, yylineno, argv[1]);
current_file->name, yylineno, argv[1]);
return xstrdup(""); return xstrdup("");
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment