From f9bca9e9acc3188f9c8449b2505c0c723dd516af Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Fri, 17 Aug 2007 07:06:02 +0000 Subject: r24505: pass down $fn one level metze (This used to be commit 0bad3f06199341aeacef228e482ab755e2e48306) --- source4/pidl/lib/Parse/Pidl/Samba4/Header.pm | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'source4') diff --git a/source4/pidl/lib/Parse/Pidl/Samba4/Header.pm b/source4/pidl/lib/Parse/Pidl/Samba4/Header.pm index 650b6f51ab..3c0a7bc24e 100644 --- a/source4/pidl/lib/Parse/Pidl/Samba4/Header.pm +++ b/source4/pidl/lib/Parse/Pidl/Samba4/Header.pm @@ -290,24 +290,24 @@ sub HeaderFunction($) $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 @@ sub HeaderInterface($) $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"; -- cgit