diff options
| author | Michael Adam <obnox@samba.org> | 2009-09-11 15:01:46 +0200 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2009-12-16 08:03:46 +0100 |
| commit | 6d9ce0ef50a89f19417d40ad7904757e23203c5d (patch) | |
| tree | 8a8ba4b506b2a570cecf166db02adf3a430fb46b | |
| parent | 67da31e2225897739551dca3603fcee50aa7d2e8 (diff) | |
| download | samba-6d9ce0ef50a89f19417d40ad7904757e23203c5d.tar.gz samba-6d9ce0ef50a89f19417d40ad7904757e23203c5d.tar.xz samba-6d9ce0ef50a89f19417d40ad7904757e23203c5d.zip | |
tdb:mksigs: correctly ignode multiline function typedefs
by first concatenating multilint parentheses and removing typefes afterwards.
Michael
(cherry picked from samba commit 13bfcd5a93c47c9db8b644560a1bcc398facb136)
Signed-off-by: Stefan Metzmacher <metze@samba.org>
(This used to be ctdb commit 37225f1ed3f70d7259c2af2c51c671105c34476a)
| -rwxr-xr-x | ctdb/lib/tdb/script/mksigs.pl | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/ctdb/lib/tdb/script/mksigs.pl b/ctdb/lib/tdb/script/mksigs.pl index 3eb90d99dc..ab2e18ec52 100755 --- a/ctdb/lib/tdb/script/mksigs.pl +++ b/ctdb/lib/tdb/script/mksigs.pl @@ -118,11 +118,6 @@ while (my $LINE = <>) { } } - next if ($LINE =~ /^typedef\s/); - next if ($LINE =~ /^enum\s+[^\{\(]+\s+\{/); - next if ($LINE =~ /^struct\s+[^\{\(]+\s+\{.*\}\s*;/); - next if ($LINE =~ /^struct\s+[a-zA-Z0-9_]+\s*;/); - # concetenate function prototypes that stretch over multiple lines $REST = $LINE; my $parenthesis = 0; @@ -156,6 +151,11 @@ while (my $LINE = <>) { } } + next if ($LINE =~ /^typedef\s/); + next if ($LINE =~ /^enum\s+[^\{\(]+\s+\{/); + next if ($LINE =~ /^struct\s+[^\{\(]+\s+\{.*\}\s*;/); + next if ($LINE =~ /^struct\s+[a-zA-Z0-9_]+\s*;/); + # remove trailing spaces $LINE =~ s/(.*?)\s*$/$1/; |