From owner-svn-src-stable@FreeBSD.ORG  Sat Apr 16 10:22:06 2011
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id DE2CD106566C;
	Sat, 16 Apr 2011 10:22:06 +0000 (UTC)
	(envelope-from brucec@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id CCCB48FC19;
	Sat, 16 Apr 2011 10:22:06 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p3GAM6Ev001380;
	Sat, 16 Apr 2011 10:22:06 GMT (envelope-from brucec@svn.freebsd.org)
Received: (from brucec@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p3GAM6wk001377;
	Sat, 16 Apr 2011 10:22:06 GMT (envelope-from brucec@svn.freebsd.org)
Message-Id: <201104161022.p3GAM6wk001377@svn.freebsd.org>
From: Bruce Cran <brucec@FreeBSD.org>
Date: Sat, 16 Apr 2011 10:22:06 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r220699 - stable/7/tools/tools/iwi
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 16 Apr 2011 10:22:07 -0000

Author: brucec
Date: Sat Apr 16 10:22:06 2011
New Revision: 220699
URL: http://svn.freebsd.org/changeset/base/220699

Log:
  MFC r219527:
  
  Fix warnings and style(9) issues.
  Set WARNS to 6.

Modified:
  stable/7/tools/tools/iwi/Makefile
  stable/7/tools/tools/iwi/iwistats.c
Directory Properties:
  stable/7/tools/tools/iwi/   (props changed)

Modified: stable/7/tools/tools/iwi/Makefile
==============================================================================
--- stable/7/tools/tools/iwi/Makefile	Sat Apr 16 10:20:45 2011	(r220698)
+++ stable/7/tools/tools/iwi/Makefile	Sat Apr 16 10:22:06 2011	(r220699)
@@ -2,5 +2,6 @@
 
 PROG=	iwistats
 NO_MAN=
+WARNS?=6
 
 .include <bsd.prog.mk>

Modified: stable/7/tools/tools/iwi/iwistats.c
==============================================================================
--- stable/7/tools/tools/iwi/iwistats.c	Sat Apr 16 10:20:45 2011	(r220698)
+++ stable/7/tools/tools/iwi/iwistats.c	Sat Apr 16 10:22:06 2011	(r220699)
@@ -113,16 +113,17 @@ get_statistics(const char *iface)
 	static uint32_t stats[256];
 	const struct statistic *stat;
 	char oid[32];
-	int ifaceno, len;
+	size_t len;
+	int ifaceno;
 
 	if (sscanf(iface, "iwi%u", &ifaceno) != 1)
 		errx(EX_DATAERR, "Invalid interface name '%s'", iface);
 
-	len = sizeof stats;
-	(void)snprintf(oid, sizeof oid, "dev.iwi.%u.stats", ifaceno);
+	len = sizeof(stats);
+	(void)snprintf(oid, sizeof(oid), "dev.iwi.%u.stats", ifaceno);
 	if (sysctlbyname(oid, stats, &len, NULL, 0) == -1)
 		err(EX_OSERR, "Can't retrieve statistics");
 
 	for (stat = tbl; stat->index != -1; stat++)
-		(void)printf("%-60s[%lu]\n", stat->desc, stats[stat->index]);
+		(void)printf("%-60s[%u]\n", stat->desc, stats[stat->index]);
 }