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-dcm.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-dcm.c')
| -rw-r--r-- | epan/dissectors/packet-dcm.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/epan/dissectors/packet-dcm.c b/epan/dissectors/packet-dcm.c index 0ba6208acf..1dcc0b96db 100644 --- a/epan/dissectors/packet-dcm.c +++ b/epan/dissectors/packet-dcm.c @@ -4788,14 +4788,14 @@ dissect_dcm_assoc_header(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gu break; } - proto_tree_add_uint_format(assoc_header_ptree, hf_dcm_assoc_reject_result, tvb, - offset , 1, reject_result, "Result: %s", reject_result_desc); + proto_tree_add_uint_format_value(assoc_header_ptree, hf_dcm_assoc_reject_result, tvb, + offset , 1, reject_result, "%s", reject_result_desc); - proto_tree_add_uint_format(assoc_header_ptree, hf_dcm_assoc_reject_source, tvb, - offset+1, 1, reject_source, "Source: %s", reject_source_desc); + proto_tree_add_uint_format_value(assoc_header_ptree, hf_dcm_assoc_reject_source, tvb, + offset+1, 1, reject_source, "%s", reject_source_desc); - proto_tree_add_uint_format(assoc_header_ptree, hf_dcm_assoc_reject_reason, tvb, - offset+2, 1, reject_reason, "Reason: %s", reject_reason_desc); + proto_tree_add_uint_format_value(assoc_header_ptree, hf_dcm_assoc_reject_reason, tvb, + offset+2, 1, reject_reason, "%s", reject_reason_desc); offset += 3; @@ -4848,11 +4848,11 @@ dissect_dcm_assoc_header(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gu break; } - proto_tree_add_uint_format(assoc_header_ptree, hf_dcm_assoc_abort_source, - tvb, offset , 1, abort_source, "Source: %s", abort_source_desc); + proto_tree_add_uint_format_value(assoc_header_ptree, hf_dcm_assoc_abort_source, + tvb, offset , 1, abort_source, "%s", abort_source_desc); - proto_tree_add_uint_format(assoc_header_ptree, hf_dcm_assoc_abort_reason, - tvb, offset+1, 1, abort_reason, "Reason: %s", abort_reason_desc); + proto_tree_add_uint_format_value(assoc_header_ptree, hf_dcm_assoc_abort_reason, + tvb, offset+1, 1, abort_reason, "%s", abort_reason_desc); offset += 2; if (abort_source == 0) { @@ -6335,8 +6335,8 @@ dissect_dcm_tag(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, --------------------------------------------------------------- */ - proto_tree_add_uint_format(tag_ptree, hf_dcm_tag, tvb, offset_tag, 4, - (grp << 16) | elm, "Tag: %04x,%04x (%s)", grp, elm, tag_def->description); + proto_tree_add_uint_format_value(tag_ptree, hf_dcm_tag, tvb, offset_tag, 4, + (grp << 16) | elm, "%04x,%04x (%s)", grp, elm, tag_def->description); /* Add VR to tag detail, except for dicom items */ if (!is_item) { |