From owner-svn-src-all@FreeBSD.ORG  Sat Nov 13 16:49:07 2010
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 65ADD1065675;
	Sat, 13 Nov 2010 16:49:07 +0000 (UTC) (envelope-from kib@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 53BC68FC1C;
	Sat, 13 Nov 2010 16:49:07 +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 oADGn7S5053636;
	Sat, 13 Nov 2010 16:49:07 GMT (envelope-from kib@svn.freebsd.org)
Received: (from kib@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id oADGn7xA053634;
	Sat, 13 Nov 2010 16:49:07 GMT (envelope-from kib@svn.freebsd.org)
Message-Id: <201011131649.oADGn7xA053634@svn.freebsd.org>
From: Konstantin Belousov <kib@FreeBSD.org>
Date: Sat, 13 Nov 2010 16:49:07 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r215248 - head/sbin/kldstat
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, 13 Nov 2010 16:49:07 -0000

Author: kib
Date: Sat Nov 13 16:49:07 2010
New Revision: 215248
URL: http://svn.freebsd.org/changeset/base/215248

Log:
  In printfile(), exit the process instead of only printing the warning.
  This fixes verbose mode when either -i specified non-existent kldfile
  id, or the file was unloaded between two kldnext(2) calls.
  
  While there, fix printfile() definition to be style(9)-compliant.
  
  Submitted by:	arundel
  MFC after:	1 week

Modified:
  head/sbin/kldstat/kldstat.c

Modified: head/sbin/kldstat/kldstat.c
==============================================================================
--- head/sbin/kldstat/kldstat.c	Sat Nov 13 15:28:44 2010	(r215247)
+++ head/sbin/kldstat/kldstat.c	Sat Nov 13 16:49:07 2010	(r215248)
@@ -50,14 +50,15 @@ printmod(int modid)
 	printf("\t\t%2d %s\n", stat.id, stat.name);
 }
 
-static void printfile(int fileid, int verbose)
+static void
+printfile(int fileid, int verbose)
 {
     struct kld_file_stat stat;
     int modid;
 
     stat.version = sizeof(struct kld_file_stat);
     if (kldstat(fileid, &stat) < 0)
-	warn("can't stat file id %d", fileid);
+	err(1, "can't stat file id %d", fileid);
     else
 	printf("%2d %4d %p %-8zx %s",
 	       stat.id, stat.refs, stat.address, stat.size,