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-ntp.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'epan/dissectors/packet-ntp.c') diff --git a/epan/dissectors/packet-ntp.c b/epan/dissectors/packet-ntp.c index 824fc29329..eee6257514 100644 --- a/epan/dissectors/packet-ntp.c +++ b/epan/dissectors/packet-ntp.c @@ -781,15 +781,15 @@ dissect_ntp_std(tvbuff_t *tvb, proto_tree *ntp_tree, guint8 flags) */ ppoll = tvb_get_guint8(tvb, 2); if ((ppoll >= 4) && (ppoll <= 17)) { - proto_tree_add_uint_format(ntp_tree, hf_ntp_ppoll, tvb, 2, 1, + proto_tree_add_uint_format_value(ntp_tree, hf_ntp_ppoll, tvb, 2, 1, ppoll, - "Peer Polling Interval: %u (%u sec)", + "%u (%u sec)", ppoll, 1 << ppoll); } else { - proto_tree_add_uint_format(ntp_tree, hf_ntp_ppoll, tvb, 2, 1, + proto_tree_add_uint_format_value(ntp_tree, hf_ntp_ppoll, tvb, 2, 1, ppoll, - "Peer Polling Interval: invalid (%u)", + "invalid (%u)", ppoll); } -- cgit v1.2.3