summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2012-03-15 13:09:51 +0100
committerKarolin Seeger <kseeger@samba.org>2012-04-10 16:48:06 +0200
commitaad9449e56b8bef658821b7cab7baf9e327ce0c2 (patch)
treed87d4bcacc91740f06918eab5c1f79111687975d
parent3cca094514fa4488b4ea2a6747b51443ff02a4f0 (diff)
downloadsamba-aad9449e56b8bef658821b7cab7baf9e327ce0c2.tar.gz
samba-aad9449e56b8bef658821b7cab7baf9e327ce0c2.tar.bz2
samba-aad9449e56b8bef658821b7cab7baf9e327ce0c2.zip
pidl/NDR/Parser: declare all union helper variables in ParseUnionPull()
metze
-rw-r--r--pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm4
1 files changed, 2 insertions, 2 deletions
diff --git a/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm b/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm
index 16ed685cb2..d8cf974957 100644
--- a/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm
+++ b/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm
@@ -1940,8 +1940,6 @@ sub ParseUnionPullPrimitives($$$$$)
if ($el->{TYPE} ne "EMPTY") {
$self->indent;
- $self->DeclarePtrVariables($el);
- $self->DeclareArrayVariables($el);
if (defined($e->{PROPERTIES}{relative_base})) {
$self->pidl("NDR_CHECK(ndr_pull_align($ndr, $el->{ALIGN}));");
# set the current offset as base for relative pointers
@@ -2018,6 +2016,8 @@ sub ParseUnionPull($$$$)
next if ($el->{TYPE} eq "EMPTY");
next if ($double_cases{"$el->{NAME}"});
$self->DeclareMemCtxVariables($el);
+ $self->DeclarePtrVariables($el);
+ $self->DeclareArrayVariables($el);
$double_cases{"$el->{NAME}"} = 1;
}