lkml.org 
[lkml]   [2024]   [Feb]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 13/27] kconfig: replace file->name with name in zconf_nextfile()
    Date
    The 'file->name' and 'name' are the same in this function.

    Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
    ---

    scripts/kconfig/lexer.l | 10 +++++-----
    1 file changed, 5 insertions(+), 5 deletions(-)

    diff --git a/scripts/kconfig/lexer.l b/scripts/kconfig/lexer.l
    index 3b3893f673dc..35ad1b256470 100644
    --- a/scripts/kconfig/lexer.l
    +++ b/scripts/kconfig/lexer.l
    @@ -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);
    }
    }
    --
    2.40.1

    \
     
     \ /
      Last update: 2024-05-27 14:46    [W:4.774 / U:0.020 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site