[Linux-NTFS-cvs] CVS: linux-ntfs/ntfstools ntfsresize.c,1.15,1.16

[? <sz...@us...>]

Changes by: szaka

Update of /cvsroot/linux-ntfs/linux-ntfs/ntfstools
In directory usw-pr-cvs1:/tmp/cvs-serv27309/ntfstools

Modified Files:
	ntfsresize.c 
Log Message:
Minor code refactoring


Index: ntfsresize.c
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/ntfstools/ntfsresize.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -U2 -r1.15 -r1.16
--- ntfsresize.c	15 Jul 2002 16:41:48 -0000	1.15
+++ ntfsresize.c	16 Jul 2002 10:17:05 -0000	1.16
@@ -612,12 +612,7 @@
 
 
-int main(int argc, char **argv)
+void mount_volume()
 {
-	struct bitmap on_disk_lcn_bitmap;
 	unsigned long mntflag;
-	s64 new_volume_size;	/* in clusters */
-	int i;
-
-	parse_options(argc, argv);
 
 	if (ntfs_check_if_mounted(opt.volume, &mntflag))
@@ -643,8 +638,40 @@
 	printf("NTFS volume version: %d.%d\n", vol->major_ver, vol->minor_ver);
 	if (ntfs_is_version_supported(vol))
-                perr_exit("Unknown NTFS version"); 
+		perr_exit("Unknown NTFS version"); 
 
 	printf("Cluster size       : %u\n", vol->cluster_size);
 	printf("Number of clusters : %lld\n", vol->nr_clusters);
+}
+
+
+void prepare_volume_fixup()
+{
+	if (!opt.ro_flag) {
+		u16 flags;
+		
+		flags = vol->flags | VOLUME_IS_DIRTY;
+		if (vol->major_ver >= 2)
+			flags |= VOLUME_MOUNTED_ON_NT4;
+		
+		printf("Setting NTFS $Volume flag dirty ...\n");
+		if (ntfs_set_volume_flags(vol, flags))
+			perr_exit("Failed to set $Volume dirty");
+
+		printf("Resetting $LogFile ...\n");
+		if (ntfs_reset_logfile(vol))
+			perr_exit("Failed to reset $LogFile");
+	}
+}
+
+
+int main(int argc, char **argv)
+{
+	struct bitmap on_disk_lcn_bitmap;
+	s64 new_volume_size;	/* in clusters */
+	int i;
+
+	parse_options(argc, argv);
+	
+	mount_volume();
 
 	setup_lcn_bitmap();
@@ -678,19 +705,5 @@
 	/* FIXME: first do all checks before any write attempt */
 
-	if (!opt.ro_flag) {
-		u16 flags;
-		
-		flags = vol->flags | VOLUME_IS_DIRTY;
-		if (vol->major_ver >= 2)
-			flags |= VOLUME_MOUNTED_ON_NT4;
-		
-		printf("Setting NTFS $Volume flag dirty ...\n");
-		if (ntfs_set_volume_flags(vol, flags))
-			perr_exit("Failed to set $Volume dirty");
-
-		printf("Resetting $LogFile ...\n");
-		if (ntfs_reset_logfile(vol))
-			perr_exit("Failed to reset $LogFile");
-	}
+	prepare_volume_fixup();
 
 	truncate_badclust_file(new_volume_size);