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

diff --git a/print-dtp.c b/print-dtp.c
index a7cb9409227e515e5c20eacce60e9df451a0d391..a1ae4ba4d5aa047ec6efc81ad12328fa1d09aa51 100644 (file)
--- 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 0e12c2521dc138144918ab93484cf1e2e10ea7ac..c16a8673448781c4725fc6d3525ab1c39a246cf0 100644 (file)
--- 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 37e36d6bdace94d2c9653fdfa8e5742f583b2ce9..aec1d9e5727894e9f282116dbc2f71c976d46980 100644 (file)
--- 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 e0c7ded272490b7117540c4c01469082b64bd2f6..bcee64cfe58d215bfc2b01e667aa505fd437f228 100644 (file)
--- 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.