diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2007-01-16 15:51:37 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:43:38 -0500 |
| commit | 85520faa42647c9d7ee7e519d4f2139de82ae4a9 (patch) | |
| tree | 23140e2dea4533e23c583e7a23ee4edf181884a6 /source4/pidl/lib/Parse/Pidl/Samba4.pm | |
| parent | 9119276bbcbc6bfa96d2aa906849b93c97fd44fb (diff) | |
| download | samba-85520faa42647c9d7ee7e519d4f2139de82ae4a9.tar.gz samba-85520faa42647c9d7ee7e519d4f2139de82ae4a9.tar.bz2 samba-85520faa42647c9d7ee7e519d4f2139de82ae4a9.zip | |
r20834: No longer generate extra pointers for top-level [out] unique pointers.
(This used to be commit b967f5851f24a4716d386fc569e384b9320b162a)
Diffstat (limited to 'source4/pidl/lib/Parse/Pidl/Samba4.pm')
| -rw-r--r-- | source4/pidl/lib/Parse/Pidl/Samba4.pm | 29 |
1 files changed, 3 insertions, 26 deletions
diff --git a/source4/pidl/lib/Parse/Pidl/Samba4.pm b/source4/pidl/lib/Parse/Pidl/Samba4.pm index e11bd6a5ff..4ef2daa591 100644 --- a/source4/pidl/lib/Parse/Pidl/Samba4.pm +++ b/source4/pidl/lib/Parse/Pidl/Samba4.pm @@ -7,7 +7,7 @@ package Parse::Pidl::Samba4; require Exporter; @ISA = qw(Exporter); -@EXPORT = qw(is_intree choose_header DeclLong DeclLong_cli IsUniqueOut); +@EXPORT = qw(is_intree choose_header DeclLong); use Parse::Pidl::Util qw(has_property is_constant); use Parse::Pidl::Typelist qw(mapType scalar_is_reference); @@ -32,19 +32,9 @@ sub choose_header($$) return "#include <$out>"; } -sub IsUniqueOut($) -{ - my ($e) = shift; - - return grep(/out/, @{$e->{DIRECTION}}) && - ((($e->{LEVELS}[0]->{TYPE} eq "POINTER") && - ($e->{LEVELS}[0]->{POINTER_TYPE} eq "unique")) || - ($e->{LEVELS}[0]->{TYPE} eq "ARRAY")); -} - -sub DeclLong_int($$) +sub DeclLong($) { - my($element,$cli) = @_; + my($element) = shift; my $ret = ""; if (has_property($element, "represent_as")) { @@ -67,9 +57,6 @@ sub DeclLong_int($$) not has_property($element, "charset"); $numstar++; } - if ($cli && IsUniqueOut($element)) { - $numstar++; - } $ret.="*" foreach (1..$numstar); } $ret.=$element->{NAME}; @@ -81,14 +68,4 @@ sub DeclLong_int($$) return $ret; } -sub DeclLong($) -{ - return DeclLong_int($_, 0); -} - -sub DeclLong_cli($) -{ - return DeclLong_int($_, 1); -} - 1; |