aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-jxta.c
diff options
context:
space:
mode:
authorEvan Huus <eapache@gmail.com>2015-06-23 17:22:18 -0700
committerEvan Huus <eapache@gmail.com>2015-06-24 00:22:50 +0000
commitf92fab41a5266cb380c443882ce5efd5a7ee3318 (patch)
tree13e190875507342a2c5847b2629a6dab44d2d61d /epan/dissectors/packet-jxta.c
parentad784bc7ce29c2d8ad64bca73e4863a6353c578f (diff)
Remove a bunch more deprecated tvb_length calls
(getting really close!) Change-Id: Ibf22a5f727c4dc0070b78144a4b0ab8e0c5e1bce Reviewed-on: https://code.wireshark.org/review/9081 Reviewed-by: Evan Huus <eapache@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-jxta.c')
-rw-r--r--epan/dissectors/packet-jxta.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/epan/dissectors/packet-jxta.c b/epan/dissectors/packet-jxta.c
index af0b9c1831..4ee41b9336 100644
--- a/epan/dissectors/packet-jxta.c
+++ b/epan/dissectors/packet-jxta.c
@@ -2088,7 +2088,7 @@ static int dissect_media( const gchar* fullmediatype, tvbuff_t * tvb, packet_inf
dissected = call_dissector(ssl_handle, tvb, pinfo, tree);
}
} else if (0 == strcmp("application/gzip", mediatype)) {
- tvbuff_t *uncomp_tvb = tvb_child_uncompress(tvb, tvb, 0, tvb_length(tvb));
+ tvbuff_t *uncomp_tvb = tvb_child_uncompress(tvb, tvb, 0, tvb_captured_length(tvb));
if( NULL != uncomp_tvb ) {
add_new_data_source(pinfo, uncomp_tvb, "Uncompressed Element Content");
@@ -2098,14 +2098,14 @@ static int dissect_media( const gchar* fullmediatype, tvbuff_t * tvb, packet_inf
if( dissected > 0 ) {
/* report back the uncompressed length. */
- dissected = tvb_length(tvb);
+ dissected = tvb_captured_length(tvb);
}
}
} else {
- dissected = dissector_try_string(media_type_dissector_table, mediatype, tvb, pinfo, tree, media_str) ? tvb_length(tvb) : 0;
+ dissected = dissector_try_string(media_type_dissector_table, mediatype, tvb, pinfo, tree, media_str) ? tvb_captured_length(tvb) : 0;
- if( dissected != (int) tvb_length(tvb) ) {
- /* g_message( "%s : %d expected, %d dissected", mediatype, tvb_length(tvb), dissected ); */
+ if( dissected != (int) tvb_captured_length(tvb) ) {
+ /* g_message( "%s : %d expected, %d dissected", mediatype, tvb_captured_length(tvb), dissected ); */
}
}