lkml.org 
[lkml]   [2019]   [Jan]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.9 21/39] kconfig: fix file name and line number of warn_ignored_character()
    Date
    4.9-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    [ Upstream commit 77c1c0fa8b1477c5799bdad65026ea5ff676da44 ]

    Currently, warn_ignore_character() displays invalid file name and
    line number.

    The lexer should use current_file->name and yylineno, while the parser
    should use zconf_curname() and zconf_lineno().

    This difference comes from that the lexer is always going ahead
    of the parser. The parser needs to look ahead one token to make a
    shift/reduce decision, so the lexer is requested to scan more text
    from the input file.

    This commit fixes the warning message from warn_ignored_character().

    [Test Code]

    ----(Kconfig begin)----
    /
    -----(Kconfig end)-----

    [Output]

    Before the fix:

    <none>:0:warning: ignoring unsupported character '/'

    After the fix:

    Kconfig:1:warning: ignoring unsupported character '/'

    Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    scripts/kconfig/zconf.l | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/scripts/kconfig/zconf.l b/scripts/kconfig/zconf.l
    index c410d257da06..6534dc5ac803 100644
    --- a/scripts/kconfig/zconf.l
    +++ b/scripts/kconfig/zconf.l
    @@ -71,7 +71,7 @@ static void warn_ignored_character(char chr)
    {
    fprintf(stderr,
    "%s:%d:warning: ignoring unsupported character '%c'\n",
    - zconf_curname(), zconf_lineno(), chr);
    + current_file->name, yylineno, chr);
    }
    %}

    --
    2.19.1


    \
     
     \ /
      Last update: 2019-01-24 21:08    [W:5.009 / U:0.096 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site