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-gsm_rlcmac.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-gsm_rlcmac.c')
| -rw-r--r-- | epan/dissectors/packet-gsm_rlcmac.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/epan/dissectors/packet-gsm_rlcmac.c b/epan/dissectors/packet-gsm_rlcmac.c index e72930b30b..33be85e148 100644 --- a/epan/dissectors/packet-gsm_rlcmac.c +++ b/epan/dissectors/packet-gsm_rlcmac.c @@ -6999,7 +6999,7 @@ static guint8 dissect_gprs_data_segments(tvbuff_t *tvb, packet_info *pinfo, prot i, li); } subtree = proto_item_add_subtree(ti, ett_data_segments); - data_tvb = tvb_new_subset(tvb, octet_offset, octet_length - octet_offset, octet_length - octet_offset); + data_tvb = tvb_new_subset_length(tvb, octet_offset, octet_length - octet_offset); call_dissector(data_handle, data_tvb, pinfo, subtree); octet_offset = octet_length; break; @@ -7009,7 +7009,7 @@ static guint8 dissect_gprs_data_segments(tvbuff_t *tvb, packet_info *pinfo, prot "data segment: LI[%d]=%d indicates: (Last segment of) LLC frame (%d octets)", i, li, li); subtree = proto_item_add_subtree(ti, ett_data_segments); - data_tvb = tvb_new_subset(tvb, octet_offset, li, li); + data_tvb = tvb_new_subset_length(tvb, octet_offset, li); call_dissector(data_handle, data_tvb, pinfo, subtree); octet_offset += li; break; @@ -7029,7 +7029,7 @@ static guint8 dissect_gprs_data_segments(tvbuff_t *tvb, packet_info *pinfo, prot ti = proto_tree_add_text(tree, tvb, octet_offset, octet_length - octet_offset, "Padding Octets"); } subtree = proto_item_add_subtree(ti, ett_data_segments); - data_tvb = tvb_new_subset(tvb, octet_offset, octet_length - octet_offset, octet_length - octet_offset); + data_tvb = tvb_new_subset_length(tvb, octet_offset, octet_length - octet_offset); call_dissector(data_handle, data_tvb, pinfo, subtree); octet_offset = octet_length; } @@ -7115,7 +7115,7 @@ static guint16 dissect_egprs_data_segments(tvbuff_t *tvb, packet_info *pinfo, pr i, li); } subtree = proto_item_add_subtree(ti, ett_data_segments); - data_tvb = tvb_new_subset(tvb, octet_offset, octet_length - octet_offset, octet_length - octet_offset); + data_tvb = tvb_new_subset_length(tvb, octet_offset, octet_length - octet_offset); call_dissector(data_handle, data_tvb, pinfo, subtree); octet_offset = octet_length; break; @@ -7125,7 +7125,7 @@ static guint16 dissect_egprs_data_segments(tvbuff_t *tvb, packet_info *pinfo, pr "data segment: LI[%d]=%d indicates: (Last segment of) LLC frame (%d octets)", i, li, li); subtree = proto_item_add_subtree(ti, ett_data_segments); - data_tvb = tvb_new_subset(tvb, octet_offset, li, li); + data_tvb = tvb_new_subset_length(tvb, octet_offset, li); call_dissector(data_handle, data_tvb, pinfo, subtree); octet_offset += li; break; @@ -7138,7 +7138,7 @@ static guint16 dissect_egprs_data_segments(tvbuff_t *tvb, packet_info *pinfo, pr ti = proto_tree_add_text(tree, tvb, octet_offset, octet_length - octet_offset, "data segment: LI not present: \n The Upper Layer PDU in the current RLC data block either fills the current RLC data block precisely \nor continues in the following in-sequence RLC data block"); subtree = proto_item_add_subtree(ti, ett_data_segments); - data_tvb = tvb_new_subset(tvb, octet_offset, octet_length - octet_offset, octet_length - octet_offset); + data_tvb = tvb_new_subset_length(tvb, octet_offset, octet_length - octet_offset); call_dissector(data_handle, data_tvb, pinfo, subtree); octet_offset = octet_length; } |