Lines with incorrect spacing around an operator, such as:
bystander, correct,incorrect
would get "fixed" to
bystander,correct, incorrect
as the correct argument as well as the incorrectly-spaced operator
were both being trimmed. The correct argument only needs to be
right trimmed.
Signed-off-by: Phil Carmody <phil.carm...@partner.samsung.com>
---
scripts/checkpatch.pl | 19 +++++++++++++------
1 file changed, 13 insertions(+), 6 deletions(-)
diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index 2ee9eb7..b5f4157 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -1432,6 +1432,13 @@ sub check_absolute_file {
}
}
+sub rtrim {
+ my ($string) = @_;
+
+ $string =~ s/\s+$//;
+
+ return $string;
+}
sub trim {
my ($string) = @_;
@@ -2852,7 +2859,7 @@ sub process {
if ($ctx !~ /.x[WEC]/ && $cc !~ /^}/) {
if (ERROR("SPACING",
"space required after
that '$op' $at\n" . $hereptr)) {
- $good =
trim($fix_elements[$n]) . trim($fix_elements[$n + 1]) . " ";
+ $good =
rtrim($fix_elements[$n]) . trim($fix_elements[$n + 1]) . " ";
$line_fixed = 1;
}
}
@@ -2881,7 +2888,7 @@ sub process {
if (ERROR("SPACING",
"space prohibited
after that '$op' $at\n" . $hereptr)) {
$fixed_line =~ s/\s+$//;
- $good =
trim($fix_elements[$n]) . trim($fix_elements[$n + 1]);
+ $good =
rtrim($fix_elements[$n]) . trim($fix_elements[$n + 1]);
$line_fixed = 1;
if (defined
$fix_elements[$n + 2]) {
$fix_elements[$n + 2] =~ s/^\s+//;
@@ -2904,7 +2911,7 @@ sub process {
if (ERROR("SPACING",
"space prohibited
before that '$op' $at\n" . $hereptr)) {
$fixed_line =~ s/\s+$//;
- $good =
trim($fix_elements[$n]) . trim($fix_elements[$n + 1]);
+ $good =
rtrim($fix_elements[$n]) . trim($fix_elements[$n + 1]);
$line_fixed = 1;
}
}
@@ -2912,7 +2919,7 @@ sub process {
if (ERROR("SPACING",
"space prohibited
after that '$op' $at\n" . $hereptr)) {
$fixed_line =~ s/\s+$//;
- $good =
trim($fix_elements[$n]) . trim($fix_elements[$n + 1]);
+ $good =
rtrim($fix_elements[$n]) . trim($fix_elements[$n + 1]);
$line_fixed = 1;
if (defined
$fix_elements[$n + 2]) {
$fix_elements[$n + 2] =~ s/^\s+//;
@@ -2931,7 +2938,7 @@ sub process {
if (ERROR("SPACING",
"need consistent
spacing around '$op' $at\n" . $hereptr)) {
$fixed_line =~ s/\s+$//;
- $good =
trim($fix_elements[$n]) . " " . trim($fix_elements[$n + 1]) . " ";
+ $good =
rtrim($fix_elements[$n]) . " " . trim($fix_elements[$n + 1]) . " ";
$line_fixed = 1;
}
}
@@ -2942,7 +2949,7 @@ sub process {
if ($ctx =~ /Wx./) {
if (ERROR("SPACING",
"space prohibited
before that '$op' $at\n" . $hereptr)) {
- $good =
trim($fix_elements[$n]) . trim($fix_elements[$n + 1]);
+ $good =
rtrim($fix_elements[$n]) . trim($fix_elements[$n + 1]);
$line_fixed = 1;
}
}
--
1.7.9.5
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
