aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-clnp.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-clnp.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-clnp.c')
-rw-r--r--epan/dissectors/packet-clnp.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/dissectors/packet-clnp.c b/epan/dissectors/packet-clnp.c
index a57de95464..e4db23f3d0 100644
--- a/epan/dissectors/packet-clnp.c
+++ b/epan/dissectors/packet-clnp.c
@@ -230,7 +230,7 @@ static void dissect_clnp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
cnf_proto_id,
"Inactive subset");
}
- next_tvb = tvb_new_subset(tvb, 1, -1, -1);
+ next_tvb = tvb_new_subset_remaining(tvb, 1);
if (call_dissector(ositp_inactive_handle, next_tvb, pinfo, tree) == 0)
call_dissector(data_handle,tvb, pinfo, tree);
return;
@@ -459,7 +459,7 @@ static void dissect_clnp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
/* First segment, or not segmented. Dissect what we have here. */
/* Get a tvbuff for the payload. */
- next_tvb = tvb_new_subset(tvb, offset, -1, -1);
+ next_tvb = tvb_new_subset_remaining(tvb, offset);
/*
* If this is the first segment, but not the only segment,
@@ -480,7 +480,7 @@ static void dissect_clnp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
/* As we haven't reassembled anything, we haven't changed "pi", so
we don't have to restore it. */
- call_dissector(data_handle, tvb_new_subset(tvb, offset, -1, -1), pinfo,
+ call_dissector(data_handle, tvb_new_subset_remaining(tvb, offset), pinfo,
tree);
pinfo->fragmented = save_fragmented;
return;