[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs cluster.c,1.10,1.11 ntfsmove.c,1.19,1.20 ntfsundelete.c,1.51,1.52 utils.h,1.30,1.31

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

Changes by: flatcap

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

Modified Files:
	cluster.c ntfsmove.c ntfsundelete.c utils.h 
Log Message:
remove some colour hacks
remove a few #ifdef DEBUGs and RM_WRITEs
throw in lots of extra traces

Index: cluster.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/cluster.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- cluster.c	26 Oct 2005 22:54:57 -0000	1.10
+++ cluster.c	28 Oct 2005 04:32:21 -0000	1.11
@@ -36,13 +36,6 @@
 #include "cluster.h"
 #include "utils.h"
 
-#if 0
-#define RED	"\e[31m"
-#define YELLOW	"\e[33m"
-#define GREEN	"\e[01;32m"
-#define NORM	"\e[0m"
-#endif
-
 /**
  * cluster_find
  */
@@ -80,7 +73,6 @@ int cluster_find(ntfs_volume *vol, LCN c
 	m_ctx->flags_search = FEMR_IN_USE | FEMR_BASE_RECORD;
 
 	while (mft_next_record(m_ctx) == 0) {
-		//Qprintf(RED "Inode: %llu\n" NORM, (unsigned long long)
 		Qprintf("Inode: %llu\n", (unsigned long long)
 				m_ctx->inode->mft_no);
 

Index: ntfsmove.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsmove.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- ntfsmove.c	26 Oct 2005 22:54:57 -0000	1.19
+++ ntfsmove.c	28 Oct 2005 04:32:21 -0000	1.20
@@ -54,13 +54,6 @@ GEN_PRINTF(Eprintf, stderr, NULL,       
 GEN_PRINTF(Vprintf, stdout, &opts.verbose, TRUE)
 GEN_PRINTF(Qprintf, stdout, &opts.quiet,   FALSE)
 
-#if 0
-#define RED	"\e[31m"
-#define YELLOW	"\e[33m"
-#define GREEN	"\e[01;32m"
-#define NORM	"\e[0m"
-#endif
-
 /**
  * version - Print version information about the program
  *
@@ -702,7 +695,6 @@ static s64 move_datarun(ntfs_volume *vol
 	need_from = calc_attr_length(rec, need_from);
 	need_to   = calc_attr_length(rec, need_to);
 
-	//printf(RED "Before %d, after %d\n" NORM, need_from, need_to);
 	printf("Before %d, after %d\n", need_from, need_to);
 
 	if (need_from != need_to) {

Index: ntfsundelete.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsundelete.c,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -p -r1.51 -r1.52
--- ntfsundelete.c	26 Oct 2005 22:54:57 -0000	1.51
+++ ntfsundelete.c	28 Oct 2005 04:32:21 -0000	1.52
@@ -61,13 +61,17 @@
 #ifdef HAVE_LIMITS_H
 #include <limits.h>
 #endif
-#include <regex.h>
 #ifdef HAVE_STDARG_H
 #include <stdarg.h>
 #endif
 #ifdef HAVE_UTIME_H
 #include <utime.h>
 #endif
+#include <regex.h>
+
+#if !defined(REG_NOERROR) || (REG_NOERROR != 0)
+#define REG_NOERROR 0
+#endif
 
 #include "ntfsundelete.h"
 #include "bootsect.h"

Index: utils.h
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/utils.h,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- utils.h	26 Oct 2005 20:48:00 -0000	1.30
+++ utils.h	28 Oct 2005 04:32:21 -0000	1.31
@@ -37,16 +37,11 @@
 #ifdef HAVE_STDARG_H
 #include <stdarg.h>
 #endif
-//#include <regex.h>
 
 extern const char *ntfs_bugs;
 extern const char *ntfs_home;
 extern const char *ntfs_gpl;
 
-#if !defined(REG_NOERROR) || (REG_NOERROR != 0)
-#	define REG_NOERROR 0
-#endif
-
 #define	DEC_PRINTF(NAME)							\
 	int NAME(const char *format, ...)					\
 	__attribute__((format(printf, 1, 2)));