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-aprs.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-aprs.c')
| -rw-r--r-- | epan/dissectors/packet-aprs.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/dissectors/packet-aprs.c b/epan/dissectors/packet-aprs.c index beb71ad233..3a98576675 100644 --- a/epan/dissectors/packet-aprs.c +++ b/epan/dissectors/packet-aprs.c @@ -706,7 +706,7 @@ dissect_mic_e( tvbuff_t *tvb, const guint8 *addr; const mic_e_dst_code_table_s *dst_code_entry; - data_len = tvb_captured_length_remaining( tvb, offset ); + data_len = tvb_length_remaining( tvb, offset ); new_offset = offset + data_len; info_buffer = (char *)wmem_alloc( wmem_packet_scope(), STRLEN ); @@ -898,7 +898,7 @@ dissect_aprs_weather( tvbuff_t *tvb, guint8 ch; - data_len = tvb_captured_length_remaining( tvb, offset ); + data_len = tvb_length_remaining( tvb, offset ); new_offset = offset + data_len; tc = proto_tree_add_item( parent_tree, hf_aprs_weather_idx, tvb, offset, data_len, ENC_ASCII|ENC_NA ); @@ -1100,7 +1100,7 @@ aprs_status( proto_tree *aprs_tree, tvbuff_t *tvb, int offset ) { int data_len; - data_len = tvb_captured_length_remaining( tvb, offset ); + data_len = tvb_length_remaining( tvb, offset ); if ( ( data_len > 7 ) && ( tvb_get_guint8( tvb, offset+6 ) == 'z' ) ) { |