Fix the pointer tests in the non-ndoified TTEST2() macro as well.

[tcpdump] / print-raw.c

diff --git a/print-raw.c b/print-raw.c
index 08cee76ca8e53a56996259998aa829c2e45ca537..d20387c644c9149502615c601b763b42c61b9772 100644 (file)
--- a/print-raw.c
+++ b/print-raw.c
@@ -19,22 +19,13 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-#ifndef lint
-static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-raw.c,v 1.39 2002-12-19 09:39:15 guy Exp $ (LBL)";
-#endif
-
+#define NETDISSECT_REWORKED
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
 #include <tcpdump-stdinc.h>
 
-#include <pcap.h>
-#include <stdio.h>
-#include <string.h>
-
-#include "addrtoname.h"
 #include "interface.h"
 
 /*
@@ -42,12 +33,12 @@ static const char rcsid[] =
  */
 
 u_int
-raw_if_print(const struct pcap_pkthdr *h, const u_char *p)
+raw_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, const u_char *p)
 {
-       if (eflag)
-               printf("ip: ");
+       if (ndo->ndo_eflag)
+               ND_PRINT((ndo, "ip: "));
 
-       ipN_print(p, h->len);
+       ipN_print(ndo, p, h->len);
 
        return (0);
 }