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-ppp.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-ppp.c')
| -rw-r--r-- | epan/dissectors/packet-ppp.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/epan/dissectors/packet-ppp.c b/epan/dissectors/packet-ppp.c index b39c472f38..7cb9329b18 100644 --- a/epan/dissectors/packet-ppp.c +++ b/epan/dissectors/packet-ppp.c @@ -5317,10 +5317,8 @@ dissect_chap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* Length - make sure it's valid */ length = tvb_get_ntohs(tvb, 2); if (length < 4) { - if (tree) { - proto_tree_add_uint_format(fh_tree, hf_chap_length, tvb, 2, 2, - length, "Length: %u (invalid, must be >= 4)", length); - } + proto_tree_add_uint_format_value(fh_tree, hf_chap_length, tvb, 2, 2, + length, "%u (invalid, must be >= 4)", length); return; } proto_item_set_len(ti, length); |