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-q931.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-q931.c')
| -rw-r--r-- | epan/dissectors/packet-q931.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/epan/dissectors/packet-q931.c b/epan/dissectors/packet-q931.c index 737cdf7fa5..baed359e2c 100644 --- a/epan/dissectors/packet-q931.c +++ b/epan/dissectors/packet-q931.c @@ -711,32 +711,32 @@ dissect_q931_protocol_discriminator(tvbuff_t *tvb, int offset, proto_tree *tree) unsigned int discriminator = tvb_get_guint8(tvb, offset); if (discriminator == NLPID_DMS) { - proto_tree_add_uint_format(tree, hf_q931_discriminator, + proto_tree_add_uint_format_value(tree, hf_q931_discriminator, tvb, offset, 1, discriminator, - "Protocol discriminator: Maintenance messages"); + "Maintenance messages"); } else if (discriminator == NLPID_Q_931) { - proto_tree_add_uint_format(tree, hf_q931_discriminator, + proto_tree_add_uint_format_value(tree, hf_q931_discriminator, tvb, offset, 1, discriminator, - "Protocol discriminator: Q.931"); + "Q.931"); } else if (discriminator == NLPID_Q_2931) { - proto_tree_add_uint_format(tree, hf_q931_discriminator, + proto_tree_add_uint_format_value(tree, hf_q931_discriminator, tvb, offset, 1, discriminator, - "Protocol discriminator: Q.2931"); + "Q.2931"); } else if ((discriminator >= 16 && discriminator < 63) || ((discriminator >= 80) && (discriminator < 254))) { - proto_tree_add_uint_format(tree, hf_q931_discriminator, + proto_tree_add_uint_format_value(tree, hf_q931_discriminator, tvb, offset, 1, discriminator, - "Protocol discriminator: Network layer or layer 3 protocol (0x%02X)", + "Network layer or layer 3 protocol (0x%02X)", discriminator); } else if (discriminator >= 64 && discriminator <= 79) { - proto_tree_add_uint_format(tree, hf_q931_discriminator, + proto_tree_add_uint_format_value(tree, hf_q931_discriminator, tvb, offset, 1, discriminator, - "Protocol discriminator: National use (0x%02X)", + "National use (0x%02X)", discriminator); } else { - proto_tree_add_uint_format(tree, hf_q931_discriminator, + proto_tree_add_uint_format_value(tree, hf_q931_discriminator, tvb, offset, 1, discriminator, - "Protocol discriminator: Reserved (0x%02X)", + "Reserved (0x%02X)", discriminator); } } |