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-spice.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-spice.c')
-rw-r--r-- | epan/dissectors/packet-spice.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/dissectors/packet-spice.c b/epan/dissectors/packet-spice.c index efa8f0fd7e..951c2ec500 100644 --- a/epan/dissectors/packet-spice.c +++ b/epan/dissectors/packet-spice.c @@ -1118,7 +1118,7 @@ dissect_ImageJPEG_Alpha(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, gui ti = proto_tree_add_text(tree, tvb, offset - 9, Data_Size + 9, "RGB JPEG Image, Alpha channel (%u bytes)", Data_Size); JPEG_tree = proto_item_add_subtree(ti, ett_JPEG); - jpeg_tvb = tvb_new_subset(tvb, offset, JPEG_Size, JPEG_Size); + jpeg_tvb = tvb_new_subset_length(tvb, offset, JPEG_Size); call_dissector(jpeg_handle, jpeg_tvb, pinfo, JPEG_tree); offset += JPEG_Size; @@ -1138,7 +1138,7 @@ dissect_ImageJPEG(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, const gui ti = proto_tree_add_text(tree, tvb, offset, JPEG_Size + 4, "JPEG Image (%u bytes)", JPEG_Size); JPEG_tree = proto_item_add_subtree(ti, ett_JPEG); - jpeg_tvb = tvb_new_subset(tvb, offset + 4, JPEG_Size, JPEG_Size); + jpeg_tvb = tvb_new_subset_length(tvb, offset + 4, JPEG_Size); call_dissector(jpeg_handle, jpeg_tvb, pinfo, JPEG_tree); return JPEG_Size + 4; @@ -1951,7 +1951,7 @@ dissect_spice_display_server(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo proto_tree_add_item(tree, hf_display_stream_data_size, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset += 4; proto_tree_add_text(tree, tvb, offset, data_size, "Stream data"); - jpeg_tvb = tvb_new_subset(tvb, offset, data_size, data_size); + jpeg_tvb = tvb_new_subset_length(tvb, offset, data_size); call_dissector(jpeg_handle, jpeg_tvb, pinfo, tree); offset += data_size; break; |