From 645e87281c78f944fd6fe2ae52c6e0f058c665ff Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Wed, 15 Aug 2007 06:08:02 +0000
Subject: r24446: We only need one genric GenerateFunctionInEnv function

metze
(This used to be commit 0c5be644ba13c68b7378a6ae9dcd314018ece25d)
---
 source4/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

(limited to 'source4/pidl/lib/Parse/Pidl/Samba4')

diff --git a/source4/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm b/source4/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm
index b65df06884..73ff28eed0 100644
--- a/source4/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm
+++ b/source4/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm
@@ -243,30 +243,34 @@ sub EnvSubstituteValue($$)
 	return $env;
 }
 
-sub GenerateFunctionInEnv($)
+sub GenerateFunctionInEnv($;$)
 {
-	my $fn = shift;
+	my ($fn, $base) = @_;
 	my %env;
 
+	$base = "r->" unless defined($base);
+
 	foreach my $e (@{$fn->{ELEMENTS}}) {
 		if (grep (/in/, @{$e->{DIRECTION}})) {
-			$env{$e->{NAME}} = "r->in.$e->{NAME}";
+			$env{$e->{NAME}} = $base."in.$e->{NAME}";
 		}
 	}
 
 	return \%env;
 }
 
-sub GenerateFunctionOutEnv($)
+sub GenerateFunctionOutEnv($;$)
 {
-	my $fn = shift;
+	my ($fn, $base) = @_;
 	my %env;
 
+	$base = "r->" unless defined($base);
+
 	foreach my $e (@{$fn->{ELEMENTS}}) {
 		if (grep (/out/, @{$e->{DIRECTION}})) {
-			$env{$e->{NAME}} = "r->out.$e->{NAME}";
+			$env{$e->{NAME}} = $base."out.$e->{NAME}";
 		} elsif (grep (/in/, @{$e->{DIRECTION}})) {
-			$env{$e->{NAME}} = "r->in.$e->{NAME}";
+			$env{$e->{NAME}} = $base."in.$e->{NAME}";
 		}
 	}
 
-- 
cgit