From owner-svn-src-all@FreeBSD.ORG  Tue Dec 20 12:34:18 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 1CD6E106564A;
	Tue, 20 Dec 2011 12:34:18 +0000 (UTC) (envelope-from ed@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 0BB4C8FC08;
	Tue, 20 Dec 2011 12:34:18 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id pBKCYHpN014933;
	Tue, 20 Dec 2011 12:34:17 GMT (envelope-from ed@svn.freebsd.org)
Received: (from ed@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id pBKCYH0v014930;
	Tue, 20 Dec 2011 12:34:17 GMT (envelope-from ed@svn.freebsd.org)
Message-Id: <201112201234.pBKCYH0v014930@svn.freebsd.org>
From: Ed Schouten <ed@FreeBSD.org>
Date: Tue, 20 Dec 2011 12:34:17 +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: r228733 - head/usr.sbin/makefs/ffs
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: Tue, 20 Dec 2011 12:34:18 -0000

Author: ed
Date: Tue Dec 20 12:34:17 2011
New Revision: 228733
URL: http://svn.freebsd.org/changeset/base/228733

Log:
  Small cleanups to panic() prototype.
  
  - Let panic() use _Noreturn and __printflike() instead of GCC-specific
    attributes.
  - Remove prototype from ffs_subr.c and let it include ffs_extern.h.
  - Forward declare struct inode to make ffs_extern.h not depend on it.

Modified:
  head/usr.sbin/makefs/ffs/ffs_extern.h
  head/usr.sbin/makefs/ffs/ffs_subr.c

Modified: head/usr.sbin/makefs/ffs/ffs_extern.h
==============================================================================
--- head/usr.sbin/makefs/ffs/ffs_extern.h	Tue Dec 20 12:34:16 2011	(r228732)
+++ head/usr.sbin/makefs/ffs/ffs_extern.h	Tue Dec 20 12:34:17 2011	(r228733)
@@ -35,6 +35,8 @@
 
 #include "ffs/buf.h"
 
+struct inode;
+
 /*
  * Structure used to pass around logical block paths generated by
  * ufs_getlbns and used by truncate and bmap code.
@@ -46,8 +48,7 @@ struct indir {
 };
 
 	/* ffs.c */
-void panic(const char *, ...)
-    __attribute__((__noreturn__,__format__(__printf__,1,2)));  
+_Noreturn void panic(const char *, ...) __printflike(1, 2);
 
 	/* ffs_alloc.c */
 int ffs_alloc(struct inode *, daddr_t, daddr_t, int, daddr_t *);

Modified: head/usr.sbin/makefs/ffs/ffs_subr.c
==============================================================================
--- head/usr.sbin/makefs/ffs/ffs_subr.c	Tue Dec 20 12:34:16 2011	(r228732)
+++ head/usr.sbin/makefs/ffs/ffs_subr.c	Tue Dec 20 12:34:17 2011	(r228733)
@@ -38,11 +38,9 @@ __FBSDID("$FreeBSD$");
 
 #include <ufs/ufs/dinode.h>
 #include <ufs/ffs/fs.h>
+#include "ffs/ffs_extern.h"
 #include "ffs/ufs_bswap.h"
 
-void    panic __P((const char *, ...))
-    __attribute__((__noreturn__,__format__(__printf__,1,2)));
-
 /*
  * Update the frsum fields to reflect addition or deletion 
  * of some frags.