diff options
author | bde <bde@FreeBSD.org> | 1996-07-12 04:12:25 +0000 |
---|---|---|
committer | bde <bde@FreeBSD.org> | 1996-07-12 04:12:25 +0000 |
commit | 4c9b9ce103f19e9cf0ec1b8e6b5d05db44be4176 (patch) | |
tree | 779349387d8c1e223fa67195929cd05163410911 /sys/ufs | |
parent | 214f4abc72a6e5fdfbd318b73ec1c66f7a9a826b (diff) | |
download | FreeBSD-src-4c9b9ce103f19e9cf0ec1b8e6b5d05db44be4176.zip FreeBSD-src-4c9b9ce103f19e9cf0ec1b8e6b5d05db44be4176.tar.gz |
Don't use NULL in non-pointer contexts.
Diffstat (limited to 'sys/ufs')
-rw-r--r-- | sys/ufs/ffs/ffs_alloc.c | 32 | ||||
-rw-r--r-- | sys/ufs/lfs/lfs_bio.c | 4 |
2 files changed, 18 insertions, 18 deletions
diff --git a/sys/ufs/ffs/ffs_alloc.c b/sys/ufs/ffs/ffs_alloc.c index 7450088..fd10f11 100644 --- a/sys/ufs/ffs/ffs_alloc.c +++ b/sys/ufs/ffs/ffs_alloc.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)ffs_alloc.c 8.8 (Berkeley) 2/21/94 - * $Id: ffs_alloc.c,v 1.23 1996/01/05 18:31:45 wollman Exp $ + * $Id: ffs_alloc.c,v 1.24 1996/05/08 04:29:07 gpalmer Exp $ */ #include "opt_quota.h" @@ -654,7 +654,7 @@ ffs_blkpref(ip, lbn, indx, bap) fs->fs_cgrotor = cg; return (fs->fs_fpg * cg + fs->fs_frag); } - return (NULL); + return (0); } /* * One or more previous blocks have been laid out. If less @@ -756,30 +756,30 @@ ffs_fragextend(ip, cg, bprev, osize, nsize) fs = ip->i_fs; if (fs->fs_cs(fs, cg).cs_nffree < numfrags(fs, nsize - osize)) - return (NULL); + return (0); frags = numfrags(fs, nsize); bbase = fragnum(fs, bprev); if (bbase > fragnum(fs, (bprev + frags - 1))) { /* cannot extend across a block boundary */ - return (NULL); + return (0); } error = bread(ip->i_devvp, fsbtodb(fs, cgtod(fs, cg)), (int)fs->fs_cgsize, NOCRED, &bp); if (error) { brelse(bp); - return (NULL); + return (0); } cgp = (struct cg *)bp->b_data; if (!cg_chkmagic(cgp)) { brelse(bp); - return (NULL); + return (0); } cgp->cg_time = time.tv_sec; bno = dtogd(fs, bprev); for (i = numfrags(fs, osize); i < frags; i++) if (isclr(cg_blksfree(cgp), bno + i)) { brelse(bp); - return (NULL); + return (0); } /* * the current fragment can be extended @@ -825,18 +825,18 @@ ffs_alloccg(ip, cg, bpref, size) fs = ip->i_fs; if (fs->fs_cs(fs, cg).cs_nbfree == 0 && size == fs->fs_bsize) - return (NULL); + return (0); error = bread(ip->i_devvp, fsbtodb(fs, cgtod(fs, cg)), (int)fs->fs_cgsize, NOCRED, &bp); if (error) { brelse(bp); - return (NULL); + return (0); } cgp = (struct cg *)bp->b_data; if (!cg_chkmagic(cgp) || (cgp->cg_cs.cs_nbfree == 0 && size == fs->fs_bsize)) { brelse(bp); - return (NULL); + return (0); } cgp->cg_time = time.tv_sec; if (size == fs->fs_bsize) { @@ -860,7 +860,7 @@ ffs_alloccg(ip, cg, bpref, size) */ if (cgp->cg_cs.cs_nbfree == 0) { brelse(bp); - return (NULL); + return (0); } bno = ffs_alloccgblk(fs, cgp, bpref); bpref = dtogd(fs, bno); @@ -878,7 +878,7 @@ ffs_alloccg(ip, cg, bpref, size) bno = ffs_mapsearch(fs, cgp, bpref, allocsiz); if (bno < 0) { brelse(bp); - return (NULL); + return (0); } for (i = 0; i < frags; i++) clrbit(cg_blksfree(cgp), bno + i); @@ -992,7 +992,7 @@ norot: */ bno = ffs_mapsearch(fs, cgp, bpref, (int)fs->fs_frag); if (bno < 0) - return (NULL); + return (0); cgp->cg_rotor = bno; gotit: blkno = fragstoblks(fs, bno); @@ -1122,17 +1122,17 @@ ffs_nodealloccg(ip, cg, ipref, mode) fs = ip->i_fs; if (fs->fs_cs(fs, cg).cs_nifree == 0) - return (NULL); + return (0); error = bread(ip->i_devvp, fsbtodb(fs, cgtod(fs, cg)), (int)fs->fs_cgsize, NOCRED, &bp); if (error) { brelse(bp); - return (NULL); + return (0); } cgp = (struct cg *)bp->b_data; if (!cg_chkmagic(cgp) || cgp->cg_cs.cs_nifree == 0) { brelse(bp); - return (NULL); + return (0); } cgp->cg_time = time.tv_sec; if (ipref) { diff --git a/sys/ufs/lfs/lfs_bio.c b/sys/ufs/lfs/lfs_bio.c index 4816ab2..e184936 100644 --- a/sys/ufs/lfs/lfs_bio.c +++ b/sys/ufs/lfs/lfs_bio.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)lfs_bio.c 8.4 (Berkeley) 12/30/93 - * $Id: lfs_bio.c,v 1.7 1995/12/03 11:16:35 bde Exp $ + * $Id: lfs_bio.c,v 1.8 1995/12/17 21:09:46 phk Exp $ */ #include <sys/param.h> @@ -103,7 +103,7 @@ lfs_bwrite(ap) /* Out of space, need cleaner to run */ wakeup(&lfs_allclean_wakeup); error = tsleep(&fs->lfs_avail, PCATCH | PUSER, - "cleaner", NULL); + "cleaner", 0); if (error) { brelse(bp); return (error); |