diff options
| author | Michael Mann <mmann78@netscape.net> | 2013-09-15 01:48:30 +0000 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2013-09-15 01:48:30 +0000 |
| commit | b38ee917b1953104c615056481d6df008ae94b53 (patch) | |
| tree | 55024f9c53f083dc056540b6d887fc4550064008 /epan/dissectors/packet-ipxwan.c | |
| parent | a17cf67635c6e190c174bc131707804edca5c8f4 (diff) | |
Convert proto_tree_add_uint_format to proto_tree_add_uint_format_value if hf_ field name is the first part of the formatted string. This was done with a perl script on the dissectors directory (packet-*.c), followed by manual inspection of the output. The manual inspection yielded a few cases that really should have been proto_tree_add_uint or proto_tree_add_item, so I updated them accordingly.
The script didn't catch as many as I would have liked, but it's a start.
The most common (ab)use of proto_tree_add_uint_format was for appending strings to CRC/checksum values to note good or bad CRC/checksum.
svn path=/trunk/; revision=52045
Diffstat (limited to 'epan/dissectors/packet-ipxwan.c')
| -rw-r--r-- | epan/dissectors/packet-ipxwan.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/epan/dissectors/packet-ipxwan.c b/epan/dissectors/packet-ipxwan.c index 98df5d5604..9650dfb532 100644 --- a/epan/dissectors/packet-ipxwan.c +++ b/epan/dissectors/packet-ipxwan.c @@ -213,10 +213,10 @@ dissect_ipxwan(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } else { wan_link_delay = tvb_get_ntohs(tvb, offset); - proto_tree_add_uint_format(option_tree, + proto_tree_add_uint_format_value(option_tree, hf_ipxwan_wan_link_delay, tvb, offset, 2, wan_link_delay, - "WAN Link Delay: %ums", + "%ums", wan_link_delay); proto_tree_add_item(option_tree, hf_ipxwan_common_network_number, @@ -233,15 +233,15 @@ dissect_ipxwan(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) "Bogus length: %u, should be 8", option_data_len); } else { delay = tvb_get_ntohl(tvb, offset); - proto_tree_add_uint_format(option_tree, + proto_tree_add_uint_format_value(option_tree, hf_ipxwan_delay, tvb, offset, 4, delay, - "Delay: %uus", delay); + "%uus", delay); throughput = tvb_get_ntohl(tvb, offset); - proto_tree_add_uint_format(option_tree, + proto_tree_add_uint_format_value(option_tree, hf_ipxwan_throughput, tvb, offset, 4, throughput, - "Throughput: %uus", + "%uus", throughput); } break; @@ -255,10 +255,10 @@ dissect_ipxwan(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) hf_ipxwan_request_size, tvb, offset, 4, ENC_BIG_ENDIAN); delta_time = tvb_get_ntohl(tvb, offset); - proto_tree_add_uint_format(option_tree, + proto_tree_add_uint_format_value(option_tree, hf_ipxwan_delta_time, tvb, offset, 4, delta_time, - "Delta Time: %uus", + "%uus", delta_time); } break; |