X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/49b23c5a9b0198bb382dcf43c458d46fcf2fa809..84ef17ac0eecb3efc11a63c3f2c578ae78732c02:/print-loopback.c

diff --git a/print-loopback.c b/print-loopback.c
index 10f69310..b7402025 100644
--- a/print-loopback.c
+++ b/print-loopback.c
@@ -63,8 +63,8 @@ loopback_message_print(netdissect_options *ndo, const u_char *cp, const u_int le
 	if (len < 2)
 		goto invalid;
 	/* function */
-	ND_TCHECK2(*cp, 2);
-	function = EXTRACT_LE_16BITS(cp);
+	ND_TCHECK_2(cp);
+	function = EXTRACT_LE_U_2(cp);
 	cp += 2;
 	ND_PRINT((ndo, ", %s", tok2str(fcode_str, " invalid (%u)", function)));
 
@@ -73,33 +73,33 @@ loopback_message_print(netdissect_options *ndo, const u_char *cp, const u_int le
 			if (len < 4)
 				goto invalid;
 			/* receipt number */
-			ND_TCHECK2(*cp, 2);
-			ND_PRINT((ndo, ", receipt number %u", EXTRACT_LE_16BITS(cp)));
+			ND_TCHECK_2(cp);
+			ND_PRINT((ndo, ", receipt number %u", EXTRACT_LE_U_2(cp)));
 			cp += 2;
 			/* data */
 			ND_PRINT((ndo, ", data (%u octets)", len - 4));
-			ND_TCHECK2(*cp, len - 4);
+			ND_TCHECK_LEN(cp, len - 4);
 			break;
 		case LOOPBACK_FWDDATA:
 			if (len < 8)
 				goto invalid;
 			/* forwarding address */
-			ND_TCHECK2(*cp, ETHER_ADDR_LEN);
+			ND_TCHECK_LEN(cp, ETHER_ADDR_LEN);
 			ND_PRINT((ndo, ", forwarding address %s", etheraddr_string(ndo, cp)));
 			cp += ETHER_ADDR_LEN;
 			/* data */
 			ND_PRINT((ndo, ", data (%u octets)", len - 8));
-			ND_TCHECK2(*cp, len - 8);
+			ND_TCHECK_LEN(cp, len - 8);
 			break;
 		default:
-			ND_TCHECK2(*cp, len - 2);
+			ND_TCHECK_LEN(cp, len - 2);
 			break;
 	}
 	return;
 
 invalid:
 	ND_PRINT((ndo, "%s", istr));
-	ND_TCHECK2(*cp, ep - cp);
+	ND_TCHECK_LEN(cp, ep - cp);
 	return;
 trunc:
 	ND_PRINT((ndo, "%s", tstr));
@@ -115,8 +115,8 @@ loopback_print(netdissect_options *ndo, const u_char *cp, const u_int len)
 	if (len < 2)
 		goto invalid;
 	/* skipCount */
-	ND_TCHECK2(*cp, 2);
-	skipCount = EXTRACT_LE_16BITS(cp);
+	ND_TCHECK_2(cp);
+	skipCount = EXTRACT_LE_U_2(cp);
 	cp += 2;
 	ND_PRINT((ndo, ", skipCount %u", skipCount));
 	if (skipCount % 8)
@@ -128,7 +128,7 @@ loopback_print(netdissect_options *ndo, const u_char *cp, const u_int len)
 
 invalid:
 	ND_PRINT((ndo, "%s", istr));
-	ND_TCHECK2(*cp, ep - cp);
+	ND_TCHECK_LEN(cp, ep - cp);
 	return;
 trunc:
 	ND_PRINT((ndo, "%s", tstr));