Update ND_PRINT() as a variadic macro

[tcpdump] / print-hsrp.c

diff --git a/print-hsrp.c b/print-hsrp.c
index ad97a2be49aad4901642bd6501121da99d145447..7674ec7153c118be2e1db71a04e07db7ddbff3f3 100644 (file)
--- a/print-hsrp.c
+++ b/print-hsrp.c
@@ -101,38 +101,38 @@ hsrp_print(netdissect_options *ndo, const uint8_t *bp, u_int len)
 
        ND_TCHECK(hp->hsrp_version);
        version = EXTRACT_U_1(hp->hsrp_version);
-       ND_PRINT((ndo, "HSRPv%u", version));
+       ND_PRINT("HSRPv%u", version);
        if (version != 0)
                return;
        ND_TCHECK(hp->hsrp_op_code);
-       ND_PRINT((ndo, "-"));
-       ND_PRINT((ndo, "%s ", tok2strary(op_code_str, "unknown (%u)", EXTRACT_U_1(hp->hsrp_op_code))));
-       ND_PRINT((ndo, "%u: ", len));
+       ND_PRINT("-");
+       ND_PRINT("%s ", tok2strary(op_code_str, "unknown (%u)", EXTRACT_U_1(hp->hsrp_op_code)));
+       ND_PRINT("%u: ", len);
        ND_TCHECK(hp->hsrp_state);
-       ND_PRINT((ndo, "state=%s ", tok2str(states, "Unknown (%u)", EXTRACT_U_1(hp->hsrp_state))));
+       ND_PRINT("state=%s ", tok2str(states, "Unknown (%u)", EXTRACT_U_1(hp->hsrp_state)));
        ND_TCHECK(hp->hsrp_group);
-       ND_PRINT((ndo, "group=%u ", EXTRACT_U_1(hp->hsrp_group)));
+       ND_PRINT("group=%u ", EXTRACT_U_1(hp->hsrp_group));
        ND_TCHECK(hp->hsrp_reserved);
        if (EXTRACT_U_1(hp->hsrp_reserved) != 0) {
-               ND_PRINT((ndo, "[reserved=%u!] ", EXTRACT_U_1(hp->hsrp_reserved)));
+               ND_PRINT("[reserved=%u!] ", EXTRACT_U_1(hp->hsrp_reserved));
        }
        ND_TCHECK(hp->hsrp_virtaddr);
-       ND_PRINT((ndo, "addr=%s", ipaddr_string(ndo, &hp->hsrp_virtaddr)));
+       ND_PRINT("addr=%s", ipaddr_string(ndo, &hp->hsrp_virtaddr));
        if (ndo->ndo_vflag) {
-               ND_PRINT((ndo, " hellotime="));
+               ND_PRINT(" hellotime=");
                unsigned_relts_print(ndo, EXTRACT_U_1(hp->hsrp_hellotime));
-               ND_PRINT((ndo, " holdtime="));
+               ND_PRINT(" holdtime=");
                unsigned_relts_print(ndo, EXTRACT_U_1(hp->hsrp_holdtime));
-               ND_PRINT((ndo, " priority=%u", EXTRACT_U_1(hp->hsrp_priority)));
-               ND_PRINT((ndo, " auth=\""));
+               ND_PRINT(" priority=%u", EXTRACT_U_1(hp->hsrp_priority));
+               ND_PRINT(" auth=\"");
                if (fn_printn(ndo, hp->hsrp_authdata, sizeof(hp->hsrp_authdata),
                    ndo->ndo_snapend)) {
-                       ND_PRINT((ndo, "\""));
+                       ND_PRINT("\"");
                        goto trunc;
                }
-               ND_PRINT((ndo, "\""));
+               ND_PRINT("\"");
        }
        return;
 trunc:
-       ND_PRINT((ndo, "[|hsrp]"));
+       ND_PRINT("[|hsrp]");
 }