[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs ntfsresize.c,1.110,1.111

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

Changes by: szaka

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

Modified Files:
	ntfsresize.c 
Log Message:
Restructure "Filesystem check failed!" message and have a more explanatory 
one in the ERROR line because several front-ends show only this line, nothing 
else, which greatly confused many users what's going on and what to do next.


Index: ntfsresize.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsresize.c,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -p -r1.110 -r1.111
--- ntfsresize.c	11 Feb 2006 19:55:05 -0000	1.110
+++ ntfsresize.c	12 Feb 2006 22:09:58 -0000	1.111
@@ -91,9 +91,9 @@ static const char *invalid_ntfs_msg =
 "if the disk was incorrectly repartitioned (see the ntfsresize FAQ).\n";
 
 static const char *corrupt_volume_msg =
-"This software has detected that your NTFS is corrupted. Please run chkdsk /f\n"
-"on Windows then reboot it TWICE! Important, don't forget the /f parameter!\n"
-"Afterwards you can run ntfsresize. No modification was made to NTFS.\n";
+"NTFS is inconsistent. Run chkdsk /f on Windows then reboot it TWICE!\n"
+"The usage of the /f parameter is very IMPORTANT! No modification was\n"
+"and will be made to NTFS by this software until it gets repaired.\n";
 
 static const char *hibernated_volume_msg =
 "The NTFS partition is hibernated. Windows must be resumed and turned off\n"
@@ -974,9 +974,9 @@ static void compare_bitmaps(ntfs_volume 
 	}
 done:
 	if (mismatch) {
-		err_printf("Filesystem check failed! Totally %d cluster "
-			   "accounting mismatches.\n", mismatch);
-		printf("%s", corrupt_volume_msg);
+		printf("Filesystem check failed! Totally %d cluster "
+		       "accounting mismatches.\n", mismatch);
+		err_printf("%s", corrupt_volume_msg);
 		exit(1);
 	}
 }