summaryrefslogtreecommitdiff
path: root/source4/pidl/lib/Parse
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2007-02-18 23:57:26 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:48:35 -0500
commit5340489807985b3bb4c10eacfa701d643ee7a36c (patch)
tree5b79cf2d3b8edf0dec079029f0314e0325018ef5 /source4/pidl/lib/Parse
parentf280849a6f45c563ca5beb6afe1dcf0bbba8f4e3 (diff)
downloadsamba-5340489807985b3bb4c10eacfa701d643ee7a36c.tar.gz
samba-5340489807985b3bb4c10eacfa701d643ee7a36c.tar.bz2
samba-5340489807985b3bb4c10eacfa701d643ee7a36c.zip
r21440: Support different variables in environments.
(This used to be commit 1702a663ba4ce6f5803e265a969f2be564fce1e3)
Diffstat (limited to 'source4/pidl/lib/Parse')
-rw-r--r--source4/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm14
1 files changed, 7 insertions, 7 deletions
diff --git a/source4/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm b/source4/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm
index 46898e6ad8..dfd7296cdd 100644
--- a/source4/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm
+++ b/source4/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm
@@ -216,16 +216,16 @@ sub end_flags($)
}
}
-sub GenerateStructEnv($)
+sub GenerateStructEnv($$)
{
- my $x = shift;
+ my ($x, $v) = @_;
my %env;
foreach my $e (@{$x->{ELEMENTS}}) {
- $env{$e->{NAME}} = "r->$e->{NAME}";
+ $env{$e->{NAME}} = "$v->$e->{NAME}";
}
- $env{"this"} = "r";
+ $env{"this"} = $v;
return \%env;
}
@@ -1198,7 +1198,7 @@ sub ParseStructPush($$)
return unless defined($struct->{ELEMENTS});
- my $env = GenerateStructEnv($struct);
+ my $env = GenerateStructEnv($struct, "r");
EnvSubstituteValue($env, $struct);
@@ -1440,7 +1440,7 @@ sub ParseStructPrint($$)
return unless defined $struct->{ELEMENTS};
- my $env = GenerateStructEnv($struct);
+ my $env = GenerateStructEnv($struct, "r");
EnvSubstituteValue($env, $struct);
@@ -1521,7 +1521,7 @@ sub ParseStructPull($$)
return unless defined $struct->{ELEMENTS};
- my $env = GenerateStructEnv($struct);
+ my $env = GenerateStructEnv($struct, "r");
# declare any internal pointers we need
foreach my $e (@{$struct->{ELEMENTS}}) {