]> The Tcpdump Group git mirrors - tcpdump/commitdiff
Fix to use the new ND_PRINT().
authorGuy Harris <[email protected]>
Thu, 28 May 2020 03:37:15 +0000 (20:37 -0700)
committerGitHub <[email protected]>
Thu, 28 May 2020 03:37:15 +0000 (20:37 -0700)
It's a varargs macro, so it doesn't need the extra layer of parentheses,
and it doesn't take `ndo` as an argument.

print-macsec.c

index b1f96cf6d4669b17fbb079f4d6f9c17f8f26a6bf..ca6998a3c4bf3e775ea0d936157f59777c2cf39c 100644 (file)
@@ -136,12 +136,12 @@ int macsec_print(netdissect_options *ndo, const u_char **bp,
        u_int len;
 
        if (!macsec_check_length(sectag, length, caplen)) {
-               ND_PRINT((ndo, tstr));
+               ND_PRINT(tstr);
                return hdrlen + caplen;
        }
 
        if (sectag->unused || sectag->tci_an & MACSEC_TCI_VERSION) {
-               ND_PRINT((ndo, "%s", istr));
+               ND_PRINT("%s", istr);
                return hdrlen + caplen;
        }
 
@@ -174,13 +174,13 @@ int macsec_print(netdissect_options *ndo, const u_char **bp,
                        n += r;
                }
 
-               ND_PRINT((ndo, "%s, ", buf));
+               ND_PRINT("%s, ", buf);
        }
 
        len = ieee8021ae_sectag_len(ndo, sectag);
        *length_type = GET_BE_U_2(*bp + len);
        if (ndo->ndo_eflag && *length_type > ETHERMTU && !(GET_U_1(sectag->tci_an) & MACSEC_TCI_E))
-               ND_PRINT((ndo, "ethertype %s, ", tok2str(ethertype_values,"0x%04x", *length_type)));
+               ND_PRINT("ethertype %s, ", tok2str(ethertype_values,"0x%04x", *length_type));
 
        if ((GET_U_1(sectag->tci_an) & MACSEC_TCI_CONFID)) {
                *bp += len;