diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2006-11-04 02:54:24 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:24:48 -0500 |
| commit | 77d1be3e8da0c4796a518e15e16d4083445613c7 (patch) | |
| tree | d07b2a955884d97a28da6886141867b666014a32 /source4/pidl/lib/Parse/Pidl | |
| parent | d9862f2bc48e4da63aaa4cc0255d08fd36bd0a66 (diff) | |
| download | samba-77d1be3e8da0c4796a518e15e16d4083445613c7.tar.gz samba-77d1be3e8da0c4796a518e15e16d4083445613c7.tar.bz2 samba-77d1be3e8da0c4796a518e15e16d4083445613c7.zip | |
r19547: Fix use of v1_enum on enums used in return types.
(This used to be commit dbae9b4e4ea38806062ba34dcf05a67c2e7af043)
Diffstat (limited to 'source4/pidl/lib/Parse/Pidl')
| -rw-r--r-- | source4/pidl/lib/Parse/Pidl/Wireshark/NDR.pm | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/source4/pidl/lib/Parse/Pidl/Wireshark/NDR.pm b/source4/pidl/lib/Parse/Pidl/Wireshark/NDR.pm index 2a636139de..8793dd5774 100644 --- a/source4/pidl/lib/Parse/Pidl/Wireshark/NDR.pm +++ b/source4/pidl/lib/Parse/Pidl/Wireshark/NDR.pm @@ -441,7 +441,7 @@ sub Function($$$) pidl_code "guint32 status;\n"; } elsif (my $type = getType($fn->{RETURN_TYPE})) { if ($type->{DATA}->{TYPE} eq "ENUM") { - pidl_code "g".Parse::Pidl::Typelist::enum_type_fn($type) . " status;\n"; + pidl_code "g".Parse::Pidl::Typelist::enum_type_fn($type->{DATA}) . " status;\n"; } else { print "$fn->{FILE}:$fn->{LINE}: error: return type `$fn->{RETURN_TYPE}' not yet supported\n"; } @@ -471,8 +471,8 @@ sub Function($$$) $return_types{$ifname}->{"werror"} = ["WERROR", "Windows Error"]; } elsif (my $type = getType($fn->{RETURN_TYPE})) { if ($type->{DATA}->{TYPE} eq "ENUM") { - my $return_type = "g".Parse::Pidl::Typelist::enum_type_fn($type); - my $return_dissect = "dissect_ndr_" .Parse::Pidl::Typelist::enum_type_fn($type); + my $return_type = "g".Parse::Pidl::Typelist::enum_type_fn($type->{DATA}); + my $return_dissect = "dissect_ndr_" .Parse::Pidl::Typelist::enum_type_fn($type->{DATA}); pidl_code "offset = $return_dissect(tvb, offset, pinfo, tree, drep, hf\_$ifname\_$fn->{RETURN_TYPE}_status, &status);"; pidl_code "if (status != 0 && check_col(pinfo->cinfo, COL_INFO))"; @@ -578,8 +578,8 @@ sub Union($$$) my $switch_dissect; my $switch_dt = getType($e->{SWITCH_TYPE}); if ($switch_dt->{DATA}->{TYPE} eq "ENUM") { - $switch_type = "g".Parse::Pidl::Typelist::enum_type_fn($switch_dt); - $switch_dissect = "dissect_ndr_" .Parse::Pidl::Typelist::enum_type_fn($switch_dt); + $switch_type = "g".Parse::Pidl::Typelist::enum_type_fn($switch_dt->{DATA}); + $switch_dissect = "dissect_ndr_" .Parse::Pidl::Typelist::enum_type_fn($switch_dt->{DATA}); } elsif ($switch_dt->{DATA}->{TYPE} eq "SCALAR") { $switch_type = "g$e->{SWITCH_TYPE}"; $switch_dissect = "dissect_ndr_$e->{SWITCH_TYPE}"; |