aboutsummaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorAlexis La Goutte <alexis.lagoutte@gmail.com>2016-03-04 19:28:26 +0100
committerAnders Broman <a.broman58@gmail.com>2016-03-06 13:02:35 +0000
commit0e801763660162c313999c6d989e237c469ca5a6 (patch)
treea85b5f7684344f325121c384e0dc6a152973584b /tools
parentf2de3c7778c8712ddeef877055db4cba82a9b40a (diff)
PIDL (NDR): fix missing $name when regenerate MAPI dissector
Issue coming from ge41f08858b Change-Id: Ibff382b7cbf9a89904eb87d7f3e8f56b5782a0f6 Reviewed-on: https://code.wireshark.org/review/14351 Reviewed-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'tools')
-rw-r--r--tools/pidl/lib/Parse/Pidl/Wireshark/NDR.pm9
1 files changed, 6 insertions, 3 deletions
diff --git a/tools/pidl/lib/Parse/Pidl/Wireshark/NDR.pm b/tools/pidl/lib/Parse/Pidl/Wireshark/NDR.pm
index d2b9f64de5..29de25a3f3 100644
--- a/tools/pidl/lib/Parse/Pidl/Wireshark/NDR.pm
+++ b/tools/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;
}