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-flip.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-flip.c')
-rw-r--r-- | epan/dissectors/packet-flip.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/epan/dissectors/packet-flip.c b/epan/dissectors/packet-flip.c index a2daa2f0f3..074233addb 100644 --- a/epan/dissectors/packet-flip.c +++ b/epan/dissectors/packet-flip.c @@ -430,7 +430,7 @@ dissect_flip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_ col_add_fstr(pinfo->cinfo, COL_INFO, "FlowID %s", val_to_str(basic_hdr_flow_id, NULL, "0x%08x")); - flip_tvb = tvb_new_subset(tvb, 0, frame_len, frame_len); + flip_tvb = tvb_new_subset_length(tvb, 0, frame_len); /* We are asked for details. */ if (tree) { @@ -539,8 +539,7 @@ dissect_flip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_ computed_chksum = g_htons(computed_chksum); } - chksum_tvb = tvb_new_subset(flip_tvb, offset, - FLIP_CHKSUM_HDR_LEN, + chksum_tvb = tvb_new_subset_length(flip_tvb, offset, FLIP_CHKSUM_HDR_LEN); /* Note that flip_tree is NULL if no details are requested. */ @@ -575,8 +574,8 @@ dissect_flip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_ has_user_messed_up = FALSE; - payload_tvb = tvb_new_subset(flip_tvb, offset, - payload_len, payload_len); + payload_tvb = tvb_new_subset_length(flip_tvb, offset, + payload_len); /* * 1) no decoding -> data |