svn commit: samba r24505 - in branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba4: .

[metze at samba.org]

Author: metze
Date: 2007-08-17 07:06:02 +0000 (Fri, 17 Aug 2007)
New Revision: 24505

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=24505

Log:
pass down $fn one level

metze
Modified:
   branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba4/Header.pm


Changeset:
Modified: branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba4/Header.pm
===================================================================
--- branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba4/Header.pm	2007-08-17 05:28:39 UTC (rev 24504)
+++ branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba4/Header.pm	2007-08-17 07:06:02 UTC (rev 24505)
@@ -290,24 +290,24 @@
 	$tab_depth++;
 	my $needed = 0;
 
-	if (HeaderFunctionInOut_needed($fn, "in") or
-	    HeaderFunctionInOut_needed($fn, "inout")) {
+	if (HeaderFunctionInOut_needed($fn->{ORIGINAL}, "in") or
+	    HeaderFunctionInOut_needed($fn->{ORIGINAL}, "inout")) {
 		pidl tabs()."struct {\n";
 		$tab_depth++;
-		HeaderFunctionInOut($fn, "in");
-		HeaderFunctionInOut($fn, "inout");
+		HeaderFunctionInOut($fn->{ORIGINAL}, "in");
+		HeaderFunctionInOut($fn->{ORIGINAL}, "inout");
 		$tab_depth--;
 		pidl tabs()."} in;\n\n";
 		$needed++;
 	}
 
-	if (HeaderFunctionInOut_needed($fn, "out") or
-	    HeaderFunctionInOut_needed($fn, "inout")) {
+	if (HeaderFunctionInOut_needed($fn->{ORIGINAL}, "out") or
+	    HeaderFunctionInOut_needed($fn->{ORIGINAL}, "inout")) {
 		pidl tabs()."struct {\n";
 		$tab_depth++;
-		HeaderFunctionInOut($fn, "out");
-		HeaderFunctionInOut($fn, "inout");
-		if ($fn->{RETURN_TYPE} ne "void") {
+		HeaderFunctionInOut($fn->{ORIGINAL}, "out");
+		HeaderFunctionInOut($fn->{ORIGINAL}, "inout");
+		if (defined($fn->{RETURN_TYPE})) {
 			pidl tabs().mapTypeName($fn->{RETURN_TYPE}) . " result;\n";
 		}
 		$tab_depth--;
@@ -368,8 +368,8 @@
 				 $d->{TYPE} eq "ENUM");
 	}
 
-	foreach my $d (@{$interface->{FUNCTIONS}}) {
-		HeaderFunction($d->{ORIGINAL});
+	foreach my $fn (@{$interface->{FUNCTIONS}}) {
+		HeaderFunction($fn);
 	}
 
 	pidl "#endif /* _HEADER_$interface->{NAME} */\n";