scripts/kernel-doc: simplify signature printing
BugLink: https://bugs.launchpad.net/bugs/2101915 Untangle some of the $is_macro logic and the nested conditionals. This makes it easier to see where and how the signature is actually printed. No functional change. Signed-off-by: Vegard Nossum <vegard.nossum@oracle.com> Signed-off-by: Jonathan Corbet <corbet@lwn.net> Link: https://lore.kernel.org/r/20240215134828.1277109-5-vegard.nossum@oracle.com (cherry picked from commit 9f6f4c110c95a96942004547c84ab22384d9e723) [koichiroden: prereq for "kernel-doc: allow object-like macros in ReST output"] Signed-off-by: Koichiro Den <koichiro.den@canonical.com> Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
This commit is contained in:
committed by
Stefan Bader
parent
397ebb22cc
commit
1ab5cf2a3e
+14
-22
@@ -820,7 +820,6 @@ sub output_function_rst(%) {
|
||||
my %args = %{$_[0]};
|
||||
my ($parameter, $section);
|
||||
my $oldprefix = $lineprefix;
|
||||
my $is_macro = 0;
|
||||
|
||||
my $signature = "";
|
||||
if ($args{'functiontype'} ne "") {
|
||||
@@ -854,37 +853,30 @@ sub output_function_rst(%) {
|
||||
print " **Typedef**: ";
|
||||
$lineprefix = "";
|
||||
output_highlight_rst($args{'purpose'});
|
||||
print "\n\n**Syntax**\n\n ``";
|
||||
$is_macro = 1;
|
||||
print "\n\n**Syntax**\n\n";
|
||||
print " ``$signature``\n\n";
|
||||
} else {
|
||||
print ".. c:function:: ";
|
||||
print ".. c:function:: $signature\n\n";
|
||||
}
|
||||
} else {
|
||||
if ($args{'typedef'} || $args{'functiontype'} eq "") {
|
||||
$is_macro = 1;
|
||||
print ".. c:macro:: ". $args{'function'} . "\n\n";
|
||||
} else {
|
||||
print ".. c:function:: ";
|
||||
}
|
||||
|
||||
if ($args{'typedef'}) {
|
||||
print_lineno($declaration_start_line);
|
||||
print " **Typedef**: ";
|
||||
$lineprefix = "";
|
||||
output_highlight_rst($args{'purpose'});
|
||||
print "\n\n**Syntax**\n\n ``";
|
||||
if ($args{'typedef'}) {
|
||||
print_lineno($declaration_start_line);
|
||||
print " **Typedef**: ";
|
||||
$lineprefix = "";
|
||||
output_highlight_rst($args{'purpose'});
|
||||
print "\n\n**Syntax**\n\n";
|
||||
print " ``$signature``\n\n";
|
||||
} else {
|
||||
print "``$signature``\n\n";
|
||||
}
|
||||
} else {
|
||||
print "``" if ($is_macro);
|
||||
print ".. c:function:: $signature\n\n";
|
||||
}
|
||||
}
|
||||
|
||||
print $signature;
|
||||
|
||||
if ($is_macro) {
|
||||
print "``\n\n";
|
||||
} else {
|
||||
print "\n\n";
|
||||
}
|
||||
if (!$args{'typedef'}) {
|
||||
print_lineno($declaration_start_line);
|
||||
$lineprefix = " ";
|
||||
|
||||
Reference in New Issue
Block a user