Use more the ND_TCHECK_n() macros

Author: fxlb

print-erspan.c

@@ -244,13 +244,13 @@ erspan_iii_print(netdissect_options *ndo, const u_char *bp, u_int len)
 
 	/* Skip timestamp */
 	ND_ICHECK_U(len, <, 4);
-	ND_TCHECK_LEN(bp, 4);
+	ND_TCHECK_4(bp);
 	bp += 4;
 	len -= 4;
 
 	/* Skip SGT */
 	ND_ICHECK_U(len, <, 2);
-	ND_TCHECK_LEN(bp, 2);
+	ND_TCHECK_2(bp);
 	bp += 2;
 	len -= 2;
 
@@ -269,7 +269,7 @@ erspan_iii_print(netdissect_options *ndo, const u_char *bp, u_int len)
 	if (hdr2 & ERSPAN3_O_MASK) {
 		/* Yes.  Skip it. */
 		ND_ICHECK_U(len, <, 8);
-		ND_TCHECK_LEN(bp, 8);
+		ND_TCHECK_8(bp);
 		bp += 8;
 		len -= 8;
 	}

print-ether.c

@@ -479,7 +479,7 @@ netanalyzer_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h,
 	 * Fail if we don't have enough data for the Hilscher pseudo-header.
 	 */
 	ndo->ndo_protocol = "netanalyzer";
-	ND_TCHECK_LEN(p, 4);
+	ND_TCHECK_4(p);
 
 	/* Skip the pseudo-header. */
 	ndo->ndo_ll_hdr_len += 4;

print-gre.c

@@ -371,7 +371,7 @@ gre_print_1(netdissect_options *ndo, const u_char *bp, u_int length)
 	if (flags & GRE_KP) {
 		/* Skip payload length? */
 		ND_ICHECK_U(len, <, 2);
-		ND_TCHECK_LEN(bp, 2);
+		ND_TCHECK_2(bp);
 		len -= 2;
 		bp += 2;
 

print-msdp.c

@@ -70,7 +70,7 @@ msdp_print(netdissect_options *ndo, const u_char *sp, u_int length)
 			/* RP Address */
 			ND_ICHECK_U(len, <, 8);
 			/* XXX -print this based on ndo_vflag? */
-			ND_TCHECK_LEN(sp + 4, 4);
+			ND_TCHECK_4(sp + 4);
 
 			/* Entries */
 			ND_TCHECK_LEN(sp + 8, entry_count*12);