diff options
| author | Dario Lombardo <lomato@gmail.com> | 2014-06-17 17:45:00 +0200 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2014-06-18 14:14:58 +0000 |
| commit | 246fe2ca4c67d8c98caa84e2f57694f6322e2f96 (patch) | |
| tree | 5f8651517a3423cce11c50e18371d8a73c3c7665 /epan/dissectors/packet-uts.c | |
| parent | 971ffd683ea23362bd8009567ff7860371e6e2cc (diff) | |
Fixup: tvb_* -> tvb_captured
Change-Id: I9209c1271967405c34c1b6fa43e1726a4d3a5a3f
Reviewed-on: https://code.wireshark.org/review/2377
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-uts.c')
| -rw-r--r-- | epan/dissectors/packet-uts.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/epan/dissectors/packet-uts.c b/epan/dissectors/packet-uts.c index 24fbce752e..a4bb22a520 100644 --- a/epan/dissectors/packet-uts.c +++ b/epan/dissectors/packet-uts.c @@ -75,7 +75,7 @@ static int testchar(tvbuff_t *tvb, packet_info *pinfo _U_, int offset, int op, g { gchar temp; - if (tvb_length_remaining(tvb, offset)) { + if (tvb_captured_length_remaining(tvb, offset)) { temp = tvb_get_guint8(tvb, offset) & 0x7f; if (op == FETCH || (op == MATCH && temp == match)) { if (storage != NULL) @@ -238,7 +238,7 @@ dissect_uts(tvbuff_t *tvb, packet_info *pinfo _U_ , proto_tree *tree) } } - while (tvb_length_remaining(tvb, offset) > 0) { /* now look for the ETX */ + while (tvb_captured_length_remaining(tvb, offset) > 0) { /* now look for the ETX */ if ((tvb_get_guint8(tvb, offset) & 0x7f) == ETX) { if (header_length == -1) header_length = offset; /* the header ends at an STX, or if not found, the ETX */ @@ -248,7 +248,7 @@ dissect_uts(tvbuff_t *tvb, packet_info *pinfo _U_ , proto_tree *tree) } offset++; } - if (tvb_length_remaining(tvb, offset)) /* if there is anything left, it could be the BCC and pads */ + if (tvb_captured_length_remaining(tvb, offset)) /* if there is anything left, it could be the BCC and pads */ bcc_start = offset; if (tree) { @@ -300,7 +300,7 @@ dissect_uts(tvbuff_t *tvb, packet_info *pinfo _U_ , proto_tree *tree) if (stx_start) { proto_tree_add_protocol_format(uts_header_tree, proto_uts, tvb, stx_start, 1, "Start of Text"); - length = tvb_length_remaining(tvb, stx_start+1); /* find out how much message remains */ + length = tvb_captured_length_remaining(tvb, stx_start+1); /* find out how much message remains */ if (etx_start) length = (etx_start - stx_start - 1); /* and the data part is the rest... */ /* whatever preceeds the ETX if it exists */ |