From: Jim Meyering Date: Sat, 31 Oct 1992 22:50:51 +0000 (+0000) Subject: (adjust_blocks): Convert to a macro. The static X-Git-Tag: cvs-readonly~9036 X-Git-Url: http://erislabs.net/gitweb/?a=commitdiff_plain;h=b01778752f699303762e2307867d462133ae2b1a;p=gnulib.git (adjust_blocks): Convert to a macro. The static function wasn't always used. --- diff --git a/lib/fsusage.c b/lib/fsusage.c index b43491343..8cc0c6d73 100644 --- a/lib/fsusage.c +++ b/lib/fsusage.c @@ -56,18 +56,14 @@ int statvfs (); /* Return the number of TOSIZE-byte blocks used by BLOCKS FROMSIZE-byte blocks, rounding up. */ -static long -adjust_blocks (blocks, fromsize, tosize) - long blocks; - int fromsize, tosize; -{ - 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 + 1) / (tosize / fromsize); -} +#define adjust_blocks(blocks, fromsize, tosize) \ + (((fromsize) == (tosize)) \ + ? (blocks) /* E.g., from 512 to 512. */ \ + : (((fromsize) > (tosize)) \ + /* E.g., from 2048 to 512. */ \ + ? (blocks) * ((fromsize) / (tosize)) \ + /* E.g., from 256 to 512. */ \ + : ((blocks) + 1) / ((tosize) / (fromsize)))) /* Fill in the fields of FSP with information about space usage for the filesystem on which PATH resides.