diff options
| author | AndersBroman <anders.broman@ericsson.com> | 2015-04-08 10:03:08 +0200 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2015-04-08 08:18:50 +0000 |
| commit | f6a183d034c01fb23bdcd560a13272dc0dcd668c (patch) | |
| tree | a8cbdf62d7f4785a0d217d4e85306ee2ac8a5115 /epan/dissectors/packet-h450.c | |
| parent | 9721a2a5092747886ca520b6813844974e6e9698 (diff) | |
Replace deprecated tvb_length with tvb_reported_length.
Change-Id: I45d2ae41da823c50ba383a8e2aaec570ee3ad842
Reviewed-on: https://code.wireshark.org/review/7979
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-h450.c')
| -rw-r--r-- | epan/dissectors/packet-h450.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/epan/dissectors/packet-h450.c b/epan/dissectors/packet-h450.c index 1ff0f345c8..5926dbb2e6 100644 --- a/epan/dissectors/packet-h450.c +++ b/epan/dissectors/packet-h450.c @@ -4743,12 +4743,12 @@ dissect_h450_arg(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data proto_item_append_text(proto_item_get_parent_nth(proto_tree_get_parent(tree), rctx->apdu_depth), " %s", p); } - if (op_ptr->arg_pdu && (tvb_length_remaining(tvb, offset) > 0)) + if (op_ptr->arg_pdu && (tvb_reported_length_remaining(tvb, offset) > 0)) offset = op_ptr->arg_pdu(tvb, pinfo, tree, NULL); else - if (tvb_length_remaining(tvb, offset) > 0) { + if (tvb_reported_length_remaining(tvb, offset) > 0) { proto_tree_add_expert(tree, pinfo, &ei_h450_unsupported_arg_type, tvb, offset, -1); - offset += tvb_length_remaining(tvb, offset); + offset += tvb_reported_length_remaining(tvb, offset); } return offset; @@ -4788,12 +4788,12 @@ dissect_h450_res(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data proto_item_append_text(proto_item_get_parent_nth(proto_tree_get_parent(tree), rctx->apdu_depth), " %s", p); } - if (op_ptr->res_pdu && (tvb_length_remaining(tvb, offset) > 0)) + if (op_ptr->res_pdu && (tvb_reported_length_remaining(tvb, offset) > 0)) offset = op_ptr->res_pdu(tvb, pinfo, tree, NULL); else - if (tvb_length_remaining(tvb, offset) > 0) { + if (tvb_reported_length_remaining(tvb, offset) > 0) { proto_tree_add_expert(tree, pinfo, &ei_h450_unsupported_result_type, tvb, offset, -1); - offset += tvb_length_remaining(tvb, offset); + offset += tvb_reported_length_remaining(tvb, offset); } return offset; @@ -4833,12 +4833,12 @@ dissect_h450_err(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data proto_item_append_text(proto_item_get_parent_nth(proto_tree_get_parent(tree), rctx->apdu_depth), " %s", p); } - if (err_ptr->err_pdu && (tvb_length_remaining(tvb, offset) > 0)) + if (err_ptr->err_pdu && (tvb_reported_length_remaining(tvb, offset) > 0)) offset = err_ptr->err_pdu(tvb, pinfo, tree, NULL); else - if (tvb_length_remaining(tvb, offset) > 0) { + if (tvb_reported_length_remaining(tvb, offset) > 0) { proto_tree_add_expert(tree, pinfo, &ei_h450_unsupported_error_type, tvb, offset, -1); - offset += tvb_length_remaining(tvb, offset); + offset += tvb_reported_length_remaining(tvb, offset); } return offset; |