diff options
| author | Evan Huus <eapache@gmail.com> | 2015-06-23 21:35:46 -0700 |
|---|---|---|
| committer | Evan Huus <eapache@gmail.com> | 2015-06-24 17:32:40 +0000 |
| commit | 95ac3908d830e93e21ba0769b1e65feca2eb309a (patch) | |
| tree | ab0de6dd81f1734b006f6e06cdf1d6f69ccbff59 /ui | |
| parent | 86e562f27d2bb3703b84bf03f3a5e678b25b5207 (diff) | |
| download | wireshark-95ac3908d830e93e21ba0769b1e65feca2eb309a.tar.gz | |
Remove the last deprecated tvb_length calls
And remove the shims themselves!
Change-Id: I511c06eb21eaf68d1dc36bbb9558408807472f9c
Reviewed-on: https://code.wireshark.org/review/9088
Reviewed-by: Evan Huus <eapache@gmail.com>
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/gtk/packet_panes.c | 2 | ||||
| -rw-r--r-- | ui/tap_export_pdu.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/ui/gtk/packet_panes.c b/ui/gtk/packet_panes.c index 93caff2cad..71de45a3b6 100644 --- a/ui/gtk/packet_panes.c +++ b/ui/gtk/packet_panes.c @@ -121,7 +121,7 @@ get_byte_view_data_and_length(GtkWidget *byte_view, guint *data_len) if (byte_view_tvb == NULL) return NULL; - if ((*data_len = tvb_length(byte_view_tvb))) { + if ((*data_len = tvb_captured_length(byte_view_tvb))) { data_ptr = tvb_get_ptr(byte_view_tvb, 0, -1); return data_ptr; } else diff --git a/ui/tap_export_pdu.c b/ui/tap_export_pdu.c index a08f78f260..c47f15367b 100644 --- a/ui/tap_export_pdu.c +++ b/ui/tap_export_pdu.c @@ -57,8 +57,8 @@ export_pdu_packet(void *tapdata, packet_info *pinfo, epan_dissect_t *edt, const memcpy(packet_buf, exp_pdu_data->tlv_buffer, exp_pdu_data->tlv_buffer_len); g_free(exp_pdu_data->tlv_buffer); } - if(exp_pdu_data->tvb_length > 0){ - tvb_memcpy(exp_pdu_data->pdu_tvb, packet_buf+exp_pdu_data->tlv_buffer_len, 0, exp_pdu_data->tvb_length); + if(exp_pdu_data->tvb_captured_length > 0){ + tvb_memcpy(exp_pdu_data->pdu_tvb, packet_buf+exp_pdu_data->tlv_buffer_len, 0, exp_pdu_data->tvb_captured_length); } pkthdr.rec_type = REC_TYPE_PACKET; pkthdr.ts.secs = pinfo->fd->abs_ts.secs; |