summaryrefslogtreecommitdiff
path: root/source4/pidl/lib/Parse/Pidl
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2008-01-31 14:48:15 +0100
committerStefan Metzmacher <metze@samba.org>2008-01-31 15:56:57 +0100
commite6362c4d8c287af7a884d6b7f66b86106d6b5ee7 (patch)
treec8c62dc4c30ff1a314c0bd5914ce9ad1098d0014 /source4/pidl/lib/Parse/Pidl
parent8398982ac998d98cb1184f2b6d2631f1cfc9b3f8 (diff)
downloadsamba-e6362c4d8c287af7a884d6b7f66b86106d6b5ee7.tar.gz
samba-e6362c4d8c287af7a884d6b7f66b86106d6b5ee7.tar.bz2
samba-e6362c4d8c287af7a884d6b7f66b86106d6b5ee7.zip
pidl/Samba4::NDR::Parser: pass down the correct $var_name to AllocateArrayLevel()
metze (This used to be commit c630bece38eed3278466c2934763fcd8dcfb0610)
Diffstat (limited to 'source4/pidl/lib/Parse/Pidl')
-rw-r--r--source4/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm6
1 files changed, 2 insertions, 4 deletions
diff --git a/source4/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm b/source4/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm
index 02d3a80992..9350a1087d 100644
--- a/source4/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm
+++ b/source4/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm
@@ -375,7 +375,7 @@ sub ParseArrayPullHeader($$$$$$)
}
if (not $l->{IS_FIXED} and not is_charset_array($e, $l)) {
- $self->AllocateArrayLevel($e,$l,$ndr,$env,$size);
+ $self->AllocateArrayLevel($e,$l,$ndr,$var_name,$size);
}
return $length;
@@ -2058,9 +2058,7 @@ sub ParseFunctionPush($$)
sub AllocateArrayLevel($$$$$$)
{
- my ($self,$e,$l,$ndr,$env,$size) = @_;
-
- my $var = ParseExpr($e->{NAME}, $env, $e->{ORIGINAL});
+ my ($self,$e,$l,$ndr,$var,$size) = @_;
my $pl = GetPrevLevel($e, $l);
if (defined($pl) and