diff options
author | Jelmer Vernooij <jelmer@samba.org> | 2005-08-22 00:22:21 +0000 |
---|---|---|
committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:34:18 -0500 |
commit | 86e796643e2993ef3e3fb8b88faecf1261f01f10 (patch) | |
tree | 7471859573092090df4da1f400fd9d5937ab8375 | |
parent | 2280017bbd8c21f4dc00f28692f57fe0692fcd8a (diff) | |
download | samba-86e796643e2993ef3e3fb8b88faecf1261f01f10.tar.gz samba-86e796643e2993ef3e3fb8b88faecf1261f01f10.tar.bz2 samba-86e796643e2993ef3e3fb8b88faecf1261f01f10.zip |
r9463: Fix DumpFunction() (was ignoring elements)
Fix use of pidl for people that don't have it installed...
Generate documentation for pidl debian package
(This used to be commit de66450c242b943cfb226187b0ad14f380f08479)
-rwxr-xr-x | packaging/debian/rules | 2 | ||||
-rw-r--r-- | source4/pidl/lib/Parse/Pidl/Dump.pm | 6 | ||||
-rwxr-xr-x | source4/pidl/pidl | 5 |
3 files changed, 7 insertions, 6 deletions
diff --git a/packaging/debian/rules b/packaging/debian/rules index 8c62eed660..61002f4a32 100755 --- a/packaging/debian/rules +++ b/packaging/debian/rules @@ -32,7 +32,7 @@ build: configure $(MAKE) -C $(SOURCEPATH) proto -$(MAKE) -C $(SOURCEPATH) pch $(MAKE) -C $(SOURCEPATH) all - $(MAKE) -C $(SOURCEPATH)/pidl all + $(MAKE) -C $(SOURCEPATH)/pidl all doc touch $@ clean: diff --git a/source4/pidl/lib/Parse/Pidl/Dump.pm b/source4/pidl/lib/Parse/Pidl/Dump.pm index bca599262a..7f426c1c0b 100644 --- a/source4/pidl/lib/Parse/Pidl/Dump.pm +++ b/source4/pidl/lib/Parse/Pidl/Dump.pm @@ -208,9 +208,9 @@ sub DumpFunction($) $res .= DumpType($function->{RETURN_TYPE}); $res .= " $function->{NAME}(\n"; - for my $d (@{$function->{DATA}}) { - $first || ($res .= ",\n"); $first = 0; - $res .= DumpElement($d); + for my $d (@{$function->{ELEMENTS}}) { + unless ($first) { $res .= ",\n"; } $first = 0; + $res .= DumpElement($d); } $res .= "\n);\n\n"; diff --git a/source4/pidl/pidl b/source4/pidl/pidl index 14be05c042..1cc2ee44cb 100755 --- a/source4/pidl/pidl +++ b/source4/pidl/pidl @@ -8,8 +8,9 @@ # released under the GNU GPL use strict; - -use lib "lib"; +use FindBin qw($RealBin); +use lib "$RealBin"; +use lib "$RealBin/lib"; use Getopt::Long; use File::Basename; use Parse::Pidl; |