Skip site navigation (1)Skip section navigation (2) 
Date:      Wed, 12 Sep 2012 15:36:44 +0000 (UTC)
From:      "David E. O'Brien" <obrien@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r240406 - head/sbin/fsck_ffs
Message-ID:  <201209121536.q8CFaiAU096941@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: obrien
Date: Wed Sep 12 15:36:44 2012
New Revision: 240406
URL: http://svn.freebsd.org/changeset/base/240406

Log:
  Remove needless (int) casts of write(2)'s 3rd argument.
  Also change blwrite() 'size' parameter to a ssize_t to better match
  write(2).

Modified:
  head/sbin/fsck_ffs/fsck.h
  head/sbin/fsck_ffs/fsutil.c

Modified: head/sbin/fsck_ffs/fsck.h
==============================================================================
--- head/sbin/fsck_ffs/fsck.h	Wed Sep 12 14:59:57 2012	(r240405)
+++ head/sbin/fsck_ffs/fsck.h	Wed Sep 12 15:36:44 2012	(r240406)
@@ -337,7 +337,7 @@ void		blkerror(ino_t ino, const char *ty
 char	       *blockcheck(char *name);
 int		blread(int fd, char *buf, ufs2_daddr_t blk, long size);
 void		bufinit(void);
-void		blwrite(int fd, char *buf, ufs2_daddr_t blk, long size);
+void		blwrite(int fd, char *buf, ufs2_daddr_t blk, ssize_t size);
 void		blerase(int fd, ufs2_daddr_t blk, long size);
 void		cacheino(union dinode *dp, ino_t inumber);
 void		catch(int);

Modified: head/sbin/fsck_ffs/fsutil.c
==============================================================================
--- head/sbin/fsck_ffs/fsutil.c	Wed Sep 12 14:59:57 2012	(r240405)
+++ head/sbin/fsck_ffs/fsutil.c	Wed Sep 12 15:36:44 2012	(r240406)
@@ -245,7 +245,7 @@ flush(int fd, struct bufarea *bp)
 		    (bp->b_errs == bp->b_size / dev_bsize) ? "" : "PARTIALLY ",
 		    (long long)bp->b_bno);
 	bp->b_errs = 0;
-	blwrite(fd, bp->b_un.b_buf, bp->b_bno, (long)bp->b_size);
+	blwrite(fd, bp->b_un.b_buf, bp->b_bno, bp->b_size);
 	if (bp != &sblk)
 		return;
 	for (i = 0, j = 0; i < sblock.fs_cssize; i += sblock.fs_bsize, j++) {
@@ -392,7 +392,7 @@ blread(int fd, char *buf, ufs2_daddr_t b
 }
 
 void
-blwrite(int fd, char *buf, ufs2_daddr_t blk, long size)
+blwrite(int fd, char *buf, ufs2_daddr_t blk, ssize_t size)
 {
 	int i;
 	char *cp;
@@ -404,7 +404,7 @@ blwrite(int fd, char *buf, ufs2_daddr_t 
 	offset *= dev_bsize;
 	if (lseek(fd, offset, 0) < 0)
 		rwerror("SEEK BLK", blk);
-	else if (write(fd, buf, (int)size) == size) {
+	else if (write(fd, buf, size) == size) {
 		fsmodified = 1;
 		return;
 	}
@@ -414,7 +414,7 @@ blwrite(int fd, char *buf, ufs2_daddr_t 
 		rwerror("SEEK BLK", blk);
 	printf("THE FOLLOWING SECTORS COULD NOT BE WRITTEN:");
 	for (cp = buf, i = 0; i < size; i += dev_bsize, cp += dev_bsize)
-		if (write(fd, cp, (int)dev_bsize) != dev_bsize) {
+		if (write(fd, cp, dev_bsize) != dev_bsize) {
 			(void)lseek(fd, offset + i + dev_bsize, 0);
 			printf(" %jd,", (intmax_t)blk + i / dev_bsize);
 		}

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201209121536.q8CFaiAU096941>