[Zrouter-src-freebsd] ZRouter.org: push to FreeBSD HEAD tree

[zrouter-src-freebsd at zrouter.org]

details:   http://zrouter.org/hg/FreeBSD/head//rev/ce0261f8d359
changeset: 351:ce0261f8d359
user:      ray at terran.dlink.ua
date:      Fri Mar 02 16:51:53 2012 +0200
description:
Update to FreeBSD-HEAD @232391

diffstat:

 head/usr.bin/systat/icmp.c    |  3 +--
 head/usr.bin/systat/ifstat.c  |  8 ++------
 head/usr.bin/systat/iostat.c  |  3 +--
 head/usr.bin/systat/ip.c      |  3 +--
 head/usr.bin/systat/netcmds.c |  3 +--
 head/usr.bin/systat/netstat.c |  4 +---
 head/usr.bin/systat/pigs.c    |  3 +--
 head/usr.bin/systat/tcp.c     |  3 +--
 8 files changed, 9 insertions(+), 21 deletions(-)

diffs (192 lines):

diff -r b13678ea9938 -r ce0261f8d359 head/usr.bin/systat/icmp.c
--- a/head/usr.bin/systat/icmp.c	Fri Mar 02 16:51:37 2012 +0200
+++ b/head/usr.bin/systat/icmp.c	Fri Mar 02 16:51:53 2012 +0200
@@ -29,7 +29,7 @@
 
 #include <sys/cdefs.h>
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: head/usr.bin/systat/icmp.c 231011 2012-02-05 09:17:49Z ed $");
 
 #ifdef lint
 static char sccsid[] = "@(#)mbufs.c	8.1 (Berkeley) 6/6/93";
@@ -277,4 +277,3 @@
 	if (sysctl(name, 4, &icmpstat, &len, 0, 0) < 0)
 		return;
 }
-
diff -r b13678ea9938 -r ce0261f8d359 head/usr.bin/systat/ifstat.c
--- a/head/usr.bin/systat/ifstat.c	Fri Mar 02 16:51:37 2012 +0200
+++ b/head/usr.bin/systat/ifstat.c	Fri Mar 02 16:51:53 2012 +0200
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: head/usr.bin/systat/ifstat.c 226396 2011-10-15 13:20:36Z ed $
+ * $FreeBSD: head/usr.bin/systat/ifstat.c 231011 2012-02-05 09:17:49Z ed $
  */
 
 #include <sys/types.h>
@@ -58,7 +58,6 @@
 static const int col4 = C4;
 static const int col5 = C5;
 
-
 SLIST_HEAD(, if_stat)		curlist;
 SLIST_HEAD(, if_stat_disp)	displist;
 
@@ -85,7 +84,7 @@
 static	 u_int getifnum(void);
 
 #define IFSTAT_ERR(n, s)	do {					\
-	putchar('');							\
+	putchar('\014');						\
 	closeifstat(wnd);						\
 	err((n), (s));							\
 } while (0)
@@ -143,7 +142,6 @@
 	mvprintw(p->if_ypos+1, col2-3, "%s", (const char *)"out");	\
 } while (0)
 
-
 WINDOW *
 openifstat(void)
 {
@@ -170,7 +168,6 @@
 	return;
 }
 
-
 void
 labelifstat(void)
 {
@@ -254,7 +251,6 @@
 			IFSTAT_ERR(2, "error getting time of day");
 		(void)getifmibdata(ifp->if_row, &ifp->if_mib);
 
-
 		new_inb = ifp->if_mib.ifmd_data.ifi_ibytes;
 		new_outb = ifp->if_mib.ifmd_data.ifi_obytes;
 
diff -r b13678ea9938 -r ce0261f8d359 head/usr.bin/systat/iostat.c
--- a/head/usr.bin/systat/iostat.c	Fri Mar 02 16:51:37 2012 +0200
+++ b/head/usr.bin/systat/iostat.c	Fri Mar 02 16:51:53 2012 +0200
@@ -56,7 +56,7 @@
 
 #include <sys/cdefs.h>
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: head/usr.bin/systat/iostat.c 231011 2012-02-05 09:17:49Z ed $");
 
 #ifdef lint
 static const char sccsid[] = "@(#)iostat.c	8.1 (Berkeley) 6/6/93";
@@ -254,7 +254,6 @@
 	return (row);
 }
 
