diff options
| -rw-r--r-- | print-arp.c | 9 | ||||
| -rw-r--r-- | print-bfd.c | 2 | ||||
| -rw-r--r-- | print-carp.c | 3 | ||||
| -rw-r--r-- | print-icmp6.c | 2 | ||||
| -rw-r--r-- | print-ip6.c | 2 | ||||
| -rw-r--r-- | print-ipnet.c | 2 | ||||
| -rw-r--r-- | print-isakmp.c | 2 | ||||
| -rw-r--r-- | print-msnlb.c | 3 | ||||
| -rw-r--r-- | print-nflog.c | 3 | ||||
| -rw-r--r-- | print-ppi.c | 2 | ||||
| -rw-r--r-- | print-tipc.c | 3 |
11 files changed, 5 insertions, 28 deletions
diff --git a/print-arp.c b/print-arp.c index fbc8411e..84fc82ed 100644 --- a/print-arp.c +++ b/print-arp.c @@ -25,7 +25,6 @@ #include <tcpdump-stdinc.h> -#include <stdio.h> #include <string.h> #include "netdissect.h" @@ -234,9 +233,9 @@ atmarp_print(netdissect_options *ndo, } /* print operation */ - printf("%s%s ", + ND_PRINT((ndo, "%s%s ", ndo->ndo_vflag ? ", " : "", - tok2str(arpop_values, "Unknown (%u)", op)); + tok2str(arpop_values, "Unknown (%u)", op))); switch (op) { @@ -349,9 +348,9 @@ arp_print(netdissect_options *ndo, } /* print operation */ - printf("%s%s ", + ND_PRINT((ndo, "%s%s ", ndo->ndo_vflag ? ", " : "", - tok2str(arpop_values, "Unknown (%u)", op)); + tok2str(arpop_values, "Unknown (%u)", op))); switch (op) { diff --git a/print-bfd.c b/print-bfd.c index bc410b4f..2cec16ef 100644 --- a/print-bfd.c +++ b/print-bfd.c @@ -19,8 +19,6 @@ #include <tcpdump-stdinc.h> -#include <stdio.h> - #include "netdissect.h" #include "extract.h" diff --git a/print-carp.c b/print-carp.c index 3602cdac..832d7ae1 100644 --- a/print-carp.c +++ b/print-carp.c @@ -40,9 +40,6 @@ #include <tcpdump-stdinc.h> -#include <stdio.h> -#include <stdlib.h> - #include "interface.h" /* for checksum structure and functions */ #include "netdissect.h" #include "extract.h" diff --git a/print-icmp6.c b/print-icmp6.c index ba5cfa62..cd0a7f9f 100644 --- a/print-icmp6.c +++ b/print-icmp6.c @@ -1337,7 +1337,7 @@ icmp6_opt_print(netdissect_options *ndo, const u_char *bp, int resid) domp = cp + 8; /* domain names, variable-sized, RFC1035-encoded */ while (domp < cp + (op->nd_opt_len << 3) && *domp != '\0') { - printf (" "); + ND_PRINT((ndo, " ")); if ((domp = ns_nprint (domp, bp)) == NULL) goto trunc; } diff --git a/print-ip6.c b/print-ip6.c index 91da17ec..b06e9360 100644 --- a/print-ip6.c +++ b/print-ip6.c @@ -27,8 +27,6 @@ #include <tcpdump-stdinc.h> -#include <stdio.h> -#include <stdlib.h> #include <string.h> #include "netdissect.h" diff --git a/print-ipnet.c b/print-ipnet.c index 45ba2c30..c697a30f 100644 --- a/print-ipnet.c +++ b/print-ipnet.c @@ -4,8 +4,6 @@ #include <tcpdump-stdinc.h> -#include <stdio.h> - #include "netdissect.h" #include "interface.h" diff --git a/print-isakmp.c b/print-isakmp.c index bb85c475..2ebe083b 100644 --- a/print-isakmp.c +++ b/print-isakmp.c @@ -44,8 +44,6 @@ #include <string.h> -#include <stdio.h> - #include "interface.h" #include "addrtoname.h" #include "extract.h" /* must come after interface.h */ diff --git a/print-msnlb.c b/print-msnlb.c index b3004985..ec16a4db 100644 --- a/print-msnlb.c +++ b/print-msnlb.c @@ -32,9 +32,6 @@ #include <tcpdump-stdinc.h> -#include <stdio.h> -#include <string.h> - #include "netdissect.h" #include "addrtoname.h" #include "extract.h" diff --git a/print-nflog.c b/print-nflog.c index 94b36ae6..5ef4b2fd 100644 --- a/print-nflog.c +++ b/print-nflog.c @@ -31,10 +31,7 @@ #include <tcpdump-stdinc.h> -#include <stdio.h> - #include "netdissect.h" -#include "interface.h" #if defined(DLT_NFLOG) && defined(HAVE_PCAP_NFLOG_H) #include <pcap/nflog.h> diff --git a/print-ppi.c b/print-ppi.c index dc9f2a36..de6ec4af 100644 --- a/print-ppi.c +++ b/print-ppi.c @@ -7,8 +7,6 @@ #include <tcpdump-stdinc.h> -#include <stdio.h> - #include "netdissect.h" #include "interface.h" #include "extract.h" diff --git a/print-tipc.c b/print-tipc.c index 01eaf278..58186405 100644 --- a/print-tipc.c +++ b/print-tipc.c @@ -25,9 +25,6 @@ #include <tcpdump-stdinc.h> -#include <stdio.h> -#include <string.h> - #include "netdissect.h" #include "ether.h" #include "ethertype.h" |