diff options
| author | Francois-Xavier Le Bail <devel.fx.lebail@orange.fr> | 2020-12-11 10:20:58 +0100 |
|---|---|---|
| committer | Francois-Xavier Le Bail <devel.fx.lebail@orange.fr> | 2020-12-11 10:50:25 +0100 |
| commit | fa7eedd1aa13cf963d5809bbc2f1e54bee118869 (patch) | |
| tree | 3a2ecb20f1255a416a2018d491747ce1e8a6bf49 | |
| parent | 2eb023747062b79164c8f34adbf893bec938dd9a (diff) | |
| download | tcpdump-fa7eedd1aa13cf963d5809bbc2f1e54bee118869.tar.gz | |
Replace '(void)nd_print()' calls by nd_printjnp() calls
'(void)nd_print(ndo, start, start + len)' are replaced by
'nd_printjnp(ndo, start, len)'
| -rw-r--r-- | print-hsrp.c | 2 | ||||
| -rw-r--r-- | print-openflow-1.0.c | 14 | ||||
| -rw-r--r-- | print-openflow-1.3.c | 2 | ||||
| -rw-r--r-- | print-vrrp.c | 2 | ||||
| -rw-r--r-- | print-wb.c | 2 |
5 files changed, 11 insertions, 11 deletions
diff --git a/print-hsrp.c b/print-hsrp.c index 0bcca919..30278268 100644 --- a/print-hsrp.c +++ b/print-hsrp.c @@ -127,7 +127,7 @@ hsrp_print(netdissect_options *ndo, const u_char *bp, u_int len) * Authentication Data explicitly, but zero padding can be * inferred from the "recommended default value". */ - (void)nd_print(ndo, hp->hsrp_authdata, hp->hsrp_authdata + HSRP_AUTH_SIZE); + nd_printjnp(ndo, hp->hsrp_authdata, HSRP_AUTH_SIZE); ND_PRINT("\""); } } diff --git a/print-openflow-1.0.c b/print-openflow-1.0.c index aaef0649..d2cc5b9e 100644 --- a/print-openflow-1.0.c +++ b/print-openflow-1.0.c @@ -1038,7 +1038,7 @@ of10_phy_port_print(netdissect_options *ndo, cp += MAC_ADDR_LEN; /* name */ ND_PRINT(", name '"); - (void)nd_print(ndo, cp, cp + OFP_MAX_PORT_NAME_LEN); + nd_printjnp(ndo, cp, OFP_MAX_PORT_NAME_LEN); ND_PRINT("'"); cp += OFP_MAX_PORT_NAME_LEN; @@ -1670,27 +1670,27 @@ of10_desc_stats_reply_print(netdissect_options *ndo, goto invalid; /* mfr_desc */ ND_PRINT("\n\t mfr_desc '"); - (void)nd_print(ndo, cp, cp + DESC_STR_LEN); + nd_printjnp(ndo, cp, DESC_STR_LEN); ND_PRINT("'"); OF_FWD(DESC_STR_LEN); /* hw_desc */ ND_PRINT("\n\t hw_desc '"); - (void)nd_print(ndo, cp, cp + DESC_STR_LEN); + nd_printjnp(ndo, cp, DESC_STR_LEN); ND_PRINT("'"); OF_FWD(DESC_STR_LEN); /* sw_desc */ ND_PRINT("\n\t sw_desc '"); - (void)nd_print(ndo, cp, cp + DESC_STR_LEN); + nd_printjnp(ndo, cp, DESC_STR_LEN); ND_PRINT("'"); OF_FWD(DESC_STR_LEN); /* serial_num */ ND_PRINT("\n\t serial_num '"); - (void)nd_print(ndo, cp, cp + SERIAL_NUM_LEN); + nd_printjnp(ndo, cp, SERIAL_NUM_LEN); ND_PRINT("'"); OF_FWD(SERIAL_NUM_LEN); /* dp_desc */ ND_PRINT("\n\t dp_desc '"); - (void)nd_print(ndo, cp, cp + DESC_STR_LEN); + nd_printjnp(ndo, cp, DESC_STR_LEN); ND_PRINT("'"); return; @@ -1803,7 +1803,7 @@ of10_table_stats_reply_print(netdissect_options *ndo, OF_FWD(3); /* name */ ND_PRINT(", name '"); - (void)nd_print(ndo, cp, cp + OFP_MAX_TABLE_NAME_LEN); + nd_printjnp(ndo, cp, OFP_MAX_TABLE_NAME_LEN); ND_PRINT("'"); OF_FWD(OFP_MAX_TABLE_NAME_LEN); /* wildcards */ diff --git a/print-openflow-1.3.c b/print-openflow-1.3.c index 79de7d7b..9e76ba1b 100644 --- a/print-openflow-1.3.c +++ b/print-openflow-1.3.c @@ -661,7 +661,7 @@ of13_port_print(netdissect_options *ndo, cp += 2; /* name */ ND_PRINT(", name '"); - (void)nd_print(ndo, cp, cp + OFP_MAX_PORT_NAME_LEN); + nd_printjnp(ndo, cp, OFP_MAX_PORT_NAME_LEN); ND_PRINT("'"); cp += OFP_MAX_PORT_NAME_LEN; diff --git a/print-vrrp.c b/print-vrrp.c index 1a2ff590..ee97974e 100644 --- a/print-vrrp.c +++ b/print-vrrp.c @@ -170,7 +170,7 @@ vrrp_print(netdissect_options *ndo, * RFC 2338 Section 5.3.10: "If the configured authentication string * is shorter than 8 bytes, the remaining space MUST be zero-filled. */ - (void)nd_print(ndo, bp, bp + 8); + nd_printjnp(ndo, bp, 8); ND_PRINT("\""); } } @@ -232,7 +232,7 @@ wb_id(netdissect_options *ndo, c = ','; } ND_PRINT("> \""); - (void)nd_print(ndo, sitename, sitename + len); + nd_printjnp(ndo, sitename, len); ND_PRINT("\""); return (0); } |