Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/usr.sbin/tcpdump remove extra \n even more. sync with tcpdu...



details:   https://anonhg.NetBSD.org/src/rev/f44f768ae363
branches:  trunk
changeset: 510346:f44f768ae363
user:      itojun <itojun%NetBSD.org@localhost>
date:      Sun May 27 04:57:19 2001 +0000

description:
remove extra \n even more.  sync with tcpdump.org

diffstat:

 usr.sbin/tcpdump/print-icmp6.c |  16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

diffs (64 lines):

diff -r b60f08f24218 -r f44f768ae363 usr.sbin/tcpdump/print-icmp6.c
--- a/usr.sbin/tcpdump/print-icmp6.c    Sun May 27 04:45:20 2001 +0000
+++ b/usr.sbin/tcpdump/print-icmp6.c    Sun May 27 04:57:19 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: print-icmp6.c,v 1.12 2001/05/26 12:31:56 itojun Exp $  */
+/*     $NetBSD: print-icmp6.c,v 1.13 2001/05/27 04:57:19 itojun Exp $  */
 
 /*
  * Copyright (c) 1988, 1989, 1990, 1991, 1993, 1994
@@ -27,7 +27,7 @@
     "@(#) /master/usr.sbin/tcpdump/tcpdump/print-icmp.c,v 2.1 1995/02/03 18:14:42 polk Exp (LBL)";
 #else
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: print-icmp6.c,v 1.12 2001/05/26 12:31:56 itojun Exp $");
+__RCSID("$NetBSD: print-icmp6.c,v 1.13 2001/05/27 04:57:19 itojun Exp $");
 #endif
 #endif
 
@@ -194,15 +194,15 @@
                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:
@@ -843,7 +843,7 @@
                                        break;
                                printf(" %s", getname6(bp + i));
                                i += sizeof(struct in6_addr);
-                               printf("(%d)", ntohl(*(int32_t *)(bp + i)));
+                               printf("(%d)", (int32_t)ntohl(*(int32_t *)(bp + i)));
                                i += sizeof(int32_t);
                        }
                        i = ni6->ni_flags;
@@ -935,7 +935,7 @@
 
                TCHECK(match->rpm_prefix);
 
-               if (vflag)
+               if (vflag > 1)
                        printf("\n\t");
                else
                        printf(" ");
@@ -969,7 +969,7 @@
 
                        TCHECK(use->rpu_prefix);
 
-                       if (vflag)
+                       if (vflag > 1)
                                printf("\n\t");
                        else
                                printf(" ");



Home | Main Index | Thread Index | Old Index