Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 283081
b: refs/heads/master
c: bfcb2cc
h: refs/heads/master
i:
  283079: d1ae240
v: v3
  • Loading branch information
Andy Whitcroft authored and Linus Torvalds committed Jan 11, 2012
1 parent 22ec9ad commit 65dfc65
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 6b48db24e30d371bc54566667b82ca3d64aab80a
refs/heads/master: bfcb2cc798a14230d22b6dd999e2e680623de622
11 changes: 7 additions & 4 deletions trunk/scripts/checkpatch.pl
Original file line number Diff line number Diff line change
Expand Up @@ -2209,8 +2209,9 @@ sub process {

# * goes on variable not on type
# (char*[ const])
if ($line =~ m{\($NonptrType(\s*(?:$Modifier\b\s*|\*\s*)+)\)}) {
my ($from, $to) = ($1, $1);
while ($line =~ m{(\($NonptrType(\s*(?:$Modifier\b\s*|\*\s*)+)\))}g) {
#print "AA<$1>\n";
my ($from, $to) = ($2, $2);

# Should start with a space.
$to =~ s/^(\S)/ $1/;
Expand All @@ -2225,8 +2226,10 @@ sub process {
ERROR("POINTER_LOCATION",
"\"(foo$from)\" should be \"(foo$to)\"\n" . $herecurr);
}
} elsif ($line =~ m{\b$NonptrType(\s*(?:$Modifier\b\s*|\*\s*)+)($Ident)}) {
my ($from, $to, $ident) = ($1, $1, $2);
}
while ($line =~ m{(\b$NonptrType(\s*(?:$Modifier\b\s*|\*\s*)+)($Ident))}g) {
#print "BB<$1>\n";
my ($from, $to, $ident) = ($2, $2, $3);

# Should start with a space.
$to =~ s/^(\S)/ $1/;
Expand Down

0 comments on commit 65dfc65

Please sign in to comment.