CI: Add warning exemptions for Sun C (suncc-5.14) on Solaris 10

[tcpdump] / print-raw.c

diff --git a/print-raw.c b/print-raw.c
index 2aa07f2056c2cf6497701013e5a5d528cbd0e441..d0edd2ece948069419a9b556dc7d4cc85c0e5776 100644 (file)
--- a/print-raw.c
+++ b/print-raw.c
@@ -19,28 +19,25 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
+/* \summary: Raw IP printer */
 
-#include <tcpdump-stdinc.h>
+#include <config.h>
 
-#include <stdio.h>
-#include <string.h>
+#include "netdissect-stdinc.h"
 
-#include "interface.h"
+#include "netdissect.h"
 
 /*
  * The DLT_RAW packet has no header. It contains a raw IP packet.
  */
 
-u_int
-raw_if_print(const struct pcap_pkthdr *h, const u_char *p)
+void
+raw_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, const u_char *p)
 {
-       if (eflag)
-               printf("ip: ");
+       ndo->ndo_protocol = "raw";
+       ndo->ndo_ll_hdr_len += 0;
+       if (ndo->ndo_eflag)
+               ND_PRINT("ip: ");
 
-       ipN_print(p, h->len);
-
-       return (0);
+       ipN_print(ndo, p, h->len);
 }