[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs ntfsundelete.c,1.53,1.54

[Richard R. <fl...@us...>]

Changes by: flatcap

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

Modified Files:
	ntfsundelete.c 
Log Message:
upgrade to use new logging
change stderror messages to ntfs_log_perror

Index: ntfsundelete.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsundelete.c,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -p -r1.53 -r1.54
--- ntfsundelete.c	28 Oct 2005 12:55:42 -0000	1.53
+++ ntfsundelete.c	28 Oct 2005 18:15:24 -0000	1.54
@@ -84,6 +84,7 @@
 #include "debug.h"
 #include "ntfstime.h"
 #include "version.h"
+#include "logging.h"
 
 static const char *EXEC_NAME = "ntfsundelete";
 static const char *MFTFILE   = "mft";
@@ -100,13 +101,9 @@ typedef struct
 
 static short	with_regex;			/* Flag  Regular expression available */
 static short	avoid_duplicate_printing;	/* Flag  No duplicate printing of file infos */
[...1006 lines suppressed...]
 	case MODE_SCAN:
 		result = !scan_disk(vol);
 		if (result)
-			Vprintf("ERROR: Failed to scan device '%s'.\n", opts.device);
+			ntfs_log_verbose("ERROR: Failed to scan device '%s'.\n",
+				opts.device);
 		break;
 
 	/* Undelete-handling */
@@ -2123,8 +2145,8 @@ int main(int argc, char *argv[])
 	case MODE_COPY:
 		result = !copy_mft(vol, opts.mft_begin, opts.mft_end);
 		if (result)
-			Vprintf("ERROR: Failed to read MFT blocks %lld-%lld.\n",
-				opts.mft_begin,
+			ntfs_log_verbose("ERROR: Failed to read MFT blocks "
+				"%lld-%lld.\n", opts.mft_begin,
 				min((vol->mft_na->initialized_size >>
 				vol->mft_record_size_bits) , opts.mft_end));
 		break;