[src/trunk]: src/usr.bin/netstat Suppress whitespace at EOL to fix lib/librum...

[dyoung <dyoung%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/8378df9b8a1e
branches:  trunk
changeset: 764916:8378df9b8a1e
user:      dyoung <dyoung%NetBSD.org@localhost>
date:      Wed May 11 22:21:59 2011 +0000

description:
Suppress whitespace at EOL to fix lib/librumphijack/t_tcpip.

diffstat:

 usr.bin/netstat/inet.c  |  10 ++++++----
 usr.bin/netstat/inet6.c |  11 ++++++-----
 2 files changed, 12 insertions(+), 9 deletions(-)

diffs (68 lines):

diff -r f0904554f4e9 -r 8378df9b8a1e usr.bin/netstat/inet.c
--- a/usr.bin/netstat/inet.c    Wed May 11 22:08:12 2011 +0000
+++ b/usr.bin/netstat/inet.c    Wed May 11 22:21:59 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: inet.c,v 1.98 2011/05/11 15:08:59 drochner Exp $       */
+/*     $NetBSD: inet.c,v 1.99 2011/05/11 22:21:59 dyoung Exp $ */
 
 /*
  * Copyright (c) 1983, 1988, 1993
@@ -34,7 +34,7 @@
 #if 0
 static char sccsid[] = "from: @(#)inet.c       8.4 (Berkeley) 4/20/94";
 #else
-__RCSID("$NetBSD: inet.c,v 1.98 2011/05/11 15:08:59 drochner Exp $");
+__RCSID("$NetBSD: inet.c,v 1.99 2011/05/11 22:21:59 dyoung Exp $");
 #endif
 #endif /* not lint */
 
@@ -116,11 +116,13 @@
        putchar('\n');
        if (Aflag)
                printf("%-8.8s ", "PCB");
-       printf("%-5.5s %-6.6s %-6.6s %s%-*.*s %-*.*s %-13.13s%s\n",
+       printf(
+           Vflag ? "%-5.5s %-6.6s %-6.6s %s%-*.*s %-*.*s %-13.13s Expires\n"
+                 : "%-5.5s %-6.6s %-6.6s %s%-*.*s %-*.*s %s\n",
                "Proto", "Recv-Q", "Send-Q", compact ? "" : " ",
                width, width, "Local Address",
                width, width, "Foreign Address",
-               "State", Vflag ? " Expires" : "");
+               "State");
 }
 
 static void
diff -r f0904554f4e9 -r 8378df9b8a1e usr.bin/netstat/inet6.c
--- a/usr.bin/netstat/inet6.c   Wed May 11 22:08:12 2011 +0000
+++ b/usr.bin/netstat/inet6.c   Wed May 11 22:21:59 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: inet6.c,v 1.57 2011/05/11 15:08:59 drochner Exp $      */
+/*     $NetBSD: inet6.c,v 1.58 2011/05/11 22:21:59 dyoung Exp $        */
 /*     BSDI inet.c,v 2.3 1995/10/24 02:19:29 prb Exp   */
 
 /*
@@ -64,7 +64,7 @@
 #if 0
 static char sccsid[] = "@(#)inet.c     8.4 (Berkeley) 4/20/94";
 #else
-__RCSID("$NetBSD: inet6.c,v 1.57 2011/05/11 15:08:59 drochner Exp $");
+__RCSID("$NetBSD: inet6.c,v 1.58 2011/05/11 22:21:59 dyoung Exp $");
 #endif
 #endif /* not lint */
 
@@ -173,11 +173,12 @@
                printf("%-8.8s ", "PCB");
                width = 18;
        }
-       printf( "%-5.5s %-6.6s %-6.6s  %*.*s %*.*s %-13.13s%s\n",
+       printf(
+           Vflag ? "%-5.5s %-6.6s %-6.6s  %*.*s %*.*s %-13.13s Expires\n"
+                 : "%-5.5s %-6.6s %-6.6s  %*.*s %*.*s %s\n",
            "Proto", "Recv-Q", "Send-Q",
            -width, width, "Local Address",
-           -width, width, "Foreign Address",
-           "(state)", Vflag ? " Expires" : "");
+           -width, width, "Foreign Address", "(state)");
 }
 
 static void