-
 void
 showiostat(void)
 {
diff -r b13678ea9938 -r ce0261f8d359 head/usr.bin/systat/ip.c
--- a/head/usr.bin/systat/ip.c	Fri Mar 02 16:51:37 2012 +0200
+++ b/head/usr.bin/systat/ip.c	Fri Mar 02 16:51:53 2012 +0200
@@ -29,7 +29,7 @@
 
 #include <sys/cdefs.h>
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: head/usr.bin/systat/ip.c 231011 2012-02-05 09:17:49Z ed $");
 
 #ifdef lint
 static const char sccsid[] = "@(#)mbufs.c	8.1 (Berkeley) 6/6/93";
@@ -337,4 +337,3 @@
 	if (sysctl(name, 4, &curstat.u, &len, 0, 0) < 0)
 		return;
 }
-
diff -r b13678ea9938 -r ce0261f8d359 head/usr.bin/systat/netcmds.c
--- a/head/usr.bin/systat/netcmds.c	Fri Mar 02 16:51:37 2012 +0200
+++ b/head/usr.bin/systat/netcmds.c	Fri Mar 02 16:51:53 2012 +0200
@@ -29,7 +29,7 @@
 
 #include <sys/cdefs.h>
 
-__FBSDID("$FreeBSD: head/usr.bin/systat/netcmds.c 229403 2012-01-03 18:51:58Z ed $");
+__FBSDID("$FreeBSD: head/usr.bin/systat/netcmds.c 231011 2012-02-05 09:17:49Z ed $");
 
 #ifdef lint
 static const char sccsid[] = "@(#)netcmds.c	8.1 (Berkeley) 6/6/93";
@@ -121,7 +121,6 @@
 	return (0);
 }
 
-
 static void
 changeitems(const char *args, int onoff)
 {
diff -r b13678ea9938 -r ce0261f8d359 head/usr.bin/systat/netstat.c
--- a/head/usr.bin/systat/netstat.c	Fri Mar 02 16:51:37 2012 +0200
+++ b/head/usr.bin/systat/netstat.c	Fri Mar 02 16:51:53 2012 +0200
@@ -29,7 +29,7 @@
 
 #include <sys/cdefs.h>
 
-__FBSDID("$FreeBSD: head/usr.bin/systat/netstat.c 229403 2012-01-03 18:51:58Z ed $");
+__FBSDID("$FreeBSD: head/usr.bin/systat/netstat.c 231011 2012-02-05 09:17:49Z ed $");
 
 #ifdef lint
 static const char sccsid[] = "@(#)netstat.c	8.1 (Berkeley) 6/6/93";
@@ -349,7 +349,6 @@
 	}
 }
 
-
 static struct netinfo *
 enter(struct inpcb *inp, int state, const char *proto)
 {
@@ -437,7 +436,6 @@
 #define	SNDCC	RCVCC+7
 #define	STATE	SNDCC+7
 
-
 void
 labelnetstat(void)
 {
diff -r b13678ea9938 -r ce0261f8d359 head/usr.bin/systat/pigs.c
--- a/head/usr.bin/systat/pigs.c	Fri Mar 02 16:51:37 2012 +0200
+++ b/head/usr.bin/systat/pigs.c	Fri Mar 02 16:51:53 2012 +0200
@@ -34,7 +34,7 @@
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: head/usr.bin/systat/pigs.c 231011 2012-02-05 09:17:49Z ed $");
 
 /*
  * Pigs display from Bill Reeves at Lucasfilm
@@ -81,7 +81,6 @@
 	delwin(w);
 }
 
-
 void
 showpigs(void)
 {
diff -r b13678ea9938 -r ce0261f8d359 head/usr.bin/systat/tcp.c
--- a/head/usr.bin/systat/tcp.c	Fri Mar 02 16:51:37 2012 +0200
+++ b/head/usr.bin/systat/tcp.c	Fri Mar 02 16:51:53 2012 +0200
@@ -37,7 +37,7 @@
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: head/usr.bin/systat/tcp.c 231011 2012-02-05 09:17:49Z ed $");
 
 #include <sys/param.h>
 #include <sys/types.h>
@@ -324,4 +324,3 @@
 	if (sysctl(name, 4, &curstat, &len, 0, 0) < 0)
 		return;
 }
-