mirror of
https://github.com/torvalds/linux.git
synced 2024-11-10 14:11:52 +00:00
checkpatch: warn on embedded function names
Embedded function names are less appropriate to use when refactoring can cause function renaming. Prefer the use of "%s", __func__ to embedded function names. Link: http://lkml.kernel.org/r/ac9631fdbac5af3507c5bfe88ad9064f0ed764ec.1483510416.git.joe@perches.com Signed-off-by: Joe Perches <joe@perches.com> Acked-by: Andy Whitcroft <apw@canonical.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
69c78423b8
commit
77cb8546bc
@ -2134,7 +2134,7 @@ sub process {
|
||||
my $in_header_lines = $file ? 0 : 1;
|
||||
my $in_commit_log = 0; #Scanning lines before patch
|
||||
my $has_commit_log = 0; #Encountered lines before patch
|
||||
my $commit_log_possible_stack_dump = 0;
|
||||
my $commit_log_possible_stack_dump = 0;
|
||||
my $commit_log_long_line = 0;
|
||||
my $commit_log_has_diff = 0;
|
||||
my $reported_maintainer_file = 0;
|
||||
@ -2154,6 +2154,7 @@ sub process {
|
||||
my $realline = 0;
|
||||
my $realcnt = 0;
|
||||
my $here = '';
|
||||
my $context_function; #undef'd unless there's a known function
|
||||
my $in_comment = 0;
|
||||
my $comment_edge = 0;
|
||||
my $first_line = 0;
|
||||
@ -2192,7 +2193,8 @@ sub process {
|
||||
}
|
||||
#next;
|
||||
}
|
||||
if ($rawline=~/^\@\@ -\d+(?:,\d+)? \+(\d+)(,(\d+))? \@\@/) {
|
||||
if ($rawline=~/^\@\@ -\d+(?:,\d+)? \+(\d+)(,(\d+))? \@\@(.*)/) {
|
||||
my $context = $4;
|
||||
$realline=$1-1;
|
||||
if (defined $2) {
|
||||
$realcnt=$3+1;
|
||||
@ -2201,6 +2203,12 @@ sub process {
|
||||
}
|
||||
$in_comment = 0;
|
||||
|
||||
if ($context =~ /\b(\w+)\s*\(/) {
|
||||
$context_function = $1;
|
||||
} else {
|
||||
undef $context_function;
|
||||
}
|
||||
|
||||
# Guestimate if this is a continuing comment. Run
|
||||
# the context looking for a comment "edge". If this
|
||||
# edge is a close comment then we must be in a comment
|
||||
@ -5157,6 +5165,16 @@ sub process {
|
||||
"break quoted strings at a space character\n" . $hereprev);
|
||||
}
|
||||
|
||||
#check for an embedded function name in a string when the function is known
|
||||
# as part of a diff. This does not work for -f --file checking as it
|
||||
#depends on patch context providing the function name
|
||||
if ($line =~ /^\+.*$String/ &&
|
||||
defined($context_function) &&
|
||||
get_quoted_string($line, $rawline) =~ /\b$context_function\b/) {
|
||||
WARN("EMBEDDED_FUNCTION_NAME",
|
||||
"Prefer using \"%s\", __func__ to embedded function names\n" . $herecurr);
|
||||
}
|
||||
|
||||
# check for spaces before a quoted newline
|
||||
if ($rawline =~ /^.*\".*\s\\n/) {
|
||||
if (WARN("QUOTED_WHITESPACE_BEFORE_NEWLINE",
|
||||
|
Loading…
Reference in New Issue
Block a user