Rev 11385: Fix small regression. in file:///home/jelmer/bzr.samba/SAMBA_4_0/

[Jelmer Vernooij]

At file:///home/jelmer/bzr.samba/SAMBA_4_0/

------------------------------------------------------------
revno: 11385
revision-id: jelmer at samba.org-20070207130631-qpsztafs8ph0m01h
parent: jelmer at samba.org-20070207130042-nyy4qmqsxajwygrs
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: SAMBA_4_0
timestamp: Wed 2007-02-07 14:06:31 +0100
message:
  Fix small regression.
modified:
  source/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm svn-v2:12463 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0-source%2fpidl%2flib%2fParse%2fPidl%2fSamba4%2fNDR%2fParser.pm
=== modified file 'source/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm'
--- a/source/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm	2007-02-07 13:00:42 +0000
+++ b/source/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm	2007-02-07 13:06:31 +0000
@@ -309,10 +309,11 @@
 	my ($element, $env) = @_;
 
 	return sub ($) {
-		my $expandedvar = shift;
+		my $origvar = shift;
 		my $check = 0;
 
 		# Figure out the number of pointers in $ptr
+		my $expandedvar = $origvar;
 		$expandedvar =~ s/^(\**)//;
 		my $ptr = $1;
 
@@ -324,7 +325,7 @@
 			}
 		}
 		
-		return($expandedvar) unless (defined($var));
+		return($origvar) unless (defined($var));
 		my $e;
 		foreach (@{$element->{PARENT}->{ELEMENTS}}) {
 			if ($_->{NAME} eq $var) {
@@ -344,7 +345,7 @@
 			}
 		}
 		warning($element->{ORIGINAL}, "Got pointer for `$e->{NAME}', expected fully derefenced variable") if ($nump > length($ptr));
-		return ($expandedvar);
+		return ($origvar);
 	}
 }