lkml.org 
[lkml]   [2008]   [Sep]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 1/7] checkpatch: case/default checks should only check changed lines
    Date
    We should only be checking changes lines for the trailing statement
    check on case/default statements.

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

    diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
    index 66bcedc..457f874 100755
    --- a/scripts/checkpatch.pl
    +++ b/scripts/checkpatch.pl
    @@ -1363,14 +1363,6 @@ sub process {
    ERROR("switch and case should be at the same indent\n$hereline$err");
    }
    }
    - if ($line =~ /^.\s*(?:case\s*.*|default\s*):/g &&
    - $line !~ /\G(?:
    - (?:\s*{)?(?:\s*$;*)(?:\s*\\)?\s*$|
    - \s*return\s+
    - )/xg)
    - {
    - ERROR("trailing statements should be on next line\n" . $herecurr);
    - }

    # if/while/etc brace do not go on next line, unless defining a do while loop,
    # or if that brace on the next line is for something else
    @@ -1986,6 +1978,15 @@ sub process {
    ERROR("trailing statements should be on next line\n" . $herecurr);
    }
    }
    +# case and default should not have general statements after them
    + if ($line =~ /^.\s*(?:case\s*.*|default\s*):/g &&
    + $line !~ /\G(?:
    + (?:\s*{)?(?:\s*$;*)(?:\s*\\)?\s*$|
    + \s*return\s+
    + )/xg)
    + {
    + ERROR("trailing statements should be on next line\n" . $herecurr);
    + }

    # Check for }<nl>else {, these must be at the same
    # indent level to be relevant to each other.
    --
    1.6.0.rc1.258.g80295


    \
     
     \ /
      Last update: 2008-09-02 19:31    [W:0.031 / U:93.120 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site