Update ND_PRINT() as a variadic macro

1 files changed, 126 insertions, 126 deletions

diff --git a/print-dhcp6.c b/print-dhcp6.c
index f36e25ed..5e8585c0 100644
--- a/print-dhcp6.c
+++ b/print-dhcp6.c
@@ -307,130 +307,130 @@ dhcp6opt_print(netdissect_options *ndo,
 		if (ep < cp + sizeof(*dh6o) + optlen)
 			goto trunc;
 		opttype = EXTRACT_BE_U_2(&dh6o->dh6opt_type);
-		ND_PRINT((ndo, " (%s", tok2str(dh6opt_str, "opt_%u", opttype)));
+		ND_PRINT(" (%s", tok2str(dh6opt_str, "opt_%u", opttype));
 		ND_TCHECK_LEN(cp + sizeof(*dh6o), optlen);
 		switch (opttype) {
 		case DH6OPT_CLIENTID:
 		case DH6OPT_SERVERID:
 			if (optlen < 2) {
 				/*(*/
-				ND_PRINT((ndo, " ?)"));
+				ND_PRINT(" ?)");
 				break;
 			}
 			tp = (const u_char *)(dh6o + 1);
 			switch (EXTRACT_BE_U_2(tp)) {
 			case 1:
 				if (optlen >= 2 + 6) {
-					ND_PRINT((ndo, " hwaddr/time type %u time %u ",
+					ND_PRINT(" hwaddr/time type %u time %u ",
 					    EXTRACT_BE_U_2(tp + 2),
-					    EXTRACT_BE_U_4(tp + 4)));
+					    EXTRACT_BE_U_4(tp + 4));
 					for (i = 8; i < optlen; i++)
-						ND_PRINT((ndo, "%02x", EXTRACT_U_1(tp + i)));
+						ND_PRINT("%02x", EXTRACT_U_1(tp + i));
 					/*(*/
-					ND_PRINT((ndo, ")"));
+					ND_PRINT(")");
 				} else {
 					/*(*/
-					ND_PRINT((ndo, " ?)"));
+					ND_PRINT(" ?)");
 				}
 				break;
 			case 2:
 				if (optlen >= 2 + 8) {
-					ND_PRINT((ndo, " vid "));
+					ND_PRINT(" vid ");
 					for (i = 2; i < 2 + 8; i++)
-						ND_PRINT((ndo, "%02x", EXTRACT_U_1(tp + i)));
+						ND_PRINT("%02x", EXTRACT_U_1(tp + i));
 					/*(*/
-					ND_PRINT((ndo, ")"));
+					ND_PRINT(")");
 				} else {
 					/*(*/
-					ND_PRINT((ndo, " ?)"));
+					ND_PRINT(" ?)");
 				}
 				break;
 			case 3:
 				if (optlen >= 2 + 2) {
-					ND_PRINT((ndo, " hwaddr type %u ",
-					    EXTRACT_BE_U_2(tp + 2)));
+					ND_PRINT(" hwaddr type %u ",
+					    EXTRACT_BE_U_2(tp + 2));
 					for (i = 4; i < optlen; i++)
-						ND_PRINT((ndo, "%02x", EXTRACT_U_1(tp + i)));
+						ND_PRINT("%02x", EXTRACT_U_1(tp + i));
 					/*(*/
-					ND_PRINT((ndo, ")"));
+					ND_PRINT(")");
 				} else {
 					/*(*/
-					ND_PRINT((ndo, " ?)"));
+					ND_PRINT(" ?)");
 				}
 				break;
 			default:
-				ND_PRINT((ndo, " type %d)", EXTRACT_BE_U_2(tp)));
+				ND_PRINT(" type %d)", EXTRACT_BE_U_2(tp));
 				break;
 			}
 			break;
 		case DH6OPT_IA_ADDR:
 			if (optlen < 24) {
 				/*(*/
-				ND_PRINT((ndo, " ?)"));
+				ND_PRINT(" ?)");
 				break;
 			}
 			tp = (const u_char *)(dh6o + 1);
-			ND_PRINT((ndo, " %s", ip6addr_string(ndo, tp)));
-			ND_PRINT((ndo, " pltime:%u vltime:%u",
+			ND_PRINT(" %s", ip6addr_string(ndo, tp));
+			ND_PRINT(" pltime:%u vltime:%u",
 			    EXTRACT_BE_U_4(tp + 16),
-			    EXTRACT_BE_U_4(tp + 20)));
+			    EXTRACT_BE_U_4(tp + 20));
 			if (optlen > 24) {
 				/* there are sub-options */
 				dhcp6opt_print(ndo, tp + 24, tp + optlen);
 			}
-			ND_PRINT((ndo, ")"));
+			ND_PRINT(")");
 			break;
 		case DH6OPT_ORO:
 		case DH6OPT_ERO:
 			if (optlen % 2) {
-				ND_PRINT((ndo, " ?)"));
+				ND_PRINT(" ?)");
 				break;
 			}
 			tp = (const u_char *)(dh6o + 1);
 			for (i = 0; i < optlen; i += 2) {
-				ND_PRINT((ndo, " %s",
-				    tok2str(dh6opt_str, "opt_%u", EXTRACT_BE_U_2(tp + i))));
+				ND_PRINT(" %s",
+				    tok2str(dh6opt_str, "opt_%u", EXTRACT_BE_U_2(tp + i)));
 			}
-			ND_PRINT((ndo, ")"));
+			ND_PRINT(")");
 			break;
 		case DH6OPT_PREFERENCE:
 			if (optlen != 1) {
-				ND_PRINT((ndo, " ?)"));
+				ND_PRINT(" ?)");
 				break;
 			}
 			tp = (const u_char *)(dh6o + 1);
-			ND_PRINT((ndo, " %d)", EXTRACT_U_1(tp)));
+			ND_PRINT(" %d)", EXTRACT_U_1(tp));
 			break;
 		case DH6OPT_ELAPSED_TIME:
 			if (optlen != 2) {
-				ND_PRINT((ndo, " ?)"));
+				ND_PRINT(" ?)");
 				break;
 			}
 			tp = (const u_char *)(dh6o + 1);
-			ND_PRINT((ndo, " %d)", EXTRACT_BE_U_2(tp)));
+			ND_PRINT(" %d)", EXTRACT_BE_U_2(tp));
 			break;
 		case DH6OPT_RELAY_MSG:
-			ND_PRINT((ndo, " ("));
+			ND_PRINT(" (");
 			tp = (const u_char *)(dh6o + 1);
 			dhcp6_print(ndo, tp, optlen);
-			ND_PRINT((ndo, ")"));
+			ND_PRINT(")");
 			break;
 		case DH6OPT_AUTH:
 			if (optlen < 11) {
-				ND_PRINT((ndo, " ?)"));
+				ND_PRINT(" ?)");
 				break;
 			}
 			tp = (const u_char *)(dh6o + 1);
 			auth_proto = EXTRACT_U_1(tp);
 			switch (auth_proto) {
 			case DH6OPT_AUTHPROTO_DELAYED:
-				ND_PRINT((ndo, " proto: delayed"));
+				ND_PRINT(" proto: delayed");
 				break;
 			case DH6OPT_AUTHPROTO_RECONFIG:
-				ND_PRINT((ndo, " proto: reconfigure"));
+				ND_PRINT(" proto: reconfigure");
 				break;
 			default:
-				ND_PRINT((ndo, " proto: %d", auth_proto));
+				ND_PRINT(" proto: %d", auth_proto);
 				break;
 			}
 			tp++;
@@ -438,26 +438,26 @@ dhcp6opt_print(netdissect_options *ndo,
 			switch (auth_alg) {
 			case DH6OPT_AUTHALG_HMACMD5:
 				/* XXX: may depend on the protocol */
-				ND_PRINT((ndo, ", alg: HMAC-MD5"));
+				ND_PRINT(", alg: HMAC-MD5");
 				break;
 			default:
-				ND_PRINT((ndo, ", alg: %d", auth_alg));
+				ND_PRINT(", alg: %d", auth_alg);
 				break;
 			}
 			tp++;
 			auth_rdm = EXTRACT_U_1(tp);
 			switch (auth_rdm) {
 			case DH6OPT_AUTHRDM_MONOCOUNTER:
-				ND_PRINT((ndo, ", RDM: mono"));
+				ND_PRINT(", RDM: mono");
 				break;
 			default:
-				ND_PRINT((ndo, ", RDM: %d", auth_rdm));
+				ND_PRINT(", RDM: %d", auth_rdm);
 				break;
 			}
 			tp++;
-			ND_PRINT((ndo, ", RD:"));
+			ND_PRINT(", RD:");
 			for (i = 0; i < 4; i++, tp += 2)
-				ND_PRINT((ndo, " %04x", EXTRACT_BE_U_2(tp)));
+				ND_PRINT(" %04x", EXTRACT_BE_U_2(tp));
 
 			/* protocol dependent part */
 			authinfolen = optlen - 11;
@@ -466,51 +466,51 @@ dhcp6opt_print(netdissect_options *ndo,
 				if (authinfolen == 0)
 					break;
 				if (authinfolen < 20) {
-					ND_PRINT((ndo, " ??"));
+					ND_PRINT(" ??");
 					break;
 				}
 				authrealmlen = authinfolen - 20;
 				if (authrealmlen > 0) {
-					ND_PRINT((ndo, ", realm: "));
+					ND_PRINT(", realm: ");
 				}
 				for (i = 0; i < authrealmlen; i++, tp++)
-					ND_PRINT((ndo, "%02x", EXTRACT_U_1(tp)));
-				ND_PRINT((ndo, ", key ID: %08x", EXTRACT_BE_U_4(tp)));
+					ND_PRINT("%02x", EXTRACT_U_1(tp));
+				ND_PRINT(", key ID: %08x", EXTRACT_BE_U_4(tp));
 				tp += 4;
-				ND_PRINT((ndo, ", HMAC-MD5:"));
+				ND_PRINT(", HMAC-MD5:");
 				for (i = 0; i < 4; i++, tp+= 4)
-					ND_PRINT((ndo, " %08x", EXTRACT_BE_U_4(tp)));
+					ND_PRINT(" %08x", EXTRACT_BE_U_4(tp));
 				break;
 			case DH6OPT_AUTHPROTO_RECONFIG:
 				if (authinfolen != 17) {
-					ND_PRINT((ndo, " ??"));
+					ND_PRINT(" ??");
 					break;
 				}
 				switch (EXTRACT_U_1(tp)) {
 				case DH6OPT_AUTHRECONFIG_KEY:
-					ND_PRINT((ndo, " reconfig-key"));
+					ND_PRINT(" reconfig-key");
 					break;
 				case DH6OPT_AUTHRECONFIG_HMACMD5:
-					ND_PRINT((ndo, " type: HMAC-MD5"));
+					ND_PRINT(" type: HMAC-MD5");
 					break;
 				default:
-					ND_PRINT((ndo, " type: ??"));
+					ND_PRINT(" type: ??");
 					break;
 				}
 				tp++;
-				ND_PRINT((ndo, " value:"));
+				ND_PRINT(" value:");
 				for (i = 0; i < 4; i++, tp+= 4)
-					ND_PRINT((ndo, " %08x", EXTRACT_BE_U_4(tp)));
+					ND_PRINT(" %08x", EXTRACT_BE_U_4(tp));
 				break;
 			default:
-				ND_PRINT((ndo, " ??"));
+				ND_PRINT(" ??");
 				break;
 			}
 
-			ND_PRINT((ndo, ")"));
+			ND_PRINT(")");
 			break;
 		case DH6OPT_RAPID_COMMIT: /* nothing todo */
-			ND_PRINT((ndo, ")"));
+			ND_PRINT(")");
 			break;
 		case DH6OPT_INTERFACE_ID:
 		case DH6OPT_SUBSCRIBER_ID:
@@ -519,32 +519,32 @@ dhcp6opt_print(netdissect_options *ndo,
 			 * at most 10 characters.
 			 */
 			tp = (const u_char *)(dh6o + 1);
-			ND_PRINT((ndo, " "));
+			ND_PRINT(" ");
 			for (i = 0; i < optlen && i < 10; i++)
-				ND_PRINT((ndo, "%02x", EXTRACT_U_1(tp + i)));
-			ND_PRINT((ndo, "...)"));
+				ND_PRINT("%02x", EXTRACT_U_1(tp + i));
+			ND_PRINT("...)");
 			break;
 		case DH6OPT_RECONF_MSG:
 			if (optlen != 1) {
-				ND_PRINT((ndo, " ?)"));
+				ND_PRINT(" ?)");
 				break;
 			}
 			tp = (const u_char *)(dh6o + 1);
 			dh6_reconf_type = EXTRACT_U_1(tp);
 			switch (dh6_reconf_type) {
 			case DH6_RENEW:
-				ND_PRINT((ndo, " for renew)"));
+				ND_PRINT(" for renew)");
 				break;
 			case DH6_INFORM_REQ:
-				ND_PRINT((ndo, " for inf-req)"));
+				ND_PRINT(" for inf-req)");
 				break;
 			default:
-				ND_PRINT((ndo, " for ?\?\?(%02x))", dh6_reconf_type));
+				ND_PRINT(" for ?\?\?(%02x))", dh6_reconf_type);
 				break;
 			}
 			break;
 		case DH6OPT_RECONF_ACCEPT: /* nothing todo */
-			ND_PRINT((ndo, ")"));
+			ND_PRINT(")");
 			break;
 		case DH6OPT_SIP_SERVER_A:
 		case DH6OPT_DNS_SERVERS:
@@ -555,125 +555,125 @@ dhcp6opt_print(netdissect_options *ndo,
 		case DH6OPT_PANA_AGENT:
 		case DH6OPT_LQ_CLIENT_LINK:
 			if (optlen % 16) {
-				ND_PRINT((ndo, " ?)"));
+				ND_PRINT(" ?)");
 				break;
 			}
 			tp = (const u_char *)(dh6o + 1);
 			for (i = 0; i < optlen; i += 16)
-				ND_PRINT((ndo, " %s", ip6addr_string(ndo, tp + i)));
-			ND_PRINT((ndo, ")"));
+				ND_PRINT(" %s", ip6addr_string(ndo, tp + i));
+			ND_PRINT(")");
 			break;
 		case DH6OPT_SIP_SERVER_D:
 		case DH6OPT_DOMAIN_LIST:
 			tp = (const u_char *)(dh6o + 1);
 			while (tp < cp + sizeof(*dh6o) + optlen) {
-				ND_PRINT((ndo, " "));
+				ND_PRINT(" ");
 				if ((tp = ns_nprint(ndo, tp, cp + sizeof(*dh6o) + optlen)) == NULL)
 					goto trunc;
 			}
-			ND_PRINT((ndo, ")"));
+			ND_PRINT(")");
 			break;
 		case DH6OPT_STATUS_CODE:
 			if (optlen < 2) {
-				ND_PRINT((ndo, " ?)"));
+				ND_PRINT(" ?)");
 				break;
 			}
 			tp = (const u_char *)(dh6o + 1);
-			ND_PRINT((ndo, " %s)", dhcp6stcode(EXTRACT_BE_U_2(tp))));
+			ND_PRINT(" %s)", dhcp6stcode(EXTRACT_BE_U_2(tp)));
 			break;
 		case DH6OPT_IA_NA:
 		case DH6OPT_IA_PD:
 			if (optlen < 12) {
-				ND_PRINT((ndo, " ?)"));
+				ND_PRINT(" ?)");
 				break;
 			}
 			tp = (const u_char *)(dh6o + 1);
-			ND_PRINT((ndo, " IAID:%u T1:%u T2:%u",
+			ND_PRINT(" IAID:%u T1:%u T2:%u",
 			    EXTRACT_BE_U_4(tp),
 			    EXTRACT_BE_U_4(tp + 4),
-			    EXTRACT_BE_U_4(tp + 8)));
+			    EXTRACT_BE_U_4(tp + 8));
 			if (optlen > 12) {
 				/* there are sub-options */
 				dhcp6opt_print(ndo, tp + 12, tp + optlen);
 			}
-			ND_PRINT((ndo, ")"));
+			ND_PRINT(")");
 			break;
 		case DH6OPT_IA_TA:
 			if (optlen < 4) {
-				ND_PRINT((ndo, " ?)"));
+				ND_PRINT(" ?)");
 				break;
 			}
 			tp = (const u_char *)(dh6o + 1);
-			ND_PRINT((ndo, " IAID:%u", EXTRACT_BE_U_4(tp)));
+			ND_PRINT(" IAID:%u", EXTRACT_BE_U_4(tp));
 			if (optlen > 4) {
 				/* there are sub-options */
 				dhcp6opt_print(ndo, tp + 4, tp + optlen);
 			}
-			ND_PRINT((ndo, ")"));
+			ND_PRINT(")");
 			break;
 		case DH6OPT_IA_PD_PREFIX:
 			if (optlen < 25) {
-				ND_PRINT((ndo, " ?)"));
+				ND_PRINT(" ?)");
 				break;
 			}
 			tp = (const u_char *)(dh6o + 1);
-			ND_PRINT((ndo, " %s/%d", ip6addr_string(ndo, tp + 9), EXTRACT_U_1(tp + 8)));
-			ND_PRINT((ndo, " pltime:%u vltime:%u",
+			ND_PRINT(" %s/%d", ip6addr_string(ndo, tp + 9), EXTRACT_U_1(tp + 8));
+			ND_PRINT(" pltime:%u vltime:%u",
 			    EXTRACT_BE_U_4(tp),
-			    EXTRACT_BE_U_4(tp + 4)));
+			    EXTRACT_BE_U_4(tp + 4));
 			if (optlen > 25) {
 				/* there are sub-options */
 				dhcp6opt_print(ndo, tp + 25, tp + optlen);
 			}
-			ND_PRINT((ndo, ")"));
+			ND_PRINT(")");
 			break;
 		case DH6OPT_LIFETIME:
 		case DH6OPT_CLT_TIME:
 			if (optlen != 4) {
-				ND_PRINT((ndo, " ?)"));
+				ND_PRINT(" ?)");
 				break;
 			}
 			tp = (const u_char *)(dh6o + 1);
-			ND_PRINT((ndo, " %d)", EXTRACT_BE_U_4(tp)));
+			ND_PRINT(" %d)", EXTRACT_BE_U_4(tp));
 			break;
 		case DH6OPT_REMOTE_ID:
 			if (optlen < 4) {
-				ND_PRINT((ndo, " ?)"));
+				ND_PRINT(" ?)");
 				break;
 			}
 			tp = (const u_char *)(dh6o + 1);
-			ND_PRINT((ndo, " %d ", EXTRACT_BE_U_4(tp)));
+			ND_PRINT(" %d ", EXTRACT_BE_U_4(tp));
 			/*
 			 * Print hex dump first 10 characters.
 			 */
 			for (i = 4; i < optlen && i < 14; i++)
-				ND_PRINT((ndo, "%02x", EXTRACT_U_1(tp + i)));
-			ND_PRINT((ndo, "...)"));
+				ND_PRINT("%02x", EXTRACT_U_1(tp + i));
+			ND_PRINT("...)");
 			break;
 		case DH6OPT_LQ_QUERY:
 			if (optlen < 17) {
-				ND_PRINT((ndo, " ?)"));
+				ND_PRINT(" ?)");
 				break;
 			}
 			tp = (const u_char *)(dh6o + 1);
 			dh6_lq_query_type = EXTRACT_U_1(tp);
 			switch (dh6_lq_query_type) {
 			case 1:
-				ND_PRINT((ndo, " by-address"));
+				ND_PRINT(" by-address");
 				break;
 			case 2:
-				ND_PRINT((ndo, " by-clientID"));
+				ND_PRINT(" by-clientID");
 				break;
 			default:
-				ND_PRINT((ndo, " type_%u", dh6_lq_query_type));
+				ND_PRINT(" type_%u", dh6_lq_query_type);
 				break;
 			}
-			ND_PRINT((ndo, " %s", ip6addr_string(ndo, tp + 1)));
+			ND_PRINT(" %s", ip6addr_string(ndo, tp + 1));
 			if (optlen > 17) {
 				/* there are query-options */
 				dhcp6opt_print(ndo, tp + 17, tp + optlen);
 			}
-			ND_PRINT((ndo, ")"));
+			ND_PRINT(")");
 			break;
 		case DH6OPT_CLIENT_DATA:
 			tp = (const u_char *)(dh6o + 1);
@@ -681,25 +681,25 @@ dhcp6opt_print(netdissect_options *ndo,
 				/* there are encapsulated options */
 				dhcp6opt_print(ndo, tp, tp + optlen);
 			}
-			ND_PRINT((ndo, ")"));
+			ND_PRINT(")");
 			break;
 		case DH6OPT_LQ_RELAY_DATA:
 			if (optlen < 16) {
-				ND_PRINT((ndo, " ?)"));
+				ND_PRINT(" ?)");
 				break;
 			}
 			tp = (const u_char *)(dh6o + 1);
-			ND_PRINT((ndo, " %s ", ip6addr_string(ndo, tp)));
+			ND_PRINT(" %s ", ip6addr_string(ndo, tp));
 			/*
 			 * Print hex dump first 10 characters.
 			 */
 			for (i = 16; i < optlen && i < 26; i++)
-				ND_PRINT((ndo, "%02x", EXTRACT_U_1(tp + i)));
-			ND_PRINT((ndo, "...)"));
+				ND_PRINT("%02x", EXTRACT_U_1(tp + i));
+			ND_PRINT("...)");
 			break;
 		case DH6OPT_NTP_SERVER:
 			if (optlen < 4) {
-				ND_PRINT((ndo, " ?)"));
+				ND_PRINT(" ?)");
 				break;
 			}
 			tp = (const u_char *)(dh6o + 1);
@@ -710,37 +710,37 @@ dhcp6opt_print(netdissect_options *ndo,
 				tp += 2;
 				if (tp + subopt_len > cp + sizeof(*dh6o) + optlen)
 					goto trunc;
-				ND_PRINT((ndo, " subopt:%d", subopt_code));
+				ND_PRINT(" subopt:%d", subopt_code);
 				switch (subopt_code) {
 				case DH6OPT_NTP_SUBOPTION_SRV_ADDR:
 				case DH6OPT_NTP_SUBOPTION_MC_ADDR:
 					if (subopt_len != 16) {
-						ND_PRINT((ndo, " ?"));
+						ND_PRINT(" ?");
 						break;
 					}
-					ND_PRINT((ndo, " %s", ip6addr_string(ndo, tp)));
+					ND_PRINT(" %s", ip6addr_string(ndo, tp));
 					break;
 				case DH6OPT_NTP_SUBOPTION_SRV_FQDN:
-					ND_PRINT((ndo, " "));
+					ND_PRINT(" ");
 					if (ns_nprint(ndo, tp, tp + subopt_len) == NULL)
 						goto trunc;
 					break;
 				default:
-					ND_PRINT((ndo, " ?"));
+					ND_PRINT(" ?");
 					break;
 				}
 				tp += subopt_len;
 			}
-			ND_PRINT((ndo, ")"));
+			ND_PRINT(")");
 			break;
 		case DH6OPT_AFTR_NAME:
 			if (optlen < 3) {
-				ND_PRINT((ndo, " ?)"));
+				ND_PRINT(" ?)");
 				break;
 			}
 			tp = (const u_char *)(dh6o + 1);
 			remain_len = optlen;
-			ND_PRINT((ndo, " "));
+			ND_PRINT(" ");
 			/* Encoding is described in section 3.1 of RFC 1035 */
 			while (remain_len && EXTRACT_U_1(tp)) {
 				label_len = EXTRACT_U_1(tp);
@@ -749,29 +749,29 @@ dhcp6opt_print(netdissect_options *ndo,
 					(void)fn_printn(ndo, tp, label_len, NULL);
 					tp += label_len;
 					remain_len -= (label_len + 1);
-					if(EXTRACT_U_1(tp)) ND_PRINT((ndo, "."));
+					if(EXTRACT_U_1(tp)) ND_PRINT(".");
 				} else {
-					ND_PRINT((ndo, " ?"));
+					ND_PRINT(" ?");
 					break;
 				}
 			}
-			ND_PRINT((ndo, ")"));
+			ND_PRINT(")");
 			break;
 		case DH6OPT_NEW_POSIX_TIMEZONE: /* all three of these options */
 		case DH6OPT_NEW_TZDB_TIMEZONE:	/* are encoded similarly */
 		case DH6OPT_MUDURL:		/* although GMT might not work */
 		        if (optlen < 5) {
-				ND_PRINT((ndo, " ?)"));
+				ND_PRINT(" ?)");
 				break;
 			}
 			tp = (const u_char *)(dh6o + 1);
-			ND_PRINT((ndo, "="));
+			ND_PRINT("=");
 			(void)fn_printn(ndo, tp, (u_int)optlen, NULL);
-			ND_PRINT((ndo, ")"));
+			ND_PRINT(")");
 			break;
 
 		default:
-			ND_PRINT((ndo, ")"));
+			ND_PRINT(")");
 			break;
 		}
 
@@ -780,7 +780,7 @@ dhcp6opt_print(netdissect_options *ndo,
 	return;
 
 trunc:
-	ND_PRINT((ndo, "[|dhcp6ext]"));
+	ND_PRINT("[|dhcp6ext]");
 }
 
 /*
@@ -797,7 +797,7 @@ dhcp6_print(netdissect_options *ndo,
 	const u_char *extp;
 	const char *name;
 
-	ND_PRINT((ndo, "dhcp6"));
+	ND_PRINT("dhcp6");
 
 	ep = (const u_char *)ndo->ndo_snapend;
 	if (cp + length < ep)
@@ -810,15 +810,15 @@ dhcp6_print(netdissect_options *ndo,
 	name = tok2str(dh6_msgtype_str, "msgtype-%u", msgtype);
 
 	if (!ndo->ndo_vflag) {
-		ND_PRINT((ndo, " %s", name));
+		ND_PRINT(" %s", name);
 		return;
 	}
 
 	/* XXX relay agent messages have to be handled differently */
 
-	ND_PRINT((ndo, " %s (", name));	/*)*/
+	ND_PRINT(" %s (", name);	/*)*/
 	if (msgtype != DH6_RELAY_FORW && msgtype != DH6_RELAY_REPLY) {
-		ND_PRINT((ndo, "xid=%x", EXTRACT_BE_U_4(dh6->dh6_xid) & DH6_XIDMASK));
+		ND_PRINT("xid=%x", EXTRACT_BE_U_4(dh6->dh6_xid) & DH6_XIDMASK);
 		extp = (const u_char *)(dh6 + 1);
 		dhcp6opt_print(ndo, extp, ep);
 	} else {		/* relay messages */
@@ -827,17 +827,17 @@ dhcp6_print(netdissect_options *ndo,
 		ND_TCHECK(dh6relay->dh6relay_peeraddr);
 
 		memcpy(&addr6, &dh6relay->dh6relay_linkaddr, sizeof (addr6));
-		ND_PRINT((ndo, "linkaddr=%s", ip6addr_string(ndo, &addr6)));
+		ND_PRINT("linkaddr=%s", ip6addr_string(ndo, &addr6));
 
 		memcpy(&addr6, &dh6relay->dh6relay_peeraddr, sizeof (addr6));
-		ND_PRINT((ndo, " peeraddr=%s", ip6addr_string(ndo, &addr6)));
+		ND_PRINT(" peeraddr=%s", ip6addr_string(ndo, &addr6));
 
 		dhcp6opt_print(ndo, (const u_char *)(dh6relay + 1), ep);
 	}
 	/*(*/
-	ND_PRINT((ndo, ")"));
+	ND_PRINT(")");
 	return;
 
 trunc:
-	ND_PRINT((ndo, "[|dhcp6]"));
+	ND_PRINT("[|dhcp6]");
 }