From 47d670d3d7d17df1e29a55d05413a2fd3d0f8e6a Mon Sep 17 00:00:00 2001 From: Michael Mann Date: Mon, 5 Jan 2015 19:26:28 -0500 Subject: Add tvb_address_to_str. This is intended to handle ALL address types retrieved from a tvbuff. One of the (good) side effects of this function is that it can replace a lot of the "hidden" ep_alloc calls used to allocate memory for the address string. A few existing "popular" helper tvb_ functions were turned into pure macros calling tvb_address_to_str. Some of the "less used" helper tvb_ functions were just directly replaced with tvb_address_to_str. Change-Id: I361d991c4ad90142173e63eae02a94d68af3ec43 Reviewed-on: https://code.wireshark.org/review/6333 Reviewed-by: Michael Mann --- tools/convert_proto_tree_add_text.pl | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'tools/convert_proto_tree_add_text.pl') diff --git a/tools/convert_proto_tree_add_text.pl b/tools/convert_proto_tree_add_text.pl index 3ed4711393..d811d12016 100755 --- a/tools/convert_proto_tree_add_text.pl +++ b/tools/convert_proto_tree_add_text.pl @@ -390,8 +390,7 @@ sub generate_hfs { if (($proto_tree_item[6] eq "1") || ($args[5] =~ /tvb_get_guint8/) || ($args[5] =~ /tvb_bytes_to_str/) || - ($args[5] =~ /tvb_ether_to_str/) || - ($args[5] =~ /tvb_vines_addr_to_str/)) { + ($args[5] =~ /tvb_ether_to_str/)) { $proto_tree_item[7] = "ENC_NA"; } elsif ($args[5] =~ /tvb_get_ntoh/) { $proto_tree_item[7] = "ENC_BIG_ENDIAN"; @@ -497,8 +496,6 @@ sub generate_hfs { $proto_tree_item[9] = "FT_BYTES"; } elsif ($args[5] =~ /tvb_ether_to_str/) { $proto_tree_item[9] = "FT_ETHER"; - } elsif ($args[5] =~ /tvb_vines_addr_to_str/) { - $proto_tree_item[9] = "FT_VINES"; } #if we still can't determine type, assume a constant length -- cgit v1.2.3