From owner-svn-src-all@FreeBSD.ORG  Sat Apr 16 10:42:23 2011
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:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 50F9C106566B;
	Sat, 16 Apr 2011 10:42:23 +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 3FF638FC15;
	Sat, 16 Apr 2011 10:42:23 +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 p3GAgNRV001978;
	Sat, 16 Apr 2011 10:42:23 GMT (envelope-from brucec@svn.freebsd.org)
Received: (from brucec@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p3GAgN0I001975;
	Sat, 16 Apr 2011 10:42:23 GMT (envelope-from brucec@svn.freebsd.org)
Message-Id: <201104161042.p3GAgN0I001975@svn.freebsd.org>
From: Bruce Cran <brucec@FreeBSD.org>
Date: Sat, 16 Apr 2011 10:42:23 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r220703 - stable/8/tools/tools/cfi
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
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/listinfo/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: Sat, 16 Apr 2011 10:42:23 -0000

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

Log:
  MFC r219521:
  
  Fix warnings and set WARNS to 6.

Modified:
  stable/8/tools/tools/cfi/Makefile
  stable/8/tools/tools/cfi/cfi.c
Directory Properties:
  stable/8/tools/tools/cfi/   (props changed)

Modified: stable/8/tools/tools/cfi/Makefile
==============================================================================
--- stable/8/tools/tools/cfi/Makefile	Sat Apr 16 10:38:27 2011	(r220702)
+++ stable/8/tools/tools/cfi/Makefile	Sat Apr 16 10:42:22 2011	(r220703)
@@ -3,5 +3,6 @@
 PROG=	cfi
 BINDIR=	/usr/local/bin
 NO_MAN=
+WARNS?=6
 
 .include <bsd.prog.mk>

Modified: stable/8/tools/tools/cfi/cfi.c
==============================================================================
--- stable/8/tools/tools/cfi/cfi.c	Sat Apr 16 10:38:27 2011	(r220702)
+++ stable/8/tools/tools/cfi/cfi.c	Sat Apr 16 10:42:22 2011	(r220703)
@@ -38,9 +38,12 @@
 #include <sys/ioctl.h>
 #include <sys/cfictl.h>
 
-#include <stdio.h>
+#include <err.h>
 #include <getopt.h>
+#include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
 
 const char *progname;
 const char *dvname;
@@ -48,8 +51,6 @@ const char *dvname;
 static void
 usage(void)
 {
-	int i;
-
 	fprintf(stderr, "usage: %s [-f device] op...\n", progname);
 	fprintf(stderr, "where op's are:\n");
 	fprintf(stderr, "fact\t\tread factory PR segment\n");