From 37225f1ed3f70d7259c2af2c51c671105c34476a Mon Sep 17 00:00:00 2001 From: Michael Adam Date: Fri, 11 Sep 2009 15:01:46 +0200 Subject: [PATCH] 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 --- lib/tdb/script/mksigs.pl | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/tdb/script/mksigs.pl b/lib/tdb/script/mksigs.pl index 3eb90d99..ab2e18ec 100755 --- a/lib/tdb/script/mksigs.pl +++ b/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/; -- 2.34.1