diff options
| author | Aurelien Aptel <aaptel@suse.com> | 2016-05-18 15:01:56 +0200 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2016-06-20 16:20:00 +0200 |
| commit | 2d348bdb8d6aa53ddf5d7a4c9c02777a79668bbe (patch) | |
| tree | e9eb936a19dadf1e3abdb06dd120ad0f26483876 /pidl | |
| parent | 0757c57d9941b0df8e92c92fc2dde69399336512 (diff) | |
| download | samba-2d348bdb8d6aa53ddf5d7a4c9c02777a79668bbe.tar.gz | |
pidl/ws: fix missing $name when generating MAPI dissector
Port Wireshark commit 0e80176
Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
Date: Fri Mar 4 19:28:26 2016 +0100
PIDL (NDR): fix missing $name when regenerate MAPI dissector
Issue coming from ge41f08858b
Signed-off-by: Aurelien Aptel <aaptel@suse.com>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: David Disseldorp <ddiss@samba.org>
Autobuild-User(master): Stefan Metzmacher <metze@samba.org>
Autobuild-Date(master): Mon Jun 20 16:20:00 CEST 2016 on sn-devel-144
Diffstat (limited to 'pidl')
| -rw-r--r-- | pidl/lib/Parse/Pidl/Wireshark/NDR.pm | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/pidl/lib/Parse/Pidl/Wireshark/NDR.pm b/pidl/lib/Parse/Pidl/Wireshark/NDR.pm index 72a144f09f7..816164615ee 100644 --- a/pidl/lib/Parse/Pidl/Wireshark/NDR.pm +++ b/pidl/lib/Parse/Pidl/Wireshark/NDR.pm @@ -454,15 +454,18 @@ sub Element($$$$$$) } my $switch_type = "g${switch_raw_type}"; - $moreparam = ", $switch_type *".$name; - + if ($name ne "") { + $moreparam = ", $switch_type *".$name; + } else { + $moreparam = ""; + } if (($e->{PROPERTIES}->{switch_is} eq "") && ($switchvars{$name}) && #not a "native" type (!($type =~ /^uint(8|16|1632|32|3264|64)/))) { $param = $name; } elsif ( $switch_dt->{DATA}->{TYPE} eq "ENUM") { $param = $name; - } else { + } elsif ($name ne "") { $param = "*".$name; } |