colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

contrib/checkpatch: print the actual source name instead of patch name

Browse Source 
This gives more relevant output in a commit check.

Include a couple of small fixes trivial enough not to deserve a separate
commit.
This commit is contained in:
Lubomir Rintel
2018-07-10 13:00:45 +02:00
parent 8149859c02
commit c866df7997
1 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
contrib/scripts/checkpatch.pl
View File

@@ -57,6 +57,7 @@ our $check_line; # Complain if errors are found on this line
our @functions_seen; our @functions_seen;
our $type; our $type;
our $filename; our $filename;
our $line_no;
sub new_hunk sub new_hunk
{ {
@@ -74,22 +75,28 @@ sub complain
my $message = shift; my $message = shift;
return unless $check_line; return unless $check_line;
warn "$ARGV:$.: $message:\n"; warn "$filename:$line_no: $message:\n";
warn "> $line\n\n"; warn "> $line\n\n";
$seen_error = 1; $seen_error = 1;
} }
if ($is_patch) { if ($is_patch) {
# This is a line of an unified diff # This is a line of an unified diff
/^@@/ and new_hunk; if (/^@@.*\+(\d+)/) {
if (/^\+\+\+ (.*)/) { $line_no = $1 - 1;
new_file ($1); new_hunk;
next;
}
if (/^\+\+\+ (b\/)?(.*)/) {
new_file ($2);
next; next;
} }
/^([ \+])(.*)/ or next; /^([ \+])(.*)/ or next;
$line_no++;
$check_line = $1 eq '+'; $check_line = $1 eq '+';
$line = $2; $line = $2;
} elsif ($is_file) { } elsif ($is_file) {
$line_no = $.;
# This is a line from full C file # This is a line from full C file
$check_line = 1; $check_line = 1;
$line = $_; $line = $_;
@@ -129,11 +136,10 @@ if (/^typedef*/) {
} elsif (/^[A-Za-z_][A-Za-z0-9_ ]*\*?$/ and /[a-z]/) { } elsif (/^[A-Za-z_][A-Za-z0-9_ ]*\*?$/ and /[a-z]/) {
# A function type # A function type
$type = $_; $type = $_;
#print "TYPE: >>> $line <<<\n";
next; next;
} elsif ($type and /^([A-Za-z_][A-Za-z0-9_]*)(\s*)\(/) { } elsif ($type and /^([A-Za-z_][A-Za-z0-9_]*)(\s*)\(/) {
my @order = qw/^get_property$ ^set_property$ (?<!_iface|_class)_init$ ^constructor$ ^constructed my @order = qw/^get_property$ ^set_property$ (?<!_iface|_class)_init$ ^constructor$
_new$ ^dispose$ ^finalize$ _class_init/; ^constructed$ _new$ ^dispose$ ^finalize$ _class_init$/;
my @following = (); my @following = ();
my @tmp = (); my @tmp = ();
@@ -145,7 +151,6 @@ if (/^typedef*/) {
foreach my $func (reverse @order) { foreach my $func (reverse @order) {
if ($name =~ /$func/) { if ($name =~ /$func/) {
@following = @tmp; @following = @tmp;
#warn "$name ($func): ".join (' ', @following);
last; last;
} }
push @tmp, $func; push @tmp, $func;
@@ -193,10 +198,11 @@ Check a single file.
Check the currently staged changes. Check the currently staged changes.
=item B<git format-patch --stdout -1 |contrib/scripts/checkpatch.pl || :> =item B<git format-patch -U65535 --stdout -1 |contrib/scripts/checkpatch.pl || :>
A F<.git/hooks/post-commit> oneliner that, wisely, tolerates failures while A F<.git/hooks/post-commit> oneliner that, wisely, tolerates failures while
still providing advice. still providing advice. The large line context allows helps checkpatch.pl
get a better idea about the changes in context of code that does not change.
=back =back