Replace the (void)nd_printzp() calls by nd_printjnp() calls

diff --git a/print-cfm.c b/print-cfm.c
index da544a159fd89b6c9a3e707cfad43544876e9b15..267aa25b4ffd9e3ad66050556ae2b34d5b687fb0 100644 (file)
--- a/print-cfm.c
+++ b/print-cfm.c
@@ -401,7 +401,7 @@ cfm_print(netdissect_options *ndo,
             switch (md_nameformat) {
             case CFM_CCM_MD_FORMAT_DNS:
             case CFM_CCM_MD_FORMAT_CHAR:
             switch (md_nameformat) {
             case CFM_CCM_MD_FORMAT_DNS:
             case CFM_CCM_MD_FORMAT_CHAR:

-                (void)nd_printzp(ndo, md_name, md_namelength, NULL);
+                nd_printjnp(ndo, md_name, md_namelength);

                 break;
 
             case CFM_CCM_MD_FORMAT_MAC:
                 break;
 
             case CFM_CCM_MD_FORMAT_MAC:


@@ -452,7 +452,7 @@ cfm_print(netdissect_options *ndo,
         ND_PRINT("\n\t  MA Name: ");
         switch (ma_nameformat) {
         case CFM_CCM_MA_FORMAT_CHAR:
         ND_PRINT("\n\t  MA Name: ");
         switch (ma_nameformat) {
         case CFM_CCM_MA_FORMAT_CHAR:

-            (void)nd_printzp(ndo, ma_name, ma_namelength, NULL);
+            nd_printjnp(ndo, ma_name, ma_namelength);

             break;
 
             /* FIXME add printers for those MA formats - hexdump for now */
             break;
 
             /* FIXME add printers for those MA formats - hexdump for now */


@@ -657,7 +657,7 @@ cfm_print(netdissect_options *ndo,
                 case CFM_CHASSIS_ID_LOCAL:
                 case CFM_CHASSIS_ID_CHASSIS_COMPONENT:
                 case CFM_CHASSIS_ID_PORT_COMPONENT:
                 case CFM_CHASSIS_ID_LOCAL:
                 case CFM_CHASSIS_ID_CHASSIS_COMPONENT:
                 case CFM_CHASSIS_ID_PORT_COMPONENT:

-                    (void)nd_printzp(ndo, tptr + 1, chassis_id_length, NULL);
+                    nd_printjnp(ndo, tptr + 1, chassis_id_length);

                     break;
 
                 default:
                     break;
 
                 default:

diff --git a/print-eap.c b/print-eap.c
index 00d40889bd898caeb84f895318071eccc4e47a24..b0542ad94b59ac8c2ebc5665f268c141877ea464 100644 (file)
--- a/print-eap.c
+++ b/print-eap.c
@@ -178,14 +178,14 @@ eap_print(netdissect_options *ndo,
             case EAP_TYPE_IDENTITY:
                 if (len - 5 > 0) {
                     ND_PRINT(", Identity: ");
             case EAP_TYPE_IDENTITY:
                 if (len - 5 > 0) {
                     ND_PRINT(", Identity: ");

-                    (void)nd_printzp(ndo, cp + 5, len - 5, NULL);
+                    nd_printjnp(ndo, cp + 5, len - 5);

                 }
                 break;
 
             case EAP_TYPE_NOTIFICATION:
                 if (len - 5 > 0) {
                     ND_PRINT(", Notification: ");
                 }
                 break;
 
             case EAP_TYPE_NOTIFICATION:
                 if (len - 5 > 0) {
                     ND_PRINT(", Notification: ");

-                    (void)nd_printzp(ndo, cp + 5, len - 5, NULL);
+                    nd_printjnp(ndo, cp + 5, len - 5);

                 }
                 break;
 
                 }
                 break;
 

diff --git a/print-hncp.c b/print-hncp.c
index 1a30325ff3572d028e1de4863c1d48bb3cd60c49..b288160d6efcb8d8ea44c92141b69c7891b5b2f9 100644 (file)
--- a/print-hncp.c
+++ b/print-hncp.c
@@ -252,11 +252,11 @@ print_dns_label(netdissect_options *ndo,
             ND_PRINT(".");
         if (length+lab_length > max_length) {
             if (print)
             ND_PRINT(".");
         if (length+lab_length > max_length) {
             if (print)

-                (void)nd_printzp(ndo, cp+length, max_length-length, NULL);
+                nd_printjnp(ndo, cp+length, max_length-length);

             break;
         }
         if (print)
             break;
         }
         if (print)

-            (void)nd_printzp(ndo, cp+length, lab_length, NULL);
+            nd_printjnp(ndo, cp+length, lab_length);

         length += lab_length;
     }
     if (print)
         length += lab_length;
     }
     if (print)


@@ -586,7 +586,7 @@ hncp_print_rec(netdissect_options *ndo,
             ND_PRINT(" Verdict: %u Fingerprint: %s Common Name: ",
                 GET_U_1(value),
                 format_256(ndo, value + 4));
             ND_PRINT(" Verdict: %u Fingerprint: %s Common Name: ",
                 GET_U_1(value),
                 format_256(ndo, value + 4));

-            (void)nd_printzp(ndo, value + 36, bodylen - 36, NULL);
+            nd_printjnp(ndo, value + 36, bodylen - 36);

         }
             break;
 
         }
             break;
 


@@ -605,7 +605,7 @@ hncp_print_rec(netdissect_options *ndo,
             ND_PRINT(" M: %u P: %u H: %u L: %u User-agent: ",
                 M, P, H, L
             );
             ND_PRINT(" M: %u P: %u H: %u L: %u User-agent: ",
                 M, P, H, L
             );

-            (void)nd_printzp(ndo, value + 4, bodylen - 4, NULL);
+            nd_printjnp(ndo, value + 4, bodylen - 4);

         }
             break;
 
         }
             break;
 


@@ -690,7 +690,7 @@ hncp_print_rec(netdissect_options *ndo,
                 print_dns_label(ndo, value+1, bodylen-1, 1);
             } else if (policy == 130) {
                 ND_PRINT("Opaque UTF-8: ");
                 print_dns_label(ndo, value+1, bodylen-1, 1);
             } else if (policy == 130) {
                 ND_PRINT("Opaque UTF-8: ");

-                (void)nd_printzp(ndo, value + 1, bodylen - 1, NULL);
+                nd_printjnp(ndo, value + 1, bodylen - 1);

             } else if (policy == 131) {
                 if (bodylen != 1) {
                     nd_print_invalid(ndo);
             } else if (policy == 131) {
                 if (bodylen != 1) {
                     nd_print_invalid(ndo);


@@ -820,7 +820,7 @@ hncp_print_rec(netdissect_options *ndo,
             );
             if (l < 64) {
                 ND_PRINT("\"");
             );
             if (l < 64) {
                 ND_PRINT("\"");

-                (void)nd_printzp(ndo, value + 17, l, NULL);
+                nd_printjnp(ndo, value + 17, l);

                 ND_PRINT("\"");
             } else {
                 nd_print_invalid(ndo);
                 ND_PRINT("\"");
             } else {
                 nd_print_invalid(ndo);

diff --git a/print-lldp.c b/print-lldp.c
index 812d72e58f18b7a3b9c2efdd417eb821e028eb1f..a0cd9ba480042a2bc9840bdb3d4348a39d7dca5c 100644 (file)
--- a/print-lldp.c
+++ b/print-lldp.c
@@ -701,7 +701,7 @@ lldp_private_8021_print(netdissect_options *ndo,
             return hexdump;
         }
         ND_PRINT("\n\t    vlan name: ");
             return hexdump;
         }
         ND_PRINT("\n\t    vlan name: ");

-        (void)nd_printzp(ndo, tptr + 7, sublen, NULL);
+        nd_printjnp(ndo, tptr + 7, sublen);

         break;
     case LLDP_PRIVATE_8021_SUBTYPE_PROTOCOL_IDENTITY:
         if (tlv_len < 5) {
         break;
     case LLDP_PRIVATE_8021_SUBTYPE_PROTOCOL_IDENTITY:
         if (tlv_len < 5) {


@@ -712,7 +712,7 @@ lldp_private_8021_print(netdissect_options *ndo,
             return hexdump;
         }
         ND_PRINT("\n\t    protocol identity: ");
             return hexdump;
         }
         ND_PRINT("\n\t    protocol identity: ");

-        (void)nd_printzp(ndo, tptr + 5, sublen, NULL);
+        nd_printjnp(ndo, tptr + 5, sublen);

         break;
 
     case LLDP_PRIVATE_8021_SUBTYPE_LINKAGGR:
         break;
 
     case LLDP_PRIVATE_8021_SUBTYPE_LINKAGGR:


@@ -1082,7 +1082,7 @@ lldp_private_tia_print(netdissect_options *ndo,
                    GET_U_1(tptr + 6));
 
             /* Country code */
                    GET_U_1(tptr + 6));
 
             /* Country code */

-            (void)nd_printzp(ndo, tptr + 7, 2, NULL);
+            nd_printjnp(ndo, tptr + 7, 2);

 
             lci_len = lci_len-3;
             tptr = tptr + 9;
 
             lci_len = lci_len-3;
             tptr = tptr + 9;


@@ -1110,7 +1110,7 @@ lldp_private_tia_print(netdissect_options *ndo,
                    return hexdump;
                }
 
                    return hexdump;
                }
 

-                (void)nd_printzp(ndo, tptr, ca_len, NULL);
+                nd_printjnp(ndo, tptr, ca_len);

                 tptr += ca_len;
                 lci_len -= ca_len;
             }
                 tptr += ca_len;
                 lci_len -= ca_len;
             }


@@ -1118,7 +1118,7 @@ lldp_private_tia_print(netdissect_options *ndo,
 
         case LLDP_TIA_LOCATION_DATA_FORMAT_ECS_ELIN:
             ND_PRINT("\n\t    ECS ELIN id ");
 
         case LLDP_TIA_LOCATION_DATA_FORMAT_ECS_ELIN:
             ND_PRINT("\n\t    ECS ELIN id ");

-            (void)nd_printzp(ndo, tptr + 5, tlv_len - 5, NULL);
+            nd_printjnp(ndo, tptr + 5, tlv_len - 5);

             break;
 
         default:
             break;
 
         default:


@@ -1155,7 +1155,7 @@ lldp_private_tia_print(netdissect_options *ndo,
     case LLDP_PRIVATE_TIA_SUBTYPE_INVENTORY_ASSET_ID:
         ND_PRINT("\n\t  %s ",
                tok2str(lldp_tia_inventory_values, "unknown", subtype));
     case LLDP_PRIVATE_TIA_SUBTYPE_INVENTORY_ASSET_ID:
         ND_PRINT("\n\t  %s ",
                tok2str(lldp_tia_inventory_values, "unknown", subtype));

-        (void)nd_printzp(ndo, tptr + 4, tlv_len - 4, NULL);
+        nd_printjnp(ndo, tptr + 4, tlv_len - 4);

         break;
 
     default:
         break;
 
     default:


@@ -1436,7 +1436,7 @@ lldp_mgmt_addr_tlv_print(netdissect_options *ndo,
         }
         if (oid_len) {
             ND_PRINT("\n\t  OID length %u", oid_len);
         }
         if (oid_len) {
             ND_PRINT("\n\t  OID length %u", oid_len);

-            (void)nd_printzp(ndo, tptr + 1, oid_len, NULL);
+            nd_printjnp(ndo, tptr + 1, oid_len);

         }
     }
 
         }
     }
 


@@ -1513,7 +1513,7 @@ lldp_print(netdissect_options *ndo,
                 case LLDP_CHASSIS_CHASSIS_COMP_SUBTYPE:
                 case LLDP_CHASSIS_INTF_ALIAS_SUBTYPE:
                 case LLDP_CHASSIS_PORT_COMP_SUBTYPE:
                 case LLDP_CHASSIS_CHASSIS_COMP_SUBTYPE:
                 case LLDP_CHASSIS_INTF_ALIAS_SUBTYPE:
                 case LLDP_CHASSIS_PORT_COMP_SUBTYPE:

-                    (void)nd_printzp(ndo, tptr + 1, tlv_len - 1, NULL);
+                    nd_printjnp(ndo, tptr + 1, tlv_len - 1);

                     break;
 
                 case LLDP_CHASSIS_NETWORK_ADDR_SUBTYPE:
                     break;
 
                 case LLDP_CHASSIS_NETWORK_ADDR_SUBTYPE:


@@ -1554,7 +1554,7 @@ lldp_print(netdissect_options *ndo,
                 case LLDP_PORT_AGENT_CIRC_ID_SUBTYPE:
                 case LLDP_PORT_INTF_ALIAS_SUBTYPE:
                 case LLDP_PORT_PORT_COMP_SUBTYPE:
                 case LLDP_PORT_AGENT_CIRC_ID_SUBTYPE:
                 case LLDP_PORT_INTF_ALIAS_SUBTYPE:
                 case LLDP_PORT_PORT_COMP_SUBTYPE:

-                    (void)nd_printzp(ndo, tptr + 1, tlv_len - 1, NULL);
+                    nd_printjnp(ndo, tptr + 1, tlv_len - 1);

                     break;
 
                 case LLDP_PORT_NETWORK_ADDR_SUBTYPE:
                     break;
 
                 case LLDP_PORT_NETWORK_ADDR_SUBTYPE:


@@ -1584,7 +1584,7 @@ lldp_print(netdissect_options *ndo,
         case LLDP_PORT_DESCR_TLV:
             if (ndo->ndo_vflag) {
                 ND_PRINT(": ");
         case LLDP_PORT_DESCR_TLV:
             if (ndo->ndo_vflag) {
                 ND_PRINT(": ");

-                (void)nd_printzp(ndo, tptr, tlv_len, NULL);
+                nd_printjnp(ndo, tptr, tlv_len);

             }
             break;
 
             }
             break;
 


@@ -1594,13 +1594,13 @@ lldp_print(netdissect_options *ndo,
              * similar to the CDP printer.
              */
             ND_PRINT(": ");
              * similar to the CDP printer.
              */
             ND_PRINT(": ");

-            (void)nd_printzp(ndo, tptr, tlv_len, NULL);
+            nd_printjnp(ndo, tptr, tlv_len);

             break;
 
         case LLDP_SYSTEM_DESCR_TLV:
             if (ndo->ndo_vflag) {
                 ND_PRINT("\n\t  ");
             break;
 
         case LLDP_SYSTEM_DESCR_TLV:
             if (ndo->ndo_vflag) {
                 ND_PRINT("\n\t  ");

-                (void)nd_printzp(ndo, tptr, tlv_len, NULL);
+                nd_printjnp(ndo, tptr, tlv_len);

             }
             break;
 
             }
             break;
 

diff --git a/print-ospf.c b/print-ospf.c
index 8e6a003f4d2fdbc7687b10f0525bb854224fd82e..c370bda71b84dd987345e401209705aa23f0f27d 100644 (file)
--- a/print-ospf.c
+++ b/print-ospf.c
@@ -1142,7 +1142,7 @@ ospf_print(netdissect_options *ndo,
 
                case OSPF_AUTH_SIMPLE:
                        ND_PRINT("\n\tSimple text password: ");
 
                case OSPF_AUTH_SIMPLE:
                        ND_PRINT("\n\tSimple text password: ");

-                       (void)nd_printzp(ndo, op->ospf_authdata, OSPF_AUTH_SIMPLE_LEN, NULL);
+                       nd_printjnp(ndo, op->ospf_authdata, OSPF_AUTH_SIMPLE_LEN);

                        break;
 
                case OSPF_AUTH_MD5:
                        break;
 
                case OSPF_AUTH_MD5:

diff --git a/print-stp.c b/print-stp.c
index b8973ace81c9bb5285815759e9f51c375fe1bef3..ad4cdc206eadc0b6a2e7ca8de38d909ac67d3edd 100644 (file)
--- a/print-stp.c
+++ b/print-stp.c
@@ -276,7 +276,7 @@ stp_print_mstp_bpdu(netdissect_options *ndo, const struct stp_bpdu_ *stp_bpdu,
 
     ND_PRINT("\n\tv3len %u, ", GET_BE_U_2(ptr + MST_BPDU_VER3_LEN_OFFSET));
     ND_PRINT("MCID Name ");
 
     ND_PRINT("\n\tv3len %u, ", GET_BE_U_2(ptr + MST_BPDU_VER3_LEN_OFFSET));
     ND_PRINT("MCID Name ");

-    (void)nd_printzp(ndo, ptr + MST_BPDU_CONFIG_NAME_OFFSET, 32, NULL);
+    nd_printjnp(ndo, ptr + MST_BPDU_CONFIG_NAME_OFFSET, 32);

     ND_PRINT(", rev %u,"
             "\n\t\tdigest %08x%08x%08x%08x, ",
                  GET_BE_U_2(ptr + MST_BPDU_CONFIG_NAME_OFFSET + 32),
     ND_PRINT(", rev %u,"
             "\n\t\tdigest %08x%08x%08x%08x, ",
                  GET_BE_U_2(ptr + MST_BPDU_CONFIG_NAME_OFFSET + 32),


@@ -340,7 +340,7 @@ stp_print_spb_bpdu(netdissect_options *ndo, const struct stp_bpdu_ *stp_bpdu,
 
     ND_PRINT("\n\tv4len %u, ", GET_BE_U_2(ptr + offset));
     ND_PRINT("AUXMCID Name ");
 
     ND_PRINT("\n\tv4len %u, ", GET_BE_U_2(ptr + offset));
     ND_PRINT("AUXMCID Name ");

-    (void)nd_printzp(ndo, ptr + offset + SPB_BPDU_CONFIG_NAME_OFFSET, 32, NULL);
+    nd_printjnp(ndo, ptr + offset + SPB_BPDU_CONFIG_NAME_OFFSET, 32);

     ND_PRINT(", Rev %u,\n\t\tdigest %08x%08x%08x%08x",
             GET_BE_U_2(ptr + offset + SPB_BPDU_CONFIG_REV_OFFSET),
             GET_BE_U_4(ptr + offset + SPB_BPDU_CONFIG_DIGEST_OFFSET),
     ND_PRINT(", Rev %u,\n\t\tdigest %08x%08x%08x%08x",
             GET_BE_U_2(ptr + offset + SPB_BPDU_CONFIG_REV_OFFSET),
             GET_BE_U_4(ptr + offset + SPB_BPDU_CONFIG_DIGEST_OFFSET),

diff --git a/print-timed.c b/print-timed.c
index 0e4c48e7cb9d171dce11e57843ac65b9659a8b0e..ebd0ac8adca69bc247cf385e4d1e41d1bf144e00 100644 (file)
--- a/print-timed.c
+++ b/print-timed.c
@@ -149,5 +149,5 @@ timed_print(netdissect_options *ndo,
                break;
        }
        ND_PRINT(" name ");
                break;
        }
        ND_PRINT(" name ");

-       (void)nd_printzp(ndo, tsp->tsp_name, sizeof(tsp->tsp_name), NULL);
+       nd_printjnp(ndo, tsp->tsp_name, sizeof(tsp->tsp_name));

 }
 }

diff --git a/print-vqp.c b/print-vqp.c
index b990538d4ff76fbd7a7b7bf8e0dd4684b8b4a707..f87898e0d3e2aabd456614f106d426113620bd66 100644 (file)
--- a/print-vqp.c
+++ b/print-vqp.c
@@ -190,7 +190,7 @@ vqp_print(netdissect_options *ndo, const u_char *pptr, u_int len)
        case VQP_OBJ_VLAN_NAME:
        case VQP_OBJ_VTP_DOMAIN:
        case VQP_OBJ_ETHERNET_PKT:
        case VQP_OBJ_VLAN_NAME:
        case VQP_OBJ_VTP_DOMAIN:
        case VQP_OBJ_ETHERNET_PKT:

-            (void)nd_printzp(ndo, tptr, vqp_obj_len, NULL);
+            nd_printjnp(ndo, tptr, vqp_obj_len);

             break;
             /* those objects have similar semantics - fall through */
        case VQP_OBJ_MAC_ADDRESS:
             break;
             /* those objects have similar semantics - fall through */
        case VQP_OBJ_MAC_ADDRESS: