lkml.org 
[lkml]   [2008]   [Oct]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 10/13] checkpatch: trailing statements ensure we report the end of the line
    Date
    When reporting some complex trailing statements we report only the
    starting line of the error, that tends to imply the shown line is in
    error and confuse the reader. As we do know where the actual error is
    report that line too with an appropriate gap marker where applicable.

    #ERROR: trailing statements should be on next line
    #1: FILE: Z202.c:1:
    + for (pbh = page_buffers(bh->b_page); pbh != bh;
    + pbh = pbh->b_this_page, key++);
    #ERROR: trailing statements should be on next line
    #4: FILE: Z202.c:4:
    + for (pbh = page_buffers(bh->b_page);
    [...]
    + pbh = pbh->b_this_page, key++);

    Signed-off-by: Andy Whitcroft <apw@shadowen.org>
    ---
    scripts/checkpatch.pl | 11 ++++++++++-
    1 files changed, 10 insertions(+), 1 deletions(-)

    diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
    index a675f06..2c1afba 100755
    --- a/scripts/checkpatch.pl
    +++ b/scripts/checkpatch.pl
    @@ -2001,7 +2001,16 @@ sub process {
    if (length($c) && $s !~ /^\s*{?\s*\\*\s*$/ &&
    $c !~ /}\s*while\s*/)
    {
    - ERROR("trailing statements should be on next line\n" . $herecurr);
    + # Find out how long the conditional actually is.
    + my @newlines = ($c =~ /\n/gs);
    + my $cond_lines = 1 + $#newlines;
    +
    + my $stat_real = raw_line($linenr, $cond_lines);
    + if (defined($stat_real) && $cond_lines > 1) {
    + $stat_real = "[...]\n$stat_real";
    + }
    +
    + ERROR("trailing statements should be on next line\n" . $herecurr . $stat_real);
    }
    }

    --
    1.6.0.1.451.gc8d31


    \
     
     \ /
      Last update: 2008-10-03 17:53    [W:0.021 / U:31.696 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site