diff options
author | Evan Huus <eapache@gmail.com> | 2014-09-08 21:59:38 -0400 |
---|---|---|
committer | Anders Broman <a.broman58@gmail.com> | 2014-09-10 07:54:00 +0000 |
commit | f9d4e0a815cf9c8f1fe5a5a106fcce3755daf8f2 (patch) | |
tree | f3abbec56de906935bd40771c4be791e6fb695ea /epan/dissectors/packet-zbee-zdp.c | |
parent | 1bf82c3b64b798eb3df99d24819fc8a961d7dbe0 (diff) |
Replace deprecated tvb_length calls
And a few other misc. cleanups while in the neighbourhood.
Change-Id: Ic0d6836dec9c36d31ea244a6adc74d4713565090
Reviewed-on: https://code.wireshark.org/review/4047
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-zbee-zdp.c')
-rw-r--r-- | epan/dissectors/packet-zbee-zdp.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/dissectors/packet-zbee-zdp.c b/epan/dissectors/packet-zbee-zdp.c index 405ca6d188..85fa347623 100644 --- a/epan/dissectors/packet-zbee-zdp.c +++ b/epan/dissectors/packet-zbee-zdp.c @@ -381,7 +381,7 @@ void zdp_dump_excess(tvbuff_t *tvb, guint offset, packet_info *pinfo, proto_tree *tree) { proto_tree *root = proto_tree_get_root(tree); - guint length = tvb_length_remaining(tvb, offset); + guint length = tvb_captured_length_remaining(tvb, offset); tvbuff_t *excess; if (length > 0) { @@ -1029,7 +1029,7 @@ dissect_zbee_zdp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data nwk = (zbee_nwk_packet *)data; /* Create the protocol tree. */ - proto_root = proto_tree_add_protocol_format(tree, proto_zbee_zdp, tvb, offset, tvb_length(tvb), "ZigBee Device Profile"); + proto_root = proto_tree_add_protocol_format(tree, proto_zbee_zdp, tvb, offset, tvb_captured_length(tvb), "ZigBee Device Profile"); zdp_tree = proto_item_add_subtree(proto_root, ett_zbee_zdp); #if 0 @@ -1314,7 +1314,7 @@ dissect_zbee_zdp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data break; } /* switch */ - return tvb_length(tvb); + return tvb_captured_length(tvb); } /* dissect_zbee_zdp */ /*FUNCTION:------------------------------------------------------ |