diff options
| author | Jeff Morriss <jeff.morriss@ulticom.com> | 2011-02-10 16:31:00 +0000 |
|---|---|---|
| committer | Jeff Morriss <jeff.morriss@ulticom.com> | 2011-02-10 16:31:00 +0000 |
| commit | 50e1634f4ccfc3efeb6d0c6c452f9b4070a960e0 (patch) | |
| tree | 72d5f556239cdd05d77fbf05fdc389d22316d8e5 /epan/dissectors/packet-ismp.c | |
| parent | 7154ed56896eefff35426215eb98db8ea6d4f31a (diff) | |
| download | wireshark-50e1634f4ccfc3efeb6d0c6c452f9b4070a960e0.tar.gz | |
Modify proto_tree_add_bytes_format() and proto_tree_add_bytes_format_value()
so that if the start_ptr is NULL the bytes are extracted from the given TVB
using the given offset and length.
Replace a bunch of:
proto_tree_add_bytes_format*(tree, hf, tvb, offset, length, tvb_get_ptr(tvb, offset, length), [...])
with:
proto_tree_add_bytes_format*(tree, hf, tvb, offset, length, NULL, [...])
svn path=/trunk/; revision=35896
Diffstat (limited to 'epan/dissectors/packet-ismp.c')
| -rw-r--r-- | epan/dissectors/packet-ismp.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/epan/dissectors/packet-ismp.c b/epan/dissectors/packet-ismp.c index da82c80f37..02e74018fb 100644 --- a/epan/dissectors/packet-ismp.c +++ b/epan/dissectors/packet-ismp.c @@ -414,8 +414,7 @@ dissect_ismp_edp(tvbuff_t *tvb, packet_info *pinfo, int offset, proto_tree *ismp if (num_tuples && tvb_reported_length_remaining(tvb, offset) >= 4) { edp_tuples_ti = proto_tree_add_bytes_format(edp_tree, hf_ismp_edp_tuples, tvb, - offset, tvb_reported_length_remaining(tvb, offset), - tvb_get_ptr(tvb, offset, tvb_reported_length_remaining(tvb, offset)), "Tuples"); + offset, tvb_reported_length_remaining(tvb, offset), NULL, "Tuples"); edp_tuples_tree = proto_item_add_subtree(edp_tuples_ti, ett_ismp_edp_tuples); while ( (tuples_count < num_tuples) && (tvb_reported_length_remaining(tvb, offset) >= 4) ) |