CI: Introduce and use TCPDUMP_CMAKE_TAINTED

[tcpdump] / print-dccp.c

diff --git a/print-dccp.c b/print-dccp.c
index 44fa3704c55304fd35b796d83e8e0a1e79029e0b..39234575379889af3a6a46d688967f868ba10381 100644 (file)
--- a/print-dccp.c
+++ b/print-dccp.c
@@ -17,8 +17,6 @@
 
 #include "netdissect-stdinc.h"
 
-#include <stdio.h>
-
 #include "netdissect.h"
 #include "addrtoname.h"
 #include "extract.h"
@@ -191,7 +189,7 @@ static const char *dccp_feature_nums[] = {
 
 static u_int
 dccp_csum_coverage(netdissect_options *ndo,
-                  const struct dccp_hdr* dh, u_int len)
+                  const struct dccp_hdr *dh, u_int len)
 {
        u_int cov;
 
@@ -294,8 +292,8 @@ dccp_print(netdissect_options *ndo, const u_char *bp, const u_char *data2,
        if (cp > ndo->ndo_snapend)
                goto trunc;
        if (len < sizeof(struct dccp_hdr)) {
-               ND_PRINT("truncated-dccp - %u bytes missing!",
-                        (u_int)sizeof(struct dccp_hdr) - len);
+               ND_PRINT("truncated-dccp - %zu bytes missing!",
+                        sizeof(struct dccp_hdr) - len);
                return;
        }
 
@@ -335,7 +333,7 @@ dccp_print(netdissect_options *ndo, const u_char *bp, const u_char *data2,
 
        /* other variables in generic header */
        if (ndo->ndo_vflag) {
-               ND_PRINT(" (CCVal %u, CsCov %u, ", DCCPH_CCVAL(dh), DCCPH_CSCOV(dh));
+               ND_PRINT(" (CCVal %u, CsCov %u", DCCPH_CCVAL(dh), DCCPH_CSCOV(dh));
        }
 
        /* checksum calculation */
@@ -343,7 +341,7 @@ dccp_print(netdissect_options *ndo, const u_char *bp, const u_char *data2,
                uint16_t sum = 0, dccp_sum;
 
                dccp_sum = GET_BE_U_2(dh->dccph_checksum);
-               ND_PRINT("cksum 0x%04x ", dccp_sum);
+               ND_PRINT(", cksum 0x%04x ", dccp_sum);
                if (IP_V(ip) == 4)
                        sum = dccp_cksum(ndo, ip, dh, len);
                else if (IP_V(ip) == 6)