Author: sobomax
Date: Tue Mar 9 19:31:08 2010
New Revision: 204919
URL: http://svn.freebsd.org/changeset/base/204919
Log:
o bdeficize expand_number_int() function;
o revert most of the recent changes (int -> int64_t conversion) by using
this functon for parsing all options.
Modified:
head/sbin/newfs/mkfs.c
head/sbin/newfs/newfs.c
head/sbin/newfs/newfs.h
Modified: head/sbin/newfs/mkfs.c
==
--- head/sbin/newfs/mkfs.c Tue Mar 9 19:19:07 2010(r204918)
+++ head/sbin/newfs/mkfs.c Tue Mar 9 19:31:08 2010(r204919)
@@ -191,8 +191,8 @@ restart:
exit(17);
}
if (sblock.fs_fsize < sectorsize) {
- printf("increasing fragment size from %d to sector size
(%jd)\n",
- sblock.fs_fsize, (intmax_t)sectorsize);
+ printf("increasing fragment size from %d to sector size (%d)\n",
+ sblock.fs_fsize, sectorsize);
sblock.fs_fsize = sectorsize;
}
if (sblock.fs_bsize > MAXBSIZE) {
@@ -337,8 +337,8 @@ restart:
} else if (density < minfragsperinode * fsize) {
origdensity = density;
density = minfragsperinode * fsize;
- fprintf(stderr, "density increased from %d to %jd\n",
- origdensity, (intmax_t)density);
+ fprintf(stderr, "density increased from %d to %d\n",
+ origdensity, density);
}
origdensity = density;
for (;;) {
@@ -346,9 +346,8 @@ restart:
if (fragsperinode < minfragsperinode) {
bsize <<= 1;
fsize <<= 1;
- printf("Block size too small for a file system %s
%jd\n",
- "of this size. Increasing blocksize to",
- (intmax_t)bsize);
+ printf("Block size too small for a file system %s %d\n",
+"of this size. Increasing blocksize to", bsize);
goto restart;
}
minfpg = fragsperinode * INOPB(&sblock);
@@ -372,8 +371,7 @@ restart:
density -= sblock.fs_fsize;
}
if (density != origdensity)
- printf("density reduced from %d to %jd\n", origdensity,
- (intmax_t)density);
+ printf("density reduced from %d to %d\n", origdensity, density);
/*
* Start packing more blocks into the cylinder group until
* it cannot grow any larger, the number of cylinder groups
Modified: head/sbin/newfs/newfs.c
==
--- head/sbin/newfs/newfs.c Tue Mar 9 19:19:07 2010(r204918)
+++ head/sbin/newfs/newfs.c Tue Mar 9 19:31:08 2010(r204919)
@@ -94,17 +94,17 @@ int nflag; /* do not create .snap dire
intmax_t fssize; /* file system size */
intsectorsize; /* bytes/sector */
intrealsectorsize; /* bytes/sector in hardware */
-int64_tfsize = 0; /* fragment size */
-int64_tbsize = 0; /* block size */
-int64_tmaxbsize = 0; /* maximum clustering */
-int64_tmaxblkspercg = MAXBLKSPERCG; /* maximum blocks per cylinder
group */
+intfsize = 0; /* fragment size */
+intbsize = 0; /* block size */
+intmaxbsize = 0; /* maximum clustering */
+intmaxblkspercg = MAXBLKSPERCG; /* maximum blocks per cylinder group */
intminfree = MINFREE; /* free space threshold */
intopt = DEFAULTOPT; /* optimization preference (space or time) */
-int64_tdensity;/* number of bytes per inode */
-int64_tmaxcontig = 0; /* max contiguous blocks to allocate */
-int64_tmaxbpg; /* maximum blocks per file in a cyl
group */
-int64_tavgfilesize = AVFILESIZ;/* expected average file size */
-int64_tavgfilesperdir = AFPDIR;/* expected number of files per
directory */
+intdensity;/* number of bytes per inode */
+intmaxcontig = 0; /* max contiguous blocks to allocate */
+intmaxbpg; /* maximum blocks per file in a cyl group */
+intavgfilesize = AVFILESIZ;/* expected average file size */
+intavgfilesperdir = AFPDIR;/* expected number of files per directory */
u_char *volumelabel = NULL;/* volume label for filesystem */
struct uufsd disk; /* libufs disk structure */
@@ -186,13 +186,13 @@ main(int argc, char *argv[])
Xflag++;
break;
case 'a':
- rval = expand_number(optarg, &maxcontig);
+ rval = expand_number_int(optarg, &maxcontig);
