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-mp2t.c | |
| parent | 1bf82c3b64b798eb3df99d24819fc8a961d7dbe0 (diff) | |
| download | wireshark-f9d4e0a815cf9c8f1fe5a5a106fcce3755daf8f2.tar.gz | |
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-mp2t.c')
| -rw-r--r-- | epan/dissectors/packet-mp2t.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/epan/dissectors/packet-mp2t.c b/epan/dissectors/packet-mp2t.c index f1d83795a9..ed7b7f29b7 100644 --- a/epan/dissectors/packet-mp2t.c +++ b/epan/dissectors/packet-mp2t.c @@ -463,12 +463,12 @@ mp2t_get_packet_length(tvbuff_t *tvb, guint offset, packet_info *pinfo, gint pkt_len = 0; guint remaining_len; - remaining_len = tvb_length_remaining(tvb, offset); frag = fragment_get(&mp2t_reassembly_table, pinfo, frag_id, NULL); if (frag) frag = frag->next; if (!frag) { /* First frame */ + remaining_len = tvb_reported_length_remaining(tvb, offset); if ( (pload_type == pid_pload_docsis && remaining_len < 4) || (pload_type == pid_pload_sect && remaining_len < 3) || (pload_type == pid_pload_pes && remaining_len < 5) ) { @@ -1207,7 +1207,7 @@ heur_dissect_mp2t( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *da gint length; guint offset = 0; - length = tvb_length_remaining(tvb, offset); + length = tvb_reported_length_remaining(tvb, offset); if (length == 0) { /* Nothing to check for */ return FALSE; |