Module Name: src
Committed By: dyoung
Date: Wed May 11 22:21:59 UTC 2011
Modified Files:
src/usr.bin/netstat: inet.c inet6.c
Log Message:
Suppress whitespace at EOL to fix lib/librumphijack/t_tcpip.
To generate a diff of this commit:
cvs rdiff -u -r1.98 -r1.99 src/usr.bin/netstat/inet.c
cvs rdiff -u -r1.57 -r1.58 src/usr.bin/netstat/inet6.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/netstat/inet.c
diff -u src/usr.bin/netstat/inet.c:1.98 src/usr.bin/netstat/inet.c:1.99
--- src/usr.bin/netstat/inet.c:1.98 Wed May 11 15:08:59 2011
+++ src/usr.bin/netstat/inet.c Wed May 11 22:21:59 2011
@@ -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
Index: src/usr.bin/netstat/inet6.c
diff -u src/usr.bin/netstat/inet6.c:1.57 src/usr.bin/netstat/inet6.c:1.58
--- src/usr.bin/netstat/inet6.c:1.57 Wed May 11 15:08:59 2011
+++ src/usr.bin/netstat/inet6.c Wed May 11 22:21:59 2011
@@ -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
