Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 117845
b: refs/heads/master
c: 890c78c
h: refs/heads/master
i:
  117843: db19aca
v: v3
  • Loading branch information
Randy Dunlap authored and Linus Torvalds committed Oct 26, 2008
1 parent e1f4f6e commit 144e0b6
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 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: 7eea5b897eb6bbb79d7e6e398f4fbb61fcee57c7
refs/heads/master: 890c78c2d681a8dc89c78eb9177990cad3a77dc3
6 changes: 3 additions & 3 deletions trunk/scripts/kernel-doc
Original file line number Diff line number Diff line change
Expand Up @@ -1648,7 +1648,7 @@ sub dump_function($$) {
$prototype =~ s/^noinline +//;
$prototype =~ s/__devinit +//;
$prototype =~ s/__init +//;
$prototype =~ s/^#define\s+//; #ak added
$prototype =~ s/^#\s*define\s+//; #ak added
$prototype =~ s/__attribute__\s*\(\([a-z,]*\)\)//;

# Yes, this truly is vile. We are looking for:
Expand Down Expand Up @@ -1764,13 +1764,13 @@ sub process_state3_function($$) {

$x =~ s@\/\/.*$@@gos; # strip C99-style comments to end of line

if ($x =~ m#\s*/\*\s+MACDOC\s*#io || ($x =~ /^#/ && $x !~ /^#define/)) {
if ($x =~ m#\s*/\*\s+MACDOC\s*#io || ($x =~ /^#/ && $x !~ /^#\s*define/)) {
# do nothing
}
elsif ($x =~ /([^\{]*)/) {
$prototype .= $1;
}
if (($x =~ /\{/) || ($x =~ /\#define/) || ($x =~ /;/)) {
if (($x =~ /\{/) || ($x =~ /\#\s*define/) || ($x =~ /;/)) {
$prototype =~ s@/\*.*?\*/@@gos; # strip comments.
$prototype =~ s@[\r\n]+@ @gos; # strip newlines/cr's.
$prototype =~ s@^\s+@@gos; # strip leading spaces
Expand Down

0 comments on commit 144e0b6

Please sign in to comment.