Switch a bunch of dissectors over to using tvb_new_subset_remaining()

[obnox/wireshark/wip.git] / epan / dissectors / packet-usb.c

diff --git a/epan/dissectors/packet-usb.c b/epan/dissectors/packet-usb.c
index 42d771797e9e88645600b99cf3bb718df9891ab8..5e253e0c401adcc4db2dfc4e9929b2a0e6629fb1 100644 (file)
--- a/epan/dissectors/packet-usb.c
+++ b/epan/dissectors/packet-usb.c
@@ -1802,7 +1802,7 @@ dissect_linux_usb_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent,
             tvbuff_t *next_tvb;
 
             pinfo->usb_conv_info=usb_conv_info;
-            next_tvb=tvb_new_subset(tvb, offset, -1, -1);
+            next_tvb=tvb_new_subset_remaining(tvb, offset);
             if(dissector_try_port(usb_bulk_dissector_table, usb_conv_info->interfaceClass, next_tvb, pinfo, parent)){
                 return;
             }
@@ -1894,7 +1894,7 @@ dissect_linux_usb_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent,
 
                 case RQT_SETUP_TYPE_CLASS:
                     /* Try to find a class specific dissector */
-                    next_tvb=tvb_new_subset(tvb, offset, -1, -1);
+                    next_tvb=tvb_new_subset_remaining(tvb, offset);
                     if(dissector_try_port(usb_control_dissector_table, usb_conv_info->interfaceClass, next_tvb, pinfo, tree)){
                         return;
                     }
@@ -1953,7 +1953,7 @@ dissect_linux_usb_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent,
 
             if(usb_trans_info){
                 /* Try to find a class specific dissector */
-                next_tvb=tvb_new_subset(tvb, offset, -1, -1);
+                next_tvb=tvb_new_subset_remaining(tvb, offset);
                 if(dissector_try_port(usb_control_dissector_table, usb_conv_info->interfaceClass, next_tvb, pinfo, tree)){
                     return;
                 }