diff options
| author | Alexander Bluhm <bluhm@cvs.openbsd.org> | 2009-01-29 09:46:33 +0000 |
|---|---|---|
| committer | Alexander Bluhm <bluhm@cvs.openbsd.org> | 2009-01-29 09:46:33 +0000 |
| commit | f1b5fd9fb4b135c42fa8ca81a521db3c8cd39f8c (patch) | |
| tree | 8323868193b4b2ff24b867e7edb58857b2505ea3 /usr.sbin | |
| parent | d392a48db31cf12708c98a3211b5a7c716d21038 (diff) | |
In tcpdump some printf() had an additional \n at the end. Removing
that new line restores the one-line -> one-packet semantics.
ok hshoexer@, henning@, markus@
Diffstat (limited to 'usr.sbin')
| -rw-r--r-- | usr.sbin/tcpdump/print-bgp.c | 6 | ||||
| -rw-r--r-- | usr.sbin/tcpdump/print-icmp6.c | 10 |
2 files changed, 8 insertions, 8 deletions
diff --git a/usr.sbin/tcpdump/print-bgp.c b/usr.sbin/tcpdump/print-bgp.c index b0be91adee8..55fdf30cc09 100644 --- a/usr.sbin/tcpdump/print-bgp.c +++ b/usr.sbin/tcpdump/print-bgp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: print-bgp.c,v 1.10 2007/10/07 16:41:05 deraadt Exp $ */ +/* $OpenBSD: print-bgp.c,v 1.11 2009/01/29 09:46:32 bluhm Exp $ */ /* * Copyright (C) 1999 WIDE Project. @@ -31,7 +31,7 @@ #ifndef lint static const char rcsid[] = - "@(#) $Id: print-bgp.c,v 1.10 2007/10/07 16:41:05 deraadt Exp $"; + "@(#) $Id: print-bgp.c,v 1.11 2009/01/29 09:46:32 bluhm Exp $"; #endif #include <sys/param.h> @@ -649,7 +649,7 @@ bgp_update_print(const u_char *dat, int length) i += wpfx; printf(" %s", buf); } - printf(")\n"); + printf(")"); #endif } p += 2 + len; diff --git a/usr.sbin/tcpdump/print-icmp6.c b/usr.sbin/tcpdump/print-icmp6.c index ee7528af48d..3bceab29ffa 100644 --- a/usr.sbin/tcpdump/print-icmp6.c +++ b/usr.sbin/tcpdump/print-icmp6.c @@ -1,4 +1,4 @@ -/* $OpenBSD: print-icmp6.c,v 1.4 2002/11/28 11:05:06 dhartmei Exp $ */ +/* $OpenBSD: print-icmp6.c,v 1.5 2009/01/29 09:46:32 bluhm Exp $ */ /* * Copyright (c) 1988, 1989, 1990, 1991, 1993, 1994 @@ -153,7 +153,7 @@ icmp6_print(register const u_char *bp, register const u_char *bp2) break; case ICMP6_PACKET_TOO_BIG: TCHECK(dp->icmp6_mtu); - printf("icmp6: too big %u\n", (u_int32_t)ntohl(dp->icmp6_mtu)); + printf("icmp6: too big %u", (u_int32_t)ntohl(dp->icmp6_mtu)); break; case ICMP6_TIME_EXCEEDED: TCHECK(oip->ip6_dst); @@ -175,15 +175,15 @@ icmp6_print(register const u_char *bp, register const u_char *bp2) TCHECK(oip->ip6_dst); switch (dp->icmp6_code) { case ICMP6_PARAMPROB_HEADER: - printf("icmp6: parameter problem errorneous - octet %u\n", + printf("icmp6: parameter problem errorneous - octet %u", (u_int32_t)ntohl(dp->icmp6_pptr)); break; case ICMP6_PARAMPROB_NEXTHEADER: - printf("icmp6: parameter problem next header - octet %u\n", + printf("icmp6: parameter problem next header - octet %u", (u_int32_t)ntohl(dp->icmp6_pptr)); break; case ICMP6_PARAMPROB_OPTION: - printf("icmp6: parameter problem option - octet %u\n", + printf("icmp6: parameter problem option - octet %u", (u_int32_t)ntohl(dp->icmp6_pptr)); break; default: |