From owner-svn-src-head@FreeBSD.ORG Sun Apr 21 22:36:15 2013 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 4402B1CF; Sun, 21 Apr 2013 22:36:15 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 1C93614CD; Sun, 21 Apr 2013 22:36:15 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r3LMaE5U078008; Sun, 21 Apr 2013 22:36:15 GMT (envelope-from ed@svn.freebsd.org) Received: (from ed@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r3LMaEMb078007; Sun, 21 Apr 2013 22:36:14 GMT (envelope-from ed@svn.freebsd.org) Message-Id: <201304212236.r3LMaEMb078007@svn.freebsd.org> From: Ed Schouten Date: Sun, 21 Apr 2013 22:36:14 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r249743 - head/sbin/newfs_nandfs X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 21 Apr 2013 22:36:15 -0000 Author: ed Date: Sun Apr 21 22:36:14 2013 New Revision: 249743 URL: http://svnweb.freebsd.org/changeset/base/249743 Log: Unbreak the build of newfs_nandfs. Mark global variables static. While there, make some small style(9) cleanups and remove a variable that is unused. Modified: head/sbin/newfs_nandfs/newfs_nandfs.c Modified: head/sbin/newfs_nandfs/newfs_nandfs.c ============================================================================== --- head/sbin/newfs_nandfs/newfs_nandfs.c Sun Apr 21 21:28:38 2013 (r249742) +++ head/sbin/newfs_nandfs/newfs_nandfs.c Sun Apr 21 22:36:14 2013 (r249743) @@ -80,15 +80,18 @@ struct file_info { struct nandfs_inode *inode; }; -struct file_info user_files[] = -{ - {NANDFS_ROOT_INO, NULL, S_IFDIR | 0755, 0, 1, NULL, NULL}, +static struct file_info user_files[] = { + { NANDFS_ROOT_INO, NULL, S_IFDIR | 0755, 0, 1, NULL, NULL }, }; -struct file_info ifile = {NANDFS_IFILE_INO, NULL, 0, 0, -1, NULL, NULL}; -struct file_info sufile = {NANDFS_SUFILE_INO, NULL, 0, 0, -1, NULL, NULL}; -struct file_info cpfile = {NANDFS_CPFILE_INO, NULL, 0, 0, -1, NULL, NULL}; -struct file_info datfile = {NANDFS_DAT_INO, NULL, 0, 0, -1, NULL, NULL}; +static struct file_info ifile = + { NANDFS_IFILE_INO, NULL, 0, 0, -1, NULL, NULL }; +static struct file_info sufile = + { NANDFS_SUFILE_INO, NULL, 0, 0, -1, NULL, NULL }; +static struct file_info cpfile = + { NANDFS_CPFILE_INO, NULL, 0, 0, -1, NULL, NULL }; +static struct file_info datfile = + { NANDFS_DAT_INO, NULL, 0, 0, -1, NULL, NULL }; struct nandfs_block { LIST_ENTRY(nandfs_block) block_link; @@ -97,7 +100,8 @@ struct nandfs_block { void *data; }; -static LIST_HEAD(, nandfs_block) block_head = LIST_HEAD_INITIALIZER(&block_head); +static LIST_HEAD(, nandfs_block) block_head = + LIST_HEAD_INITIALIZER(&block_head); /* Storage geometry */ static off_t mediasize; @@ -106,8 +110,8 @@ static uint64_t nsegments; static uint64_t erasesize; static uint64_t segsize; -struct nandfs_fsdata fsdata; -struct nandfs_super_block super_block; +static struct nandfs_fsdata fsdata; +static struct nandfs_super_block super_block; static int is_nand; @@ -120,14 +124,13 @@ static uint32_t bad_segments_count = 0; static uint32_t *bad_segments = NULL; static uint8_t fsdata_blocks_state[NANDFS_NFSAREAS]; -u_char *volumelabel = NULL; +static u_char *volumelabel = NULL; -struct nandfs_super_root *sr; +static struct nandfs_super_root *sr; -uint32_t nuserfiles; -uint32_t seg_segsum_size; -uint32_t seg_nblocks; -uint32_t seg_endblock; +static uint32_t nuserfiles; +static uint32_t seg_nblocks; +static uint32_t seg_endblock; #define SIZE_TO_BLOCK(size) (((size) + (blocksize - 1)) / blocksize)