diff options
| author | Andrew Tridgell <tridge@samba.org> | 2009-09-12 11:15:38 +1000 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2009-09-12 11:15:38 +1000 |
| commit | fe36b8af64195f10acead12d4a4f426cc8772a8c (patch) | |
| tree | af98810b529728d46a10f0ac1e2d3203b63323a2 /source3/script | |
| parent | 51fd80647de9cb531181eb1eeefe9ad2c473f784 (diff) | |
| parent | bbc0a56da59df8b7cd6f19f99cfaac9c3909779f (diff) | |
Merge branch 'master' of /home/tridge/samba/git/combined
Diffstat (limited to 'source3/script')
| -rw-r--r-- | source3/script/mksyms.awk | 8 | ||||
| -rwxr-xr-x | source3/script/mksyms.sh | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/source3/script/mksyms.awk b/source3/script/mksyms.awk index a30bea4d34..94a405ca68 100644 --- a/source3/script/mksyms.awk +++ b/source3/script/mksyms.awk @@ -4,7 +4,7 @@ # Extract symbols to export from C-header files. # output in version-script format for linking shared libraries. # -# Copyright (C) 2008 Micheal Adam <obnox@samba.org> +# Copyright (C) 2008 Michael Adam <obnox@samba.org> # BEGIN { inheader=0; @@ -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; } diff --git a/source3/script/mksyms.sh b/source3/script/mksyms.sh index 714d55abae..7fb4031e2b 100755 --- a/source3/script/mksyms.sh +++ b/source3/script/mksyms.sh @@ -8,7 +8,7 @@ # # This is the shell wrapper for the mksyms.awk core script. # -# Copyright (C) 2008 Micheal Adam <obnox@samba.org> +# Copyright (C) 2008 Michael Adam <obnox@samba.org> # LANG=C; export LANG |