svn commit: samba r7121 - in branches/SAMBA_4_0/source/build/pidl: .
jelmer at samba.org
jelmer at samba.org
Mon May 30 23:14:00 GMT 2005
Author: jelmer
Date: 2005-05-30 23:13:59 +0000 (Mon, 30 May 2005)
New Revision: 7121
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=7121
Log:
More subcontext fixes. A subcontext does not always imply internally deferred
data, though it might.
Modified:
branches/SAMBA_4_0/source/build/pidl/ndr.pm
branches/SAMBA_4_0/source/build/pidl/ndr_parser.pm
Changeset:
Modified: branches/SAMBA_4_0/source/build/pidl/ndr.pm
===================================================================
--- branches/SAMBA_4_0/source/build/pidl/ndr.pm 2005-05-30 22:44:17 UTC (rev 7120)
+++ branches/SAMBA_4_0/source/build/pidl/ndr.pm 2005-05-30 23:13:59 UTC (rev 7121)
@@ -179,7 +179,6 @@
return 1 if ($e->{POINTERS});
return 0 if (typelist::is_scalar($e->{TYPE}));
- return 1 if (defined(util::has_property($e, "subcontext")));
return 1 unless (typelist::hasType($e->{TYPE})); # assume the worst
my $type = typelist::getType($e->{TYPE});
Modified: branches/SAMBA_4_0/source/build/pidl/ndr_parser.pm
===================================================================
--- branches/SAMBA_4_0/source/build/pidl/ndr_parser.pm 2005-05-30 22:44:17 UTC (rev 7120)
+++ branches/SAMBA_4_0/source/build/pidl/ndr_parser.pm 2005-05-30 23:13:59 UTC (rev 7121)
@@ -489,8 +489,6 @@
my $ndr_flags = shift;
my $retndr = "_ndr_$e->{NAME}";
- return unless ($ndr_flags =~ /NDR_SCALARS/);
-
pidl "{";
indent;
pidl "struct ndr_push *$retndr;";
@@ -518,8 +516,6 @@
my $ndr_flags = shift;
my $ndr = "_ndr_$e->{NAME}";
- return unless ($ndr_flags =~ /NDR_SCALARS/);
-
if (defined $l->{COMPRESSION}) {
ParseCompressionPushEnd($e, $l, $ndr);
}
@@ -544,7 +540,7 @@
my $env = shift;
my $retndr = "_ndr_$e->{NAME}";
- pidl "if (($ndr_flags) & NDR_SCALARS) {";
+ pidl "{";
indent;
pidl "struct ndr_pull *$retndr;";
pidl "NDR_ALLOC(ndr, $retndr);";
More information about the samba-cvs
mailing list