diff options
| author | Michael Mann <mmann78@netscape.net> | 2013-08-09 13:55:35 +0000 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2013-08-09 13:55:35 +0000 |
| commit | 5ffa911a6bb322e5473b229ce4cc480c431a9982 (patch) | |
| tree | 7e656e77eab0e077654eb4777784ad83b4795f31 /tools/convert_proto_tree_add_text.pl | |
| parent | 1c2cb57a38aaed1f6a556e2e7fe6fbffedb481b5 (diff) | |
| download | wireshark-5ffa911a6bb322e5473b229ce4cc480c431a9982.tar.gz | |
Allow display base, not field type to have multiple ORed entries (for things like BASE_EXT_STRING)
svn path=/trunk/; revision=51235
Diffstat (limited to 'tools/convert_proto_tree_add_text.pl')
| -rwxr-xr-x | tools/convert_proto_tree_add_text.pl | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/tools/convert_proto_tree_add_text.pl b/tools/convert_proto_tree_add_text.pl index eeccc5b472..6b47b655fd 100755 --- a/tools/convert_proto_tree_add_text.pl +++ b/tools/convert_proto_tree_add_text.pl @@ -287,17 +287,17 @@ sub verify_line { print "$line_number: Poorly formed hf_ variable ($proto_tree_item[3])!\n"; $errors++; } - foreach (split(/\|/, $proto_tree_item[9])) { - if (!exists($FIELD_TYPE{$_})) { - print "$line_number: Field type '$proto_tree_item[9]' unknown!\n"; + if (!exists($FIELD_TYPE{$proto_tree_item[9]})) { + print "$line_number: Field type '$proto_tree_item[9]' unknown!\n"; + $errors++; + } + foreach (split(/\|/, $proto_tree_item[11])) { + if ((!exists($DISPLAY_BASE{$_})) && + (!($proto_tree_item[11] =~ /\d+/))) { + print "$line_number: Display base '$proto_tree_item[11]' unknown!\n"; $errors++; } } - if ((!exists($DISPLAY_BASE{$proto_tree_item[11]})) && - (!($proto_tree_item[11] =~ /\d+/))) { - print "$line_number: Display base '$proto_tree_item[11]' unknown!\n"; - $errors++; - } } elsif ($proto_tree_item[1] eq "2") { if (!($proto_tree_item[3] =~ /^ei_/)) { |