d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Don't abuse caddr_t when what we really want is a void *.

Browse Source 
- Use the %jd format and a cast to intmax_t to print an int64_t.
- The return type of getopt() is an int, not a char.

This fixes some warnings but there's still much more work to do here.
This commit is contained in:
Maxime Henrion 2004-04-03 22:56:54 +00:00
parent 25128fcc8a
commit 760ea1fa63
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=127816
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sbin/growfs/growfs.c
View File

@ -230,9 +230,10 @@ growfs(int fsi, int fso, unsigned int Nflag)
* Dump out summary information about file system.
*/
# define B2MBFACTOR (1 / (1024.0 * 1024.0))
printf("growfs: %.1fMB (%qd sectors) block size %d, fragment size %d\n",
printf("growfs: %.1fMB (%jd sectors) block size %d, fragment size %d\n",
(float)sblock.fs_size * sblock.fs_fsize * B2MBFACTOR,
fsbtodb(&sblock, sblock.fs_size), sblock.fs_bsize, sblock.fs_fsize);
(intmax_t)fsbtodb(&sblock, sblock.fs_size), sblock.fs_bsize,
sblock.fs_fsize);
printf("\tusing %d cylinder groups of %.2fMB, %d blks, %d inodes.\n",
sblock.fs_ncg, (float)sblock.fs_fpg * sblock.fs_fsize * B2MBFACTOR,
sblock.fs_fpg / sblock.fs_frag, sblock.fs_ipg);
@ -366,7 +367,7 @@ static void
initcg(int cylno, time_t utime, int fso, unsigned int Nflag)
{
DBG_FUNC("initcg")
static caddr_t iobuf;
static void *iobuf;
long d, dlower, dupper, blkno, start;
ufs2_daddr_t i, cbase, dmax;
struct ufs1_dinode *dp1;
@ -1940,7 +1941,7 @@ main(int argc, char **argv)
{
DBG_FUNC("main")
char *device, *special, *cp;
char ch;
int ch;
unsigned int size=0;
size_t len;
unsigned int Nflag=0;