diff options
| author | Michael Mann <mmann78@netscape.net> | 2014-06-19 17:18:16 +0000 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2014-06-19 18:25:59 +0000 |
| commit | 14824e6adf07a1c3cfb6537ce8723d873ecd0d0f (patch) | |
| tree | bdf1b52ecffe7825d719f34fb4be63c8a60bd1b4 /epan/dissectors/packet-fcswils.c | |
| parent | 3557ac4ec688b86ec7819005a3a181600e056251 (diff) | |
Revert "Fixup: tvb_* -> tvb_captured"
https://www.wireshark.org/lists/wireshark-dev/201406/msg00131.html
This reverts commit 246fe2ca4c67d8c98caa84e2f57694f6322e2f96.
Change-Id: Ib24bae0198c13a84bd7f731bf4af921212109a8f
Reviewed-on: https://code.wireshark.org/review/2430
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/dissectors/packet-fcswils.c')
| -rw-r--r-- | epan/dissectors/packet-fcswils.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/epan/dissectors/packet-fcswils.c b/epan/dissectors/packet-fcswils.c index 6a553459e2..de839afbab 100644 --- a/epan/dissectors/packet-fcswils.c +++ b/epan/dissectors/packet-fcswils.c @@ -1786,7 +1786,7 @@ dissect_fcswils(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data) if (tree) { ti = proto_tree_add_protocol_format(tree, proto_fcswils, tvb, 0, - tvb_captured_length(tvb), "SW_ILS"); + tvb_length(tvb), "SW_ILS"); swils_tree = proto_item_add_subtree(ti, ett_fcswils); } @@ -1831,7 +1831,7 @@ dissect_fcswils(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data) if (!conversation) { if (tree && (opcode == FC_SWILS_SWACC)) { /* No record of what this accept is for. Can't decode */ - proto_tree_add_text(swils_tree, tvb, 0, tvb_captured_length(tvb), + proto_tree_add_text(swils_tree, tvb, 0, tvb_length(tvb), "No record of Exchg. Unable to decode SW_ACC"); return 0; } @@ -1851,7 +1851,7 @@ dissect_fcswils(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data) if (tree) { if ((cdata == NULL) && (opcode != FC_SWILS_SWRJT)) { /* No record of what this accept is for. Can't decode */ - proto_tree_add_text(swils_tree, tvb, 0, tvb_captured_length(tvb), + proto_tree_add_text(swils_tree, tvb, 0, tvb_length(tvb), "No record of SW_ILS Req. Unable to decode SW_ACC"); return 0; } @@ -1888,7 +1888,7 @@ dissect_fcswils(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data) call_dissector(data_handle, next_tvb, pinfo, tree); } - return tvb_captured_length(tvb); + return tvb_length(tvb); } /* Register the protocol with Wireshark */ |