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-07 15:58:44 +0200
commit31d668651edc6fca45d024283e211533a49c2c4e (patch)
tree33570cd87ceeddfb16b17d91baecda209a3cd93f
parent6c2860d4cfcbf5778e410f598bd2c19b6f0afa83 (diff)
downloadsamba-31d668651edc6fca45d024283e211533a49c2c4e.tar.gz
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 bd8d676c96e..a4957bb5dec 100644
--- a/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm
+++ b/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm
@@ -1845,8 +1845,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
@@ -1923,6 +1921,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;
}