From: Francois-Xavier Le Bail <devel.fx.lebail@orange.fr>
Date: Thu, 10 Dec 2020 19:40:15 +0000 (+0100)
Subject: Replace the nd_printzp(..., NULL) calls by nd_printjnp() calls
X-Git-Tag: tcpdump-4.99-bp~32
X-Git-Url: https://git.tcpdump.org/tcpdump/commitdiff_plain/763853d9730227503add33b21d26c7db2b5de3b7

Replace the nd_printzp(..., NULL) calls by nd_printjnp() calls
---

diff --git a/print-dtp.c b/print-dtp.c
index a7cb9409..a1ae4ba4 100644
--- a/print-dtp.c
+++ b/print-dtp.c
@@ -91,7 +91,7 @@ dtp_print(netdissect_options *ndo, const u_char *tptr, u_int length)
         switch (type) {
 	case DTP_DOMAIN_TLV:
 		ND_PRINT(", ");
-		nd_printzp(ndo, tptr+4, len-4, NULL);
+		nd_printjnp(ndo, tptr+4, len-4);
 		break;
 
 	case DTP_STATUS_TLV:
diff --git a/print-ipx.c b/print-ipx.c
index 0e12c252..c16a8673 100644
--- a/print-ipx.c
+++ b/print-ipx.c
@@ -188,7 +188,7 @@ ipx_sap_print(netdissect_options *ndo, const u_char *ipx, u_int length)
 		ND_PRINT("'");
 		goto invalid;
 	    }
-	    nd_printzp(ndo, ipx, 48, NULL);
+	    nd_printjnp(ndo, ipx, 48);
 	    ND_PRINT("'");
 	    ipx += 48;
 	    length -= 48;
diff --git a/print-udld.c b/print-udld.c
index 37e36d6b..aec1d9e5 100644
--- a/print-udld.c
+++ b/print-udld.c
@@ -169,7 +169,7 @@ udld_print(netdissect_options *ndo,
         case UDLD_PORT_ID_TLV:
         case UDLD_DEVICE_NAME_TLV:
             ND_PRINT(", ");
-            nd_printzp(ndo, tptr, len, NULL);
+            nd_printjnp(ndo, tptr, len);
             break;
 
         case UDLD_ECHO_TLV:
diff --git a/print-vtp.c b/print-vtp.c
index e0c7ded2..bcee64cf 100644
--- a/print-vtp.c
+++ b/print-vtp.c
@@ -151,7 +151,7 @@ vtp_print(netdissect_options *ndo,
 	ND_PRINT(" [invalid MgmtD Len %u]", mgmtd_len);
 	goto invalid;
     }
-    nd_printzp(ndo, tptr + 4, mgmtd_len, NULL);
+    nd_printjnp(ndo, tptr + 4, mgmtd_len);
     ND_PRINT(", %s: %u",
 	   tok2str(vtp_header_values, "Unknown", type),
 	   GET_U_1(tptr + 2));
@@ -261,7 +261,7 @@ vtp_print(netdissect_options *ndo,
 	    name_len = GET_U_1(vtp_vlan->name_len);
 	    if (len < 4*((name_len + 3)/4))
 		goto invalid;
-	    nd_printzp(ndo, tptr, name_len, NULL);
+	    nd_printjnp(ndo, tptr, name_len);
 
 	    /*
 	     * Vlan names are aligned to 32-bit boundaries.