Remove no more used ND_TTEST() macro

[tcpdump] / print-enc.c

diff --git a/print-enc.c b/print-enc.c
index 502e32331b22403f4b2994de67d0a763eda39f0e..93422adffa16235a1c1305d40515c7a780759bfa 100644 (file)
--- a/print-enc.c
+++ b/print-enc.c
@@ -27,7 +27,7 @@
 #include "config.h"
 #endif
 
-#include <netdissect-stdinc.h>
+#include "netdissect-stdinc.h"
 
 #include "netdissect.h"
 #include "extract.h"
@@ -75,14 +75,14 @@
 #define M_AUTH         0x0800  /* packet was authenticated (AH) */
 
 struct enchdr {
-       uint32_t af;
-       uint32_t spi;
-       uint32_t flags;
+       nd_uint32_t af;
+       nd_uint32_t spi;
+       nd_uint32_t flags;
 };
 
 #define ENC_PRINT_TYPE(wh, xf, nam) \
        if ((wh) & (xf)) { \
-               ND_PRINT((ndo, "%s%s", nam, (wh) == (xf) ? "): " : ",")); \
+               ND_PRINT("%s%s", nam, (wh) == (xf) ? "): " : ","); \
                (wh) &= ~(xf); \
        }
 
@@ -104,7 +104,7 @@ enc_if_print(netdissect_options *ndo,
        const struct enchdr *hdr;
 
        if (caplen < ENC_HDRLEN) {
-               ND_PRINT((ndo, "[|enc]"));
+               ND_PRINT("[|enc]");
                goto out;
        }
 
@@ -135,13 +135,13 @@ enc_if_print(netdissect_options *ndo,
        }
 
        if (flags == 0)
-               ND_PRINT((ndo, "(unprotected): "));
+               ND_PRINT("(unprotected): ");
        else
-               ND_PRINT((ndo, "("));
+               ND_PRINT("(");
        ENC_PRINT_TYPE(flags, M_AUTH, "authentic");
        ENC_PRINT_TYPE(flags, M_CONF, "confidential");
        /* ENC_PRINT_TYPE(flags, M_TUNNEL, "tunnel"); */
-       ND_PRINT((ndo, "SPI 0x%08x: ", EXTRACT_BE_U_4(&hdr->spi)));
+       ND_PRINT("SPI 0x%08x: ", EXTRACT_BE_U_4(hdr->spi));
 
        length -= ENC_HDRLEN;
        caplen -= ENC_HDRLEN;