[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs ntfsresize.c,1.80,1.81

[Szabolcs S. <sz...@us...>]

Changes by: szaka

Update of /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3677/ntfsprogs

Modified Files:
	ntfsresize.c 
Log Message:
Don't show detailed resizing related info by default since the only real
restriction to shrink to the smallest size possible is the relocation of
the first $MFT $DATA extent, usually around 3 GB.


Index: ntfsresize.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsresize.c,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -p -r1.80 -r1.81
--- ntfsresize.c	25 Jul 2005 20:40:07 -0000	1.80
+++ ntfsresize.c	25 Jul 2005 21:19:08 -0000	1.81
@@ -522,7 +522,7 @@ static int parse_options(int argc, char 
 	return (!err && !help && !ver);
 }
 
-static void __print_advise(ntfs_volume *vol, s64 supp_lcn)
+static void print_advise(ntfs_volume *vol, s64 supp_lcn)
 {
 	s64 old_b, new_b, freed_b, old_mb, new_mb, freed_mb;
 
@@ -556,11 +556,7 @@ static void __print_advise(ntfs_volume *
 	else
 	    printf("%lld bytes", (long long)freed_b);
 	printf(").\n");
-}
 
-static void print_advise(ntfs_volume *vol, s64 supp_lcn)
-{
-	__print_advise(vol, supp_lcn);
 	printf("Please make a test run using both the -n and -s options "
 	       "before real resizing!\n");
 }
@@ -1107,7 +1103,7 @@ static void set_resize_constraints(ntfs_
 	s64 nr_mft_records, inode;
 	ntfs_inode *ni;
 
-	printf("Collecting shrinkage constraints ...\n");
+	printf("Collecting resizing constraints ...\n");
 
 	nr_mft_records = resize->vol->mft_na->initialized_size >>
 			resize->vol->mft_record_size_bits;
@@ -1786,16 +1782,15 @@ static void advise_on_resize(ntfs_resize
 {
 	ntfs_volume *vol = resize->vol;
 
-	printf("Estimating smallest shrunken size supported ...\n");
-
-	printf("File feature         Last used at      By inode\n");
-	print_hint(vol, "$MFT", resize->last_mft);
-	print_hint(vol, "Multi-Record", resize->last_multi_mft);
 	if (opt.verbose) {
-		print_hint(vol, "$MFTMirr", resize->last_mftmir);
-		print_hint(vol, "Compressed", resize->last_compressed);
-		print_hint(vol, "Sparse", resize->last_sparse);
-		print_hint(vol, "Ordinary", resize->last_lcn);
+		printf("Estimating smallest shrunken size supported ...\n");
+		printf("File feature         Last used at      By inode\n");
+		print_hint(vol, "$MFT", 	resize->last_mft);
+		print_hint(vol, "Multi-Record", resize->last_multi_mft);
+		print_hint(vol, "$MFTMirr", 	resize->last_mftmir);
+		print_hint(vol, "Compressed", 	resize->last_compressed);
+		print_hint(vol, "Sparse", 	resize->last_sparse);
+		print_hint(vol, "Ordinary", 	resize->last_lcn);
 	}
 
 	print_advise(vol, resize->last_unsupp);