X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/ba8936b39b0ce2ff02f3aeb307df4c27657652d8..230e0b85778df66f9cec62d13f0025c78cc0c9da:/print-bootp.c

diff --git a/print-bootp.c b/print-bootp.c
index fcd4d87b..62b337cb 100644
--- a/print-bootp.c
+++ b/print-bootp.c
@@ -361,7 +361,7 @@ bootp_print(netdissect_options *ndo,
 	if (EXTRACT_U_1(bp->bp_sname)) {
 		ND_PRINT("\n\t  sname \"");
 		if (nd_printztn(ndo, bp->bp_sname, (u_int)sizeof(bp->bp_sname),
-				ndo->ndo_snapend)) {
+				ndo->ndo_snapend) == 0) {
 			ND_PRINT("\"");
 			nd_print_trunc(ndo);
 			return;
@@ -372,7 +372,7 @@ bootp_print(netdissect_options *ndo,
 	if (EXTRACT_U_1(bp->bp_file)) {
 		ND_PRINT("\n\t  file \"");
 		if (nd_printztn(ndo, bp->bp_file, (u_int)sizeof(bp->bp_file),
-				ndo->ndo_snapend)) {
+				ndo->ndo_snapend) == 0) {
 			ND_PRINT("\"");
 			nd_print_trunc(ndo);
 			return;
@@ -654,10 +654,7 @@ rfc1048_print(netdissect_options *ndo,
 				ND_PRINT(", occurs %u", ntag);
 		}
 
-		if (!ND_TTEST_LEN(bp, len)) {
-			ND_PRINT("[|rfc1048 %u]", len);
-			return;
-		}
+		ND_TCHECK_LEN(bp, len);
 
 		if (tag == TAG_DHCP_MESSAGE && len == 1) {
 			ND_PRINT("%s", tok2str(dhcp_msg_values, "Unknown (%u)", EXTRACT_U_1(bp)));
@@ -1049,7 +1046,7 @@ rfc1048_print(netdissect_options *ndo,
 	}
 	return;
 trunc:
-	ND_PRINT("|[rfc1048]");
+	nd_print_trunc(ndo);
 }
 
 #define PRINTCMUADDR(m, s) { ND_TCHECK_4(&cmu->m); \