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.

1 files changed, 9 insertions, 9 deletions

diff --git a/sbin/newfs/newfs.h b/sbin/newfs/newfs.h
index d957e26..9da3226 100644
--- a/sbin/newfs/newfs.h
+++ b/sbin/newfs/newfs.h
@@ -88,17 +88,17 @@ extern int	nflag;		/* do not create .snap directory */
 extern intmax_t	fssize;		/* file system size */
 extern int	sectorsize;	/* bytes/sector */
 extern int	realsectorsize;	/* bytes/sector in hardware*/
-extern int64_t	fsize;		/* fragment size */
-extern int64_t	bsize;		/* block size */
-extern int64_t	maxbsize;	/* maximum clustering */
-extern int64_t	maxblkspercg;	/* maximum blocks per cylinder group */
+extern int	fsize;		/* fragment size */
+extern int	bsize;		/* block size */
+extern int	maxbsize;	/* maximum clustering */
+extern int	maxblkspercg;	/* maximum blocks per cylinder group */
 extern int	minfree;	/* free space threshold */
 extern int	opt;		/* optimization preference (space or time) */
-extern int64_t	density;	/* number of bytes per inode */
-extern int64_t	maxcontig;	/* max contiguous blocks to allocate */
-extern int64_t	maxbpg;		/* maximum blocks per file in a cyl group */
-extern int64_t	avgfilesize;	/* expected average file size */
-extern int64_t	avgfilesperdir;	/* expected number of files per directory */
+extern int	density;	/* number of bytes per inode */
+extern int	maxcontig;	/* max contiguous blocks to allocate */
+extern int	maxbpg;		/* maximum blocks per file in a cyl group */
+extern int	avgfilesize;	/* expected average file size */
+extern int	avgfilesperdir;	/* expected number of files per directory */
 extern u_char	*volumelabel;	/* volume label for filesystem */
 extern struct uufsd disk;	/* libufs disk structure */