diff options
author | Michael Mann <mmann78@netscape.net> | 2014-06-06 10:35:50 -0400 |
---|---|---|
committer | Pascal Quantin <pascal.quantin@gmail.com> | 2014-06-07 15:41:07 +0000 |
commit | 73217d9f3fbff3d9f5a514cd7f2b7f4ca5f61947 (patch) | |
tree | 194ce9f6db1db1237a755f832d34367d2df8320b /epan/dissectors/packet-jxta.c | |
parent | a048dc1d0d33728022831a538d878e967da88901 (diff) |
tvb_new_subset -> tvb_new_subset_length when length parameters are equal.
tvb_new_subset -> tvb_new_subset_remaining it appears that's what the intention is.
Change-Id: I2334bbf3f10475b3c22391392fc8b6864454de2d
Reviewed-on: https://code.wireshark.org/review/1999
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-jxta.c')
-rw-r--r-- | epan/dissectors/packet-jxta.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/epan/dissectors/packet-jxta.c b/epan/dissectors/packet-jxta.c index 2ee53e241a..0fd5d1a6c1 100644 --- a/epan/dissectors/packet-jxta.c +++ b/epan/dissectors/packet-jxta.c @@ -479,7 +479,7 @@ static int dissect_jxta_udp(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tr tree_offset += dissect_jxta_message_framing(jxta_message_framing_tvb, pinfo, jxta_tree, &content_length, &content_type); - jxta_message_tvb = tvb_new_subset(tvb, tree_offset, (gint) content_length, (gint) content_length); + jxta_message_tvb = tvb_new_subset_length(tvb, tree_offset, (gint) content_length); tree_offset += dissect_media(content_type, jxta_message_tvb, pinfo, tree); @@ -601,7 +601,7 @@ static int dissect_jxta_stream(tvbuff_t * tvb, packet_info * pinfo, proto_tree * available = tvb_reported_length_remaining(tvb, offset + headers_len); if (available >= content_length) { - tvbuff_t *jxta_message_tvb = tvb_new_subset(tvb, offset + headers_len, (gint) content_length, (gint) content_length); + tvbuff_t *jxta_message_tvb = tvb_new_subset_length(tvb, offset + headers_len, (gint) content_length); conversation_t *peer_conversation = NULL; jxta_tree_item = proto_tree_add_protocol_format(tree, proto_jxta, tvb, offset, -1, "JXTA" ); @@ -1653,7 +1653,7 @@ static int dissect_jxta_message_element_1(tvbuff_t * tvb, packet_info * pinfo, p proto_tree_add_item(jxta_elem_tree, hf_jxta_element_content_len, tvb, tree_offset, (int)sizeof(guint32), ENC_BIG_ENDIAN); tree_offset += (int)sizeof(guint32); - element_content_tvb = tvb_new_subset(tvb, tree_offset, content_len, content_len); + element_content_tvb = tvb_new_subset_length(tvb, tree_offset, content_len); tree_offset += dissect_media(mediatype, element_content_tvb, pinfo, jxta_elem_tree); @@ -1951,7 +1951,7 @@ static int dissect_jxta_message_element_2(tvbuff_t * tvb, packet_info * pinfo, p } /* content */ - element_content_tvb = tvb_new_subset(tvb, tree_offset, (gint)content_len, (gint)content_len); + element_content_tvb = tvb_new_subset_length(tvb, tree_offset, (gint)content_len); tree_offset += dissect_media(mediatype, element_content_tvb, pinfo, jxta_elem_tree); |