diff options
| author | Aurelien Aptel <aaptel@suse.com> | 2016-02-10 15:05:45 +0100 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2016-06-20 12:08:21 +0200 |
| commit | deabf7ab07bb98d81d8fc3e7e0355c9b8d0df6a4 (patch) | |
| tree | 22cf95fae5065fb53359567d92afc5ca8e2ff53c /pidl | |
| parent | 97eda222d08e7aa32ca8c8c6af41f2901ac174ba (diff) | |
| download | samba-deabf7ab07bb98d81d8fc3e7e0355c9b8d0df6a4.tar.gz | |
pidl/ws: directly use `di` param instead of casting `private_data` member.
As in Wireshark repo.
Signed-off-by: Aurelien Aptel <aaptel@suse.com>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: David Disseldorp <ddiss@samba.org>
Diffstat (limited to 'pidl')
| -rw-r--r-- | pidl/lib/Parse/Pidl/Wireshark/NDR.pm | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/pidl/lib/Parse/Pidl/Wireshark/NDR.pm b/pidl/lib/Parse/Pidl/Wireshark/NDR.pm index 47947dff57b..d2b9f64de5b 100644 --- a/pidl/lib/Parse/Pidl/Wireshark/NDR.pm +++ b/pidl/lib/Parse/Pidl/Wireshark/NDR.pm @@ -348,11 +348,9 @@ sub ElementLevel($$$$$$$$) if ($self->{conformance}->{imports}->{$l->{DATA_TYPE}}) { $call = $self->{conformance}->{imports}->{$l->{DATA_TYPE}}->{DATA}; $self->{conformance}->{imports}->{$l->{DATA_TYPE}}->{USED} = 1; - } elsif (defined($self->{conformance}->{imports}->{"$pn.$e->{NAME}"})) { $call = $self->{conformance}->{imports}->{"$pn.$e->{NAME}"}->{DATA}; $self->{conformance}->{imports}->{"$pn.$e->{NAME}"}->{USED} = 1; - } elsif (defined($self->{conformance}->{types}->{$l->{DATA_TYPE}})) { $call= $self->{conformance}->{types}->{$l->{DATA_TYPE}}->{DISSECTOR_NAME}; $self->{conformance}->{types}->{$l->{DATA_TYPE}}->{USED} = 1; @@ -714,11 +712,8 @@ sub Struct($$$$) if($res) { $self->pidl_code("proto_tree *tree = NULL;"); } - if (defined($doalign)) { - $self->pidl_code("dcerpc_info *di = (dcerpc_info *)pinfo->private_data;"); - if ($doalign == 0) { - $self->pidl_code("gboolean oldalign = di->no_align;"); - } + if (defined($doalign) and $doalign == 0) { + $self->pidl_code("gboolean oldalign = di->no_align;"); } $self->pidl_code("int old_offset;"); $self->pidl_code(""); |