From b38ee917b1953104c615056481d6df008ae94b53 Mon Sep 17 00:00:00 2001 From: Michael Mann Date: Sun, 15 Sep 2013 01:48:30 +0000 Subject: 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 --- epan/dissectors/packet-cdp.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'epan/dissectors/packet-cdp.c') diff --git a/epan/dissectors/packet-cdp.c b/epan/dissectors/packet-cdp.c index c6329932f1..36be282927 100644 --- a/epan/dissectors/packet-cdp.c +++ b/epan/dissectors/packet-cdp.c @@ -269,13 +269,13 @@ dissect_cdp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) checksum_good = (computed_checksum == 0); checksum_bad = !checksum_good; if (checksum_good) { - checksum_item = proto_tree_add_uint_format(cdp_tree, + checksum_item = proto_tree_add_uint_format_value(cdp_tree, hf_cdp_checksum, tvb, offset, 2, packet_checksum, - "Checksum: 0x%04x [correct]", packet_checksum); + "0x%04x [correct]", packet_checksum); } else { - checksum_item = proto_tree_add_uint_format(cdp_tree, + checksum_item = proto_tree_add_uint_format_value(cdp_tree, hf_cdp_checksum, tvb, offset, 2, packet_checksum, - "Checksum: 0x%04x [incorrect, should be 0x%04x]", + "0x%04x [incorrect, should be 0x%04x]", packet_checksum, in_cksum_shouldbe(packet_checksum, computed_checksum)); } -- cgit v1.2.3