diff options
author | Evan Huus <eapache@gmail.com> | 2015-06-22 20:53:46 -0700 |
---|---|---|
committer | Evan Huus <eapache@gmail.com> | 2015-06-23 03:54:13 +0000 |
commit | 6fd7e5ba33dd9104803173086c1e79c42c2e3754 (patch) | |
tree | eb0e9e98d6dda61eeaa83457a606e772543a940d /epan/dissectors/packet-etch.c | |
parent | 46e5fd833eb3e38cab9a10e5d93ce538558196d0 (diff) |
Remove more deprecated tvb_length calls
Change-Id: I56260a82b19001ab2f87f4be34a9510f127f841f
Reviewed-on: https://code.wireshark.org/review/9050
Reviewed-by: Evan Huus <eapache@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-etch.c')
-rw-r--r-- | epan/dissectors/packet-etch.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/dissectors/packet-etch.c b/epan/dissectors/packet-etch.c index 9261c3feef..7421223dc9 100644 --- a/epan/dissectors/packet-etch.c +++ b/epan/dissectors/packet-etch.c @@ -616,7 +616,7 @@ read_struct(unsigned int *offset, tvbuff_t *tvb, proto_tree *etch_tree, int i; ti = proto_tree_add_item(etch_tree, hf_etch_struct, tvb, *offset, - tvb_length(tvb) - *offset, ENC_NA); + tvb_captured_length(tvb) - *offset, ENC_NA); new_tree = proto_item_add_subtree(ti, ett_etch_struct); if (add_type_field) { @@ -753,7 +753,7 @@ dissect_etch_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* read_struct(&offset, tvb, etch_tree, 0); } - return tvb_length(tvb); + return tvb_captured_length(tvb); } /* @@ -774,7 +774,7 @@ get_etch_message_len(packet_info *pinfo _U_, tvbuff_t *tvb, static int dissect_etch(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) { - if (tvb_length(tvb) < 4) { + if (tvb_captured_length(tvb) < 4) { /* Too small for an etch packet. */ return 0; } |