diff options
author | Michael Mann <mmann78@netscape.net> | 2013-07-22 01:56:35 +0000 |
---|---|---|
committer | Michael Mann <mmann78@netscape.net> | 2013-07-22 01:56:35 +0000 |
commit | cf4e08bdf20c0ac0553e7e46ae5f8006cc3f0ce2 (patch) | |
tree | 7168d898317606fc9645a2b1d63f0d6ff0073cc3 /tools/convert_proto_tree_add_text.pl | |
parent | c131f9a0745f6307a5c910d8486eb9a37a05935c (diff) |
fix "compiler errors"
Add better support for IP field detection.
svn path=/trunk/; revision=50781
Diffstat (limited to 'tools/convert_proto_tree_add_text.pl')
-rwxr-xr-x | tools/convert_proto_tree_add_text.pl | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/tools/convert_proto_tree_add_text.pl b/tools/convert_proto_tree_add_text.pl index e042fe2662..ca72ed1fc6 100755 --- a/tools/convert_proto_tree_add_text.pl +++ b/tools/convert_proto_tree_add_text.pl @@ -266,13 +266,12 @@ sub verify_line { } elsif (($proto_tree_item[0] eq "10") || ($proto_tree_item[0] eq "11") || ($proto_tree_item[0] eq "12") || - ($proto_tree_item[0] eq "13") { + ($proto_tree_item[0] eq "13")) { #expert info conversions if (!($proto_tree_item[3] =~ /^ei_/)) { print "$line_number: Poorly formed ei_ variable ($proto_tree_item[3])!\n"; $errors++; } - } } elsif ($proto_tree_item[0] ne "0") { print "Bad conversion value! Aborting conversion.\n"; $errors++; @@ -440,9 +439,11 @@ sub generate_hfs { $proto_tree_item[9] = "FT_FLOAT"; } elsif ($args[5] =~ /tvb_get_(n|"le")tohieee_double/) { $proto_tree_item[9] = "FT_DOUBLE"; - } elsif ($args[5] =~ /tvb_get_ipv4/) { + } elsif (($args[5] =~ /tvb_get_ipv4/) || + ($args[5] =~ /tvb_ip_to_str/)) { $proto_tree_item[9] = "FT_IPv4"; - } elsif ($args[5] =~ /tvb_get_ipv6/) { + } elsif (($args[5] =~ /tvb_get_ipv6/) || + ($args[5] =~ /tvb_ip6_to_str/)) { $proto_tree_item[9] = "FT_IPv6"; } elsif ($args[5] =~ /tvb_get_(n|"le")tohguid/) { $proto_tree_item[9] = "FT_GUID"; |