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-ip.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-ip.c')
| -rw-r--r-- | epan/dissectors/packet-ip.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/epan/dissectors/packet-ip.c b/epan/dissectors/packet-ip.c index cce3ad730d..280e1af39b 100644 --- a/epan/dissectors/packet-ip.c +++ b/epan/dissectors/packet-ip.c @@ -2136,9 +2136,9 @@ dissect_ip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) ipsum = ip_checksum(tvb_get_ptr(tvb, offset, hlen), hlen); if (tree) { if (ipsum == 0) { - item = proto_tree_add_uint_format(ip_tree, hf_ip_checksum, tvb, + item = proto_tree_add_uint_format_value(ip_tree, hf_ip_checksum, tvb, offset + 10, 2, iph->ip_sum, - "Header checksum: 0x%04x [correct]", + "0x%04x [correct]", iph->ip_sum); checksum_tree = proto_item_add_subtree(item, ett_ip_checksum); item = proto_tree_add_boolean(checksum_tree, hf_ip_checksum_good, tvb, @@ -2148,9 +2148,9 @@ dissect_ip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) offset + 10, 2, FALSE); PROTO_ITEM_SET_GENERATED(item); } else { - item = proto_tree_add_uint_format(ip_tree, hf_ip_checksum, tvb, + item = proto_tree_add_uint_format_value(ip_tree, hf_ip_checksum, tvb, offset + 10, 2, iph->ip_sum, - "Header checksum: 0x%04x " + "0x%04x" "[incorrect, should be 0x%04x " "(may be caused by \"IP checksum " "offload\"?)]", iph->ip_sum, @@ -2175,9 +2175,9 @@ dissect_ip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) } else { ipsum = 0; if (tree) { - item = proto_tree_add_uint_format(ip_tree, hf_ip_checksum, tvb, + item = proto_tree_add_uint_format_value(ip_tree, hf_ip_checksum, tvb, offset + 10, 2, iph->ip_sum, - "Header checksum: 0x%04x [%s]", + "0x%04x [%s]", iph->ip_sum, ip_check_checksum ? (pinfo->flags.in_error_pkt ? |