The branch, master has been updated via ea2b9e0fb1dfd433e2dd054272f4ab8a37378178 (commit) via 56c09d2fb23d652e48d5e9e5dcc6557c1a815a6b (commit) via 82404ad3e47010f892dfae8e3633a1a8f5de6630 (commit) via 629ff2b6e2ec7fbd1d1ccac8a7466462aa171d4f (commit) via 7b0e0726310c9b5f89af653ed82266a2f02eb357 (commit) via e60c775835e45cc912660ec253521a9d7f07874c (commit) via fd554799817d9676708d09aa0d71f44195f1d82e (commit) from 55dcf928eb6ce603c5e95a9a80856a4deb33d0c6 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit ea2b9e0fb1dfd433e2dd054272f4ab8a37378178 Author: Michael Adam <ob...@samba.org> Date: Fri Sep 11 15:20:34 2009 +0200 talloc:mksigs: allow PRINTF_ATTRIBUTE(..) macros function types as funcion args Michael commit 56c09d2fb23d652e48d5e9e5dcc6557c1a815a6b Author: Michael Adam <ob...@samba.org> Date: Fri Sep 11 15:16:03 2009 +0200 talloc:mksigs: normalize bool -> _Bool Michael commit 82404ad3e47010f892dfae8e3633a1a8f5de6630 Author: Michael Adam <ob...@samba.org> Date: Fri Sep 11 15:11:16 2009 +0200 talloc:mksigs: ignore symbols (like _DEPRECATED_) after closing function parentheses Michael commit 629ff2b6e2ec7fbd1d1ccac8a7466462aa171d4f Author: Michael Adam <ob...@samba.org> Date: Fri Sep 11 15:01:46 2009 +0200 talloc:mksigs: correctly ignode multiline function typedefs by first concatenating multilint parentheses and removing typefes afterwards. Michael commit 7b0e0726310c9b5f89af653ed82266a2f02eb357 Author: Michael Adam <ob...@samba.org> Date: Fri Sep 11 14:55:52 2009 +0200 talloc:mksigs: ignore struct forward declarations. Michael commit e60c775835e45cc912660ec253521a9d7f07874c Author: Michael Adam <ob...@samba.org> Date: Fri Sep 11 14:54:30 2009 +0200 talloc:mksyms: allow characters after closing functions parenthesis. Michael commit fd554799817d9676708d09aa0d71f44195f1d82e Author: Michael Adam <ob...@samba.org> Date: Fri Sep 11 14:54:02 2009 +0200 talloc:mksyms: allow double pointer return value of functions. Michael ----------------------------------------------------------------------- Summary of changes: lib/talloc/script/mksigs.pl | 15 ++++++++++----- lib/talloc/script/mksyms.awk | 6 +++--- 2 files changed, 13 insertions(+), 8 deletions(-) Changeset truncated at 500 lines: diff --git a/lib/talloc/script/mksigs.pl b/lib/talloc/script/mksigs.pl index 28a2e74..755cd79 100755 --- a/lib/talloc/script/mksigs.pl +++ b/lib/talloc/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/talloc/script/mksyms.awk b/lib/talloc/script/mksyms.awk index a30bea4..ca14da0 100644 --- a/lib/talloc/script/mksyms.awk +++ b/lib/talloc/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