Switch a bunch of dissectors over to using tvb_new_subset_remaining()

svn path=/trunk/; revision=29446

6 files changed, 9 insertions, 9 deletions

diff --git a/asn1/ldap/packet-ldap-template.c b/asn1/ldap/packet-ldap-template.c
index 5fdc500924..11039e0443 100644
--- a/asn1/ldap/packet-ldap-template.c
+++ b/asn1/ldap/packet-ldap-template.c
@@ -1034,7 +1034,7 @@ dissect_ldap_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gboolean i
 	   */
 	  if (!decr_tvb) {
 	    if(!pinfo->gssapi_data_encrypted){
-	      plain_tvb = tvb_new_subset(gssapi_tvb,  ver_len, -1, -1);
+	      plain_tvb = tvb_new_subset_remaining(gssapi_tvb,  ver_len);
 	    }
 	  }
 
diff --git a/asn1/mpeg-pes/packet-mpeg-pes-template.c b/asn1/mpeg-pes/packet-mpeg-pes-template.c
index 714adadf11..f75883783a 100644
--- a/asn1/mpeg-pes/packet-mpeg-pes-template.c
+++ b/asn1/mpeg-pes/packet-mpeg-pes-template.c
@@ -353,7 +353,7 @@ dissect_mpeg_pes(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 				offset / 8, 64, FALSE);
 		offset += 64 * 8;
 
-		es = tvb_new_subset(tvb, offset / 8, -1, -1);
+		es = tvb_new_subset_remaining(tvb, offset / 8);
 		dissect_mpeg_pes(es, pinfo, tree);
 	} else if (stream == STREAM_SEQUENCE_EXTENSION) {
 		tvbuff_t *es;
@@ -361,7 +361,7 @@ dissect_mpeg_pes(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 		offset = dissect_mpeg_pes_Sequence_extension(tvb, offset, &asn1_ctx,
 				tree, hf_mpeg_video_sequence_extension);
 
-		es = tvb_new_subset(tvb, offset / 8, -1, -1);
+		es = tvb_new_subset_remaining(tvb, offset / 8);
 		dissect_mpeg_pes(es, pinfo, tree);
 	} else if (stream == STREAM_GOP) {
 		tvbuff_t *es;
@@ -369,7 +369,7 @@ dissect_mpeg_pes(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 		offset = dissect_mpeg_pes_Group_of_pictures(tvb, offset, &asn1_ctx,
 				tree, hf_mpeg_video_group_of_pictures);
 
-		es = tvb_new_subset(tvb, offset / 8, -1, -1);
+		es = tvb_new_subset_remaining(tvb, offset / 8);
 		dissect_mpeg_pes(es, pinfo, tree);
 	} else if (stream == STREAM_PACK) {
 		if (tvb_get_guint8(tvb, offset / 8) >> 6 == 1) {
diff --git a/asn1/pres/packet-pres-template.c b/asn1/pres/packet-pres-template.c
index 01a6035df9..01236857f5 100644
--- a/asn1/pres/packet-pres-template.c
+++ b/asn1/pres/packet-pres-template.c
@@ -208,7 +208,7 @@ pres_try_users_table(guint32 ctx_id, tvbuff_t *tvb, int offset, packet_info *pin
 		if (u->ctx_id == ctx_id) {
 			/* Register oid so other dissectors can find this connection */
 			register_ctx_id_and_oid(pinfo, u->ctx_id, u->oid);
-			next_tvb = tvb_new_subset(tvb, offset, -1, -1);
+			next_tvb = tvb_new_subset_remaining(tvb, offset);
 			call_ber_oid_callback(u->oid, next_tvb, offset, pinfo, global_tree);
 			return TRUE;
 		}
diff --git a/asn1/snmp/packet-snmp-template.c b/asn1/snmp/packet-snmp-template.c
index 74ca2d8b30..35b868b45a 100644
--- a/asn1/snmp/packet-snmp-template.c
+++ b/asn1/snmp/packet-snmp-template.c
@@ -1569,7 +1569,7 @@ dissect_snmp_pdu(tvbuff_t *tvb, int offset, packet_info *pinfo,
 	 * data which needs to be dissected in case of UDP as UDP is PDU oriented.
  	 */
 	if((!is_tcp) && (length_remaining > (guint)offset)) {
-		next_tvb = tvb_new_subset(tvb, offset, -1, -1);
+		next_tvb = tvb_new_subset_remaining(tvb, offset);
 		call_dissector(data_handle, next_tvb, pinfo, tree);
 	}
 	else{
diff --git a/asn1/spnego/packet-spnego-template.c b/asn1/spnego/packet-spnego-template.c
index 0b7f453a6d..d88e58a41e 100644
--- a/asn1/spnego/packet-spnego-template.c
+++ b/asn1/spnego/packet-spnego-template.c
@@ -283,7 +283,7 @@ dissect_spnego_krb5(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 	case KRB_TOKEN_AP_REQ:
 	case KRB_TOKEN_AP_REP:
 	case KRB_TOKEN_AP_ERR:
-	  krb5_tvb = tvb_new_subset(tvb, offset, -1, -1);
+	  krb5_tvb = tvb_new_subset_remaining(tvb, offset);
 	  offset = dissect_kerberos_main(krb5_tvb, pinfo, subtree, FALSE, NULL);
 	  break;
 
@@ -1063,7 +1063,7 @@ dissect_spnego_krb5_cfx_wrap_base(tvbuff_t *tvb, int offset, packet_info *pinfo
 	}
 
 #if defined(HAVE_HEIMDAL_KERBEROS) || defined(HAVE_MIT_KERBEROS)
-	pinfo->gssapi_encrypted_tvb = tvb_new_subset(tvb, 16, -1, -1);
+	pinfo->gssapi_encrypted_tvb = tvb_new_subset_remaining(tvb, 16);
 
 	if (flags & 0x0002) {
 		if(pinfo->gssapi_encrypted_tvb){
diff --git a/asn1/t38/packet-t38-template.c b/asn1/t38/packet-t38-template.c
index d3cca47b22..709e5471b2 100644
--- a/asn1/t38/packet-t38-template.c
+++ b/asn1/t38/packet-t38-template.c
@@ -582,7 +582,7 @@ dissect_t38_tcp_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 
 	while(tvb_length_remaining(tvb,offset)>0)
 	{
-		next_tvb = tvb_new_subset(tvb, offset, -1, -1);
+		next_tvb = tvb_new_subset_remaining(tvb, offset);
 		offset += dissect_IFPPacket_PDU(next_tvb, pinfo, tr);
 		ifp_packet_number++;