diff options
| author | morriss <morriss@f5534014-38df-0310-8fa8-9805f1628bb7> | 2011-01-20 03:49:44 +0000 |
|---|---|---|
| committer | morriss <morriss@f5534014-38df-0310-8fa8-9805f1628bb7> | 2011-01-20 03:49:44 +0000 |
| commit | b379f080cb32564edd315f448fe9e0c0a495ad3e (patch) | |
| tree | c9b44bf334fd6a1596e7ac2929476a05a22c979d /epan/dissectors/packet-ismp.c | |
| parent | 3317c6757a020ebd6706a02561c1079e4e3796d5 (diff) | |
Roll some calls to tvb_get_ptr() into proto_tree_add_bytes_format() (instead
of going through a temporary variable). This just makes it more obvious which
add_bytes_format() calls are or are not being given pointers into the TVB.
Use tvb_ip_to_str() and tvb_ip6_to_str() in a couple spots.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@35593 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'epan/dissectors/packet-ismp.c')
| -rw-r--r-- | epan/dissectors/packet-ismp.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/epan/dissectors/packet-ismp.c b/epan/dissectors/packet-ismp.c index 8fe7936f81..4fbe4b5090 100644 --- a/epan/dissectors/packet-ismp.c +++ b/epan/dissectors/packet-ismp.c @@ -228,8 +228,6 @@ dissect_ismp_edp(tvbuff_t *tvb, packet_info *pinfo, int offset, proto_tree *ismp guint16 num_tuples = 0; guint16 tuple_type = 0; guint16 tuple_length = 0; - const guint8 *neighbors_ptr; - const guint8 *tuples_ptr; /* Set up structures needed to add the protocol subtree and manage it */ proto_item *edp_ti; @@ -362,15 +360,14 @@ dissect_ismp_edp(tvbuff_t *tvb, packet_info *pinfo, int offset, proto_tree *ismp tvb_ensure_bytes_exist(tvb, offset, num_neighbors*10); if (tvb_reported_length_remaining(tvb, offset) >= (num_neighbors *10)) { - neighbors_ptr = tvb_get_ptr( tvb, offset, (num_neighbors*10) ); edp_neighbors_ti = proto_tree_add_bytes_format(edp_tree, hf_ismp_edp_neighbors, tvb, - offset, num_neighbors*10, neighbors_ptr, "Neighbors:"); + offset, num_neighbors*10, tvb_get_ptr(tvb, offset, (num_neighbors*10)), "Neighbors:"); } else { - neighbors_ptr = tvb_get_ptr( tvb, offset, tvb_reported_length_remaining(tvb, offset) ); edp_neighbors_ti = proto_tree_add_bytes_format(edp_tree, hf_ismp_edp_neighbors, tvb, - offset, num_neighbors *10, neighbors_ptr, "Neighbors:"); + offset, num_neighbors *10, + tvb_get_ptr(tvb, offset, tvb_reported_length_remaining(tvb, offset)), "Neighbors:"); } edp_neighbors_tree = proto_item_add_subtree(edp_neighbors_ti, ett_ismp_edp_neighbors); while ( neighbors_count < num_neighbors && tvb_reported_length_remaining(tvb, offset) >= 10) @@ -416,9 +413,9 @@ dissect_ismp_edp(tvbuff_t *tvb, packet_info *pinfo, int offset, proto_tree *ismp /* start populating tuple information */ if (num_tuples && tvb_reported_length_remaining(tvb, offset) >= 4) { - tuples_ptr = tvb_get_ptr(tvb, offset, tvb_reported_length_remaining(tvb, offset)); edp_tuples_ti = proto_tree_add_bytes_format(edp_tree, hf_ismp_edp_tuples, tvb, - offset, tvb_reported_length_remaining(tvb, offset), tuples_ptr, "Tuples"); + offset, tvb_reported_length_remaining(tvb, offset), + tvb_get_ptr(tvb, offset, tvb_reported_length_remaining(tvb, offset)), "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) ) |