svn commit: r210082 - in projects/suj/6/sbin: fsck_ffs fsdb

[Jeff Roberson]

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);