aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-isl.c
diff options
context:
space:
mode:
authorkrj <krj@f5534014-38df-0310-8fa8-9805f1628bb7>2009-08-16 12:36:22 +0000
committerkrj <krj@f5534014-38df-0310-8fa8-9805f1628bb7>2009-08-16 12:36:22 +0000
commit79b8b138846a5e862ab0bac706dd7595c7e9fef4 (patch)
tree4a92d1e15649b285aa970ae51790d8e6747ca258 /epan/dissectors/packet-isl.c
parent8f77f850247078209413d7a259b52411aa6b0303 (diff)
Switch a bunch of dissectors over to using tvb_new_subset_remaining()
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@29446 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'epan/dissectors/packet-isl.c')
-rw-r--r--epan/dissectors/packet-isl.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/epan/dissectors/packet-isl.c b/epan/dissectors/packet-isl.c
index d403c58893..745a6b746d 100644
--- a/epan/dissectors/packet-isl.c
+++ b/epan/dissectors/packet-isl.c
@@ -197,7 +197,7 @@ dissect_isl(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int fcs_len)
TRY {
payload_tvb = tvb_new_subset(tvb, 14, length, length);
- trailer_tvb = tvb_new_subset(tvb, 14 + length, -1, -1);
+ trailer_tvb = tvb_new_subset_remaining(tvb, 14 + length);
}
CATCH2(BoundsError, ReportedBoundsError) {
/* Either:
@@ -225,7 +225,7 @@ dissect_isl(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int fcs_len)
/* The length field is 0; make it the length remaining in the packet
after the first 14 bytes. */
length = tvb_reported_length_remaining(tvb, 14);
- payload_tvb = tvb_new_subset(tvb, 14, -1, -1);
+ payload_tvb = tvb_new_subset_remaining(tvb, 14);
trailer_tvb = NULL;
}
@@ -314,12 +314,12 @@ dissect_isl(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int fcs_len)
proto_tree_add_item(fh_tree, hf_isl_fcs_not_incl, payload_tvb, 16, 1, FALSE);
proto_tree_add_item(fh_tree, hf_isl_esize, payload_tvb, 16, 1, FALSE);
}
- next_tvb = tvb_new_subset(payload_tvb, 17, -1, -1);
+ next_tvb = tvb_new_subset_remaining(payload_tvb, 17);
call_dissector(tr_handle, next_tvb, pinfo, tree);
break;
default:
- next_tvb = tvb_new_subset(payload_tvb, 12, -1, -1);
+ next_tvb = tvb_new_subset_remaining(payload_tvb, 12);
call_dissector(data_handle, next_tvb, pinfo, tree);
break;
}