Mercurial > hg > octave-nkf > gnulib-hg
changeset 197:6658e575c60c
(adjust_blocks): Code it as a function again.
author | Jim Meyering <jim@meyering.net> |
---|---|
date | Wed, 16 Mar 1994 14:47:59 +0000 |
parents | 755d21b8886f |
children | 5db9ec871df6 |
files | lib/fsusage.c |
diffstat | 1 files changed, 37 insertions(+), 43 deletions(-) [+] |
line wrap: on
line diff
--- a/lib/fsusage.c +++ b/lib/fsusage.c @@ -68,26 +68,27 @@ int statvfs (); #endif -/* Set B_NEW to the number of TOSIZE-byte blocks used by B FROMSIZE-byte - blocks, rounding away from zero. TOSIZE must be positive. Return -1 - from invoking function if FROMSIZE is not positive. */ +/* Return the number of TOSIZE-byte blocks used by + BLOCKS FROMSIZE-byte blocks, rounding away from zero. + TOSIZE must be positive. Return -1 if FROMSIZE is not positive. */ -#define ADJUST_BLOCKS(b_new, b, fromsize, tosize) \ - do \ - { \ - if ((tosize) <= 0) \ - abort (); \ - if ((fromsize) <= 0) \ - return -1; \ - \ - if ((fromsize) == (tosize)) /* E.g., from 512 to 512. */ \ - (b_new) = (b); \ - else if ((fromsize) > (tosize)) /* E.g., from 2048 to 512. */ \ - (b_new) = (b) * ((fromsize) / (tosize)); \ - else /* E.g., from 256 to 512. */ \ - (b_new) = ((b) + ((b) < 0 ? -1 : 1)) / ((tosize) / (fromsize)); \ - } \ - while (0) +static long +adjust_blocks (blocks, fromsize, tosize) + long blocks; + int fromsize, tosize; +{ + if (tosize <= 0) + abort (); + if (fromsize <= 0) + return -1; + + if (fromsize == tosize) /* E.g., from 512 to 512. */ + return blocks; + else if (fromsize > tosize) /* E.g., from 2048 to 512. */ + return blocks * (fromsize / tosize); + else /* E.g., from 256 to 512. */ + return (blocks + (blocks < 0 ? -1 : 1)) / (tosize / fromsize); +} /* Fill in the fields of FSP with information about space usage for the filesystem on which PATH resides. @@ -105,7 +106,7 @@ if (statfs (path, &fsd, sizeof (struct statfs)) != 0) return -1; -#define CONVERT_BLOCKS(bnew, b) ADJUST_BLOCKS ((bnew), (b), fsd.f_fsize, 512) +#define CONVERT_BLOCKS(b) adjust_blocks ((b), fsd.f_fsize, 512) #endif /* STAT_STATFS3_OSF1 */ #ifdef STAT_STATFS2_FS_DATA /* Ultrix. */ @@ -113,10 +114,10 @@ if (statfs (path, &fsd) != 1) return -1; -#define CONVERT_BLOCKS(bnew, b) ADJUST_BLOCKS ((bnew), (b), 1024, 512) - CONVERT_BLOCKS (fsp->fsu_blocks, fsd.fd_req.btot); - CONVERT_BLOCKS (fsp->fsu_bfree, fsd.fd_req.bfree); - CONVERT_BLOCKS (fsp->fsu_bavail, fsd.fd_req.bfreen); +#define CONVERT_BLOCKS(b) adjust_blocks ((b), 1024, 512) + fsp->fsu_blocks = CONVERT_BLOCKS (fsd.fd_req.btot); + fsp->fsu_bfree = CONVERT_BLOCKS (fsd.fd_req.bfree); + fsp->fsu_bavail = CONVERT_BLOCKS (fsd.fd_req.bfreen); fsp->fsu_files = fsd.fd_req.gtot; fsp->fsu_ffree = fsd.fd_req.gfree; #endif @@ -138,11 +139,10 @@ return -1; } close (fd); -#define CONVERT_BLOCKS(bnew, b) \ - ADJUST_BLOCKS ((bnew), (b), (fsd.s_type == Fs2b ? 1024 : 512), 512) - CONVERT_BLOCKS (fsp->fsu_blocks, fsd.s_fsize); - CONVERT_BLOCKS (fsp->fsu_bfree, fsd.s_tfree); - CONVERT_BLOCKS (fsp->fsu_bavail, fsd.s_tfree); +#define CONVERT_BLOCKS(b) adjust_blocks ((b), (fsd.s_type == Fs2b ? 1024 : 512), 512) + fsp->fsu_blocks = CONVERT_BLOCKS (fsd.s_fsize); + fsp->fsu_bfree = CONVERT_BLOCKS (fsd.s_tfree); + fsp->fsu_bavail = CONVERT_BLOCKS (fsd.s_tfree); fsp->fsu_files = (fsd.s_isize - 2) * INOPB * (fsd.s_type == Fs2b ? 2 : 1); fsp->fsu_ffree = fsd.s_tinode; #endif @@ -152,7 +152,7 @@ if (statfs (path, &fsd) < 0) return -1; -#define CONVERT_BLOCKS(bnew, b) ADJUST_BLOCKS ((bnew), (b), fsd.f_bsize, 512) +#define CONVERT_BLOCKS(b) adjust_blocks ((b), fsd.f_bsize, 512) #endif #ifdef STAT_STATFS2_FSIZE /* 4.4BSD. */ @@ -160,7 +160,7 @@ if (statfs (path, &fsd) < 0) return -1; -#define CONVERT_BLOCKS(bnew, b) ADJUST_BLOCKS ((bnew), (b), fsd.f_fsize, 512) +#define CONVERT_BLOCKS(b) adjust_blocks ((b), fsd.f_fsize, 512) #endif #ifdef STAT_STATFS4 /* SVR3, Dynix, Irix. */ @@ -171,13 +171,7 @@ /* Empirically, the block counts on most SVR3 and SVR3-derived systems seem to always be in terms of 512-byte blocks, no matter what value f_bsize has. */ -#define CONVERT_BLOCKS(bnew, b) \ - do \ - { \ - (bnew) = (b); \ - } \ - while (0) - +#define CONVERT_BLOCKS(b) (b) #ifndef _SEQUENT_ /* _SEQUENT_ is DYNIX/ptx. */ #ifndef DOLPHIN /* DOLPHIN 3.8.alfa/7.18 has f_bavail */ #define f_bavail f_bfree @@ -191,14 +185,14 @@ if (statvfs (path, &fsd) < 0) return -1; /* f_frsize isn't guaranteed to be supported. */ -#define CONVERT_BLOCKS(bnew, b) \ - ADJUST_BLOCKS ((bnew), (b), fsd.f_frsize ? fsd.f_frsize : fsd.f_bsize, 512) +#define CONVERT_BLOCKS(b) \ + adjust_blocks ((b), fsd.f_frsize ? fsd.f_frsize : fsd.f_bsize, 512) #endif #if !defined(STAT_STATFS2_FS_DATA) && !defined(STAT_READ) /* !Ultrix && !SVR2. */ - CONVERT_BLOCKS (fsp->fsu_blocks, fsd.f_blocks); - CONVERT_BLOCKS (fsp->fsu_bfree, fsd.f_bfree); - CONVERT_BLOCKS (fsp->fsu_bavail, fsd.f_bavail); + fsp->fsu_blocks = CONVERT_BLOCKS (fsd.f_blocks); + fsp->fsu_bfree = CONVERT_BLOCKS (fsd.f_bfree); + fsp->fsu_bavail = CONVERT_BLOCKS (fsd.f_bavail); fsp->fsu_files = fsd.f_files; fsp->fsu_ffree = fsd.f_ffree; #endif