From owner-svn-src-projects@FreeBSD.ORG Wed Jul 14 21:24:18 2010 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id AE6EC106567A; Wed, 14 Jul 2010 21:24:18 +0000 (UTC) (envelope-from jeff@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 55F4B8FC12; Wed, 14 Jul 2010 21:24:18 +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 o6ELOIj9084386; Wed, 14 Jul 2010 21:24:18 GMT (envelope-from jeff@svn.freebsd.org) Received: (from jeff@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o6ELOI9x084382; Wed, 14 Jul 2010 21:24:18 GMT (envelope-from jeff@svn.freebsd.org) Message-Id: <201007142124.o6ELOI9x084382@svn.freebsd.org> From: Jeff Roberson Date: Wed, 14 Jul 2010 21:24:18 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r210082 - in projects/suj/6/sbin: fsck_ffs fsdb X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 14 Jul 2010 21:24:18 -0000 Author: jeff Date: Wed Jul 14 21:24:18 2010 New Revision: 210082 URL: http://svn.freebsd.org/changeset/base/210082 Log: - Correct build errors. Modified: projects/suj/6/sbin/fsck_ffs/suj.c projects/suj/6/sbin/fsdb/fsdb.c projects/suj/6/sbin/fsdb/fsdb.h Modified: projects/suj/6/sbin/fsck_ffs/suj.c ============================================================================== --- projects/suj/6/sbin/fsck_ffs/suj.c Wed Jul 14 21:19:11 2010 (r210081) +++ projects/suj/6/sbin/fsck_ffs/suj.c Wed Jul 14 21:24:18 2010 (r210082) @@ -170,7 +170,7 @@ errmalloc(size_t n) * the error and then offer to fallback to normal fsck. */ static void -err_suj(const char * restrict fmt, ...) +err_suj(const char * fmt, ...) { va_list ap; Modified: projects/suj/6/sbin/fsdb/fsdb.c ============================================================================== --- projects/suj/6/sbin/fsdb/fsdb.c Wed Jul 14 21:19:11 2010 (r210081) +++ projects/suj/6/sbin/fsdb/fsdb.c Wed Jul 14 21:24:18 2010 (r210082) @@ -620,7 +620,7 @@ find_indirblks32(uint32_t blk, int ind_l uint32_t idblk[MAXNINDIR]; int i; - bread(fsreadfd, (char *)idblk, fsbtodb(&sblock, blk), (int)sblock.fs_bsize); + blread(fsreadfd, (char *)idblk, fsbtodb(&sblock, blk), (int)sblock.fs_bsize); if (ind_level <= 0) { if (find_blks32(idblk, sblock.fs_bsize / sizeof(uint32_t), wantedblk)) return 1; @@ -662,7 +662,7 @@ find_indirblks64(uint64_t blk, int ind_l uint64_t idblk[MAXNINDIR]; int i; - bread(fsreadfd, (char *)idblk, fsbtodb(&sblock, blk), (int)sblock.fs_bsize); + blread(fsreadfd, (char *)idblk, fsbtodb(&sblock, blk), (int)sblock.fs_bsize); if (ind_level <= 0) { if (find_blks64(idblk, sblock.fs_bsize / sizeof(uint64_t), wantedblk)) return 1; Modified: projects/suj/6/sbin/fsdb/fsdb.h ============================================================================== --- projects/suj/6/sbin/fsdb/fsdb.h Wed Jul 14 21:19:11 2010 (r210081) +++ projects/suj/6/sbin/fsdb/fsdb.h Wed Jul 14 21:24:18 2010 (r210082) @@ -30,8 +30,8 @@ * $FreeBSD$ */ -extern int bread(int fd, char *buf, ufs2_daddr_t blk, long size); -extern void bwrite(int fd, char *buf, ufs2_daddr_t blk, long size); +extern int blread(int fd, char *buf, ufs2_daddr_t blk, long size); +extern void blwrite(int fd, char *buf, ufs2_daddr_t blk, long size); extern void rwerror(const char *mesg, ufs2_daddr_t blk); extern int reply(const char *question);