[SCM] Samba Shared Repository - branch master updated - tevent-0-9-8-229-g55dcf928

[Michael Adam]

The branch, master has been updated
       via  55dcf928eb6ce603c5e95a9a80856a4deb33d0c6 (commit)
       via  cfa4e7ec7540d1100649839a10968303189fe929 (commit)
       via  25939a627f15b7a21110767d47be0f50f32d3943 (commit)
       via  13bfcd5a93c47c9db8b644560a1bcc398facb136 (commit)
       via  ecd12bfb382da072595391d5bf11a893d39a0479 (commit)
       via  400f08450b26f38a7dafd1d458542b4d9a8cb19e (commit)
       via  907e05595fdcc4ef77ad627bc0f3732faa59de68 (commit)
      from  6b9298191a72c20e0e81298d06871181dd3b7826 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 55dcf928eb6ce603c5e95a9a80856a4deb33d0c6
Author: Michael Adam <obnox at samba.org>
Date:   Fri Sep 11 15:20:34 2009 +0200

    tdb:mksigs: allow PRINTF_ATTRIBUTE(..) macros function types as funcion args
    
    Michael

commit cfa4e7ec7540d1100649839a10968303189fe929
Author: Michael Adam <obnox at samba.org>
Date:   Fri Sep 11 15:16:03 2009 +0200

    tdb:mksigs: normalize bool -> _Bool
    
    Michael

commit 25939a627f15b7a21110767d47be0f50f32d3943
Author: Michael Adam <obnox at samba.org>
Date:   Fri Sep 11 15:11:16 2009 +0200

    tdb:mksigs: ignore symbols (like _DEPRECATED_) after closing function parentheses
    
    Michael

commit 13bfcd5a93c47c9db8b644560a1bcc398facb136
Author: Michael Adam <obnox at samba.org>
Date:   Fri Sep 11 15:01:46 2009 +0200

    tdb:mksigs: correctly ignode multiline function typedefs
    
    by first concatenating multilint parentheses and removing typefes afterwards.
    
    Michael

commit ecd12bfb382da072595391d5bf11a893d39a0479
Author: Michael Adam <obnox at samba.org>
Date:   Fri Sep 11 14:55:52 2009 +0200

    tdb:mksigs: ignore struct forward declarations.
    
    Michael

commit 400f08450b26f38a7dafd1d458542b4d9a8cb19e
Author: Michael Adam <obnox at samba.org>
Date:   Fri Sep 11 14:54:30 2009 +0200

    tdb:mksyms: allow characters after closing functions parenthesis.
    
    Michael

commit 907e05595fdcc4ef77ad627bc0f3732faa59de68
Author: Michael Adam <obnox at samba.org>
Date:   Fri Sep 11 14:54:02 2009 +0200

    tdb:mksyms: allow double pointer return value of functions.
    
    Michael

-----------------------------------------------------------------------

Summary of changes:
 lib/tdb/script/mksigs.pl  |   15 ++++++++++-----
 lib/tdb/script/mksyms.awk |    6 +++---
 2 files changed, 13 insertions(+), 8 deletions(-)


Changeset truncated at 500 lines:

diff --git a/lib/tdb/script/mksigs.pl b/lib/tdb/script/mksigs.pl
index 28a2e74..755cd79 100755
--- a/lib/tdb/script/mksigs.pl
+++ b/lib/tdb/script/mksigs.pl
@@ -118,10 +118,6 @@ while (my $LINE = <>) {
 		}
 	}
 
-	next if ($LINE =~ /^typedef\s/);
-	next if ($LINE =~ /^enum\s+[^\{\(]+\s+\{/);
-	next if ($LINE =~ /^struct\s+[^\{\(]+\s+\{.*\}\s*;/);
-
 	# concetenate function prototypes that stretch over multiple lines
 	$REST = $LINE;
 	my $parenthesis = 0;
@@ -155,10 +151,16 @@ 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/;
 
-	$LINE =~ s/^(.*\))\s+PRINTF_ATTRIBUTE\(.*\);$/$1;/;
+	$LINE =~ s/^(.*\))\s+PRINTF_ATTRIBUTE\([^\)]*\)(\s*[;,])/$1$2/;
+	$LINE =~ s/^(.*\))\s*[a-zA-Z0-9_]+\s*;$/$1;/;
 
 	# remove parameter names - slightly too coarse probably
 	$LINE =~ s/([\s\(]\*?)[_0-9a-zA-Z]+\s*([,\)])/$1$2/g;
@@ -174,5 +176,8 @@ while (my $LINE = <>) {
 	# normalize unsigned
 	$LINE =~ s/([\s,\(])unsigned([,\)])/$1unsigned int$2/g;
 
+	# normalize bool
+	$LINE =~ s/(\b)bool(\b)/_Bool/g;
+
 	print $LINE . "\n";
 }
diff --git a/lib/tdb/script/mksyms.awk b/lib/tdb/script/mksyms.awk
index a30bea4..ca14da0 100644
--- a/lib/tdb/script/mksyms.awk
+++ b/lib/tdb/script/mksyms.awk
@@ -28,7 +28,7 @@ END {
 		current_file=FILENAME
 	}
 	if (inheader) {
-		if (match($0,"[)][ \t]*[;][ \t]*$")) {
+		if (match($0,"[)][^()]*[;][ \t]*$")) {
 			inheader = 0;
 		}
 		next;
@@ -57,10 +57,10 @@ END {
 	}
 }
 
-/[_A-Za-z0-9]+[ \t]*[(].*[)][ \t]*;[ \t]*$/ {
+/[_A-Za-z0-9]+[ \t]*[(].*[)][^()]*;[ \t]*$/ {
 	sub(/[(].*$/, "");
 	gsub(/[^ \t]+[ \t]+/, "");
-	gsub(/^[*]/, "");
+	gsub(/^[*]+/, "");
 	printf "\t\t%s;\n",$0;
 	next;
 }


-- 
Samba Shared Repository