opengnsys
/
ntfs-3g
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

prevent a few name clashes with the new rm code

edge.strict_endians
flatcap 2005-10-16 22:37:48 +00:00
parent bde3e0063b
commit 139f6c6603
3 changed files with 21 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ntfsprogs/cluster.c
View File

@ -36,10 +36,12 @@
#include "cluster.h"
#include "utils.h"
#define RED ""
#define YELLOW ""
#define GREEN ""
#define NORM ""
#if 0
#define RED "\e[31m"
#define YELLOW "\e[33m"
#define GREEN "\e[01;32m"
#define NORM "\e[0m"
#endif
/**
* cluster_find
@ -78,7 +80,8 @@ int cluster_find (ntfs_volume *vol, LCN c_begin, LCN c_end, cluster_cb *cb, void
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 (RED "Inode: %llu\n" NORM, (unsigned long long)
Qprintf ("Inode: %llu\n", (unsigned long long)
m_ctx->inode->mft_no);
if (!(m_ctx->flags_match & FEMR_BASE_RECORD))

17
ntfsprogs/ntfsmove.c
View File

@ -54,10 +54,12 @@ GEN_PRINTF (Eprintf, stderr, NULL, FALSE)
GEN_PRINTF (Vprintf, stdout, &opts.verbose, TRUE)
GEN_PRINTF (Qprintf, stdout, &opts.quiet, FALSE)
#define RED ""
#define YELLOW ""
#define GREEN ""
#define NORM ""
#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
@ -362,12 +364,12 @@ static int calc_attr_length (ATTR_RECORD *rec, int runlength)
static void dump_runs (u8 *buffer, int len)
{
int i;
printf ("RUN: ");
printf ("RUN: \e[01;31m");
for (i = 0; i < len; i++) {
printf (" %02x", buffer[i]);
}
printf ("\n");
printf ("\e[0m\n");
}
#endif /* if 0 */
@ -700,7 +702,8 @@ static s64 move_datarun (ntfs_volume *vol, ntfs_inode *ino, ATTR_RECORD *rec,
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 (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) {
if (resize_nonres_attr (ino->mrec, rec, need_to) < 0) {

6
ntfsprogs/utils.c
View File

@ -802,9 +802,9 @@ void utils_dump_mem (void *buf, int start, int length, int flags)
if (flags & DM_INDENT)
printf ("\t");
if (flags & DM_BOLD)
printf ("");
printf ("\e[01m");
if (flags & (DM_RED | DM_BLUE | DM_GREEN | DM_BOLD))
printf ("[%dm", col);
printf ("\e[%dm", col);
if (off == s)
printf("%6.6x ", start);
else
@ -830,7 +830,7 @@ void utils_dump_mem (void *buf, int start, int length, int flags)
}
}
if (flags & (DM_RED | DM_BLUE | DM_GREEN | DM_BOLD))
printf ("");
printf ("\e[0m");
printf ("\n");
}
}