diff options
| author | Stefan Metzmacher <metze@samba.org> | 2007-08-17 07:06:02 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 15:02:04 -0500 |
| commit | f9bca9e9acc3188f9c8449b2505c0c723dd516af (patch) | |
| tree | 1dff5d7498b62c9b714d2092dc0e8b6e567b4ec4 /source4 | |
| parent | 85555742b109387f32ecc0e17c6b47681bdf8936 (diff) | |
| download | samba-f9bca9e9acc3188f9c8449b2505c0c723dd516af.tar.gz samba-f9bca9e9acc3188f9c8449b2505c0c723dd516af.tar.bz2 samba-f9bca9e9acc3188f9c8449b2505c0c723dd516af.zip | |
r24505: pass down $fn one level
metze
(This used to be commit 0bad3f06199341aeacef228e482ab755e2e48306)
Diffstat (limited to 'source4')
| -rw-r--r-- | source4/pidl/lib/Parse/Pidl/Samba4/Header.pm | 22 |
1 files changed, 11 insertions, 11 deletions
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"; |