From owner-svn-src-all@FreeBSD.ORG  Mon Nov 25 22:55:48 2013
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 62EBED1B;
 Mon, 25 Nov 2013 22:55:48 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 5272F2036;
 Mon, 25 Nov 2013 22:55:48 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rAPMtm2X073874;
 Mon, 25 Nov 2013 22:55:48 GMT (envelope-from pluknet@svn.freebsd.org)
Received: (from pluknet@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id rAPMtmqi073873;
 Mon, 25 Nov 2013 22:55:48 GMT (envelope-from pluknet@svn.freebsd.org)
Message-Id: <201311252255.rAPMtmqi073873@svn.freebsd.org>
From: Sergey Kandaurov <pluknet@FreeBSD.org>
Date: Mon, 25 Nov 2013 22:55:48 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r258606 - head/usr.sbin/iostat
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.16
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 25 Nov 2013 22:55:48 -0000

Author: pluknet
Date: Mon Nov 25 22:55:47 2013
New Revision: 258606
URL: http://svnweb.freebsd.org/changeset/base/258606

Log:
  iostat: fix extracting TTY statistics from core.
  
  MFC after:	1 week

Modified:
  head/usr.sbin/iostat/iostat.c

Modified: head/usr.sbin/iostat/iostat.c
==============================================================================
--- head/usr.sbin/iostat/iostat.c	Mon Nov 25 22:55:06 2013	(r258605)
+++ head/usr.sbin/iostat/iostat.c	Mon Nov 25 22:55:47 2013	(r258606)
@@ -117,10 +117,10 @@
 #include <unistd.h>
 
 struct nlist namelist[] = {
-#define X_TK_NIN	0
-	{ "_tk_nin" },
-#define X_TK_NOUT	1
-	{ "_tk_nout" },
+#define X_TTY_NIN	0
+	{ "_tty_nin" },
+#define X_TTY_NOUT	1
+	{ "_tty_nout" },
 #define X_BOOTTIME	2
 	{ "_boottime" },
 #define X_END		2
@@ -448,9 +448,9 @@ main(int argc, char **argv)
 		long double etime;
 
 		if (Tflag > 0) {
-			if ((readvar(kd, "kern.tty_nin", X_TK_NIN, &cur.tk_nin,
+			if ((readvar(kd, "kern.tty_nin", X_TTY_NIN, &cur.tk_nin,
 			     sizeof(cur.tk_nin)) != 0)
-			 || (readvar(kd, "kern.tty_nout", X_TK_NOUT,
+			 || (readvar(kd, "kern.tty_nout", X_TTY_NOUT,
 			     &cur.tk_nout, sizeof(cur.tk_nout))!= 0)) {
 				Tflag = 0;
 				warnx("disabling TTY statistics");