|
From: Yuval <uv...@de...> - 2006-10-27 12:25:03
|
Changes by: uvman
Update of /cvs/linux-ntfs/ntfsprogs/ntfsprogs
In directory delta357:/tmp/cvs-serv10841/ntfsprogs
Modified Files:
mkntfs.c ntfsclone.c ntfscmp.c ntfsinfo.c ntfsresize.c
Log Message:
Whitespace cleanup
Index: mkntfs.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/ntfsprogs/mkntfs.c,v
retrieving revision 1.149
retrieving revision 1.150
diff -u -p -r1.149 -r1.150
--- mkntfs.c 20 Oct 2006 19:55:50 -0000 1.149
+++ mkntfs.c 27 Oct 2006 12:24:30 -0000 1.150
@@ -2861,7 +2861,7 @@ static int initialize_quota(MFT_RECORD *
INDEX_ENTRY *idx_entry_o, *idx_entry_q1, *idx_entry_q2;
QUOTA_O_INDEX_DATA *idx_entry_o_data;
QUOTA_CONTROL_ENTRY *idx_entry_q1_data, *idx_entry_q2_data;
-
+
err = 0;
/* q index entry num 1 */
q1_size = 0x48;
@@ -3790,7 +3790,7 @@ static BOOL mkntfs_initialize_bitmaps(vo
g_rl_mft_bmp = ntfs_malloc(2 * sizeof(runlist));
if (!g_rl_mft_bmp)
return FALSE;
-
+
g_rl_mft_bmp[0].vcn = 0LL;
/* Mft bitmap is right after $Boot's data. */
i = (8192 + g_vol->cluster_size - 1) / g_vol->cluster_size;
@@ -3855,7 +3855,7 @@ static BOOL mkntfs_initialize_rl_mft(voi
g_rl_mft = ntfs_malloc(2 * sizeof(runlist));
if (!g_rl_mft)
return FALSE;
-
+
g_rl_mft[0].vcn = 0LL;
g_rl_mft[0].lcn = g_mft_lcn;
/* rounded up division by cluster size */
@@ -3876,7 +3876,7 @@ static BOOL mkntfs_initialize_rl_mft(voi
g_rl_mftmirr = ntfs_malloc(2 * sizeof(runlist));
if (!g_rl_mftmirr)
return FALSE;
-
+
g_rl_mftmirr[0].vcn = 0LL;
g_rl_mftmirr[0].lcn = g_mftmirr_lcn;
/*
@@ -3912,7 +3912,7 @@ static BOOL mkntfs_initialize_rl_logfile
g_rl_logfile = ntfs_malloc(2 * sizeof(runlist));
if (!g_rl_logfile)
return FALSE;
-
+
volume_size = g_vol->nr_clusters << g_vol->cluster_size_bits;
@@ -3935,7 +3935,7 @@ static BOOL mkntfs_initialize_rl_logfile
g_logfile_size = (volume_size / 100) &
~(g_vol->cluster_size - 1);
} else {
- /*
+ /*
* FIXME: The $LogFile size is 64 MiB upwards from 12GiB but
* the "200" divider below apparently approximates "100" or
* some other value as the volume size decreases. For example:
@@ -3996,7 +3996,7 @@ static BOOL mkntfs_initialize_rl_boot(vo
g_rl_boot = ntfs_malloc(2 * sizeof(runlist));
if (!g_rl_boot)
return FALSE;
-
+
g_rl_boot[0].vcn = 0LL;
g_rl_boot[0].lcn = 0LL;
/*
@@ -4023,7 +4023,7 @@ static BOOL mkntfs_initialize_rl_bad(voi
g_rl_bad = ntfs_malloc(2 * sizeof(runlist));
if (!g_rl_bad)
return FALSE;
-
+
g_rl_bad[0].vcn = 0LL;
g_rl_bad[0].lcn = -1LL;
/*
@@ -4498,7 +4498,7 @@ static BOOL mkntfs_create_root_structure
buf_log = ntfs_malloc(g_logfile_size);
if (!buf_log)
return FALSE;
-
+
memset(buf_log, -1, g_logfile_size);
err = add_attr_data_positioned(m, NULL, 0, 0, 0, g_rl_logfile, buf_log,
g_logfile_size);
@@ -4969,7 +4969,7 @@ static int mkntfs_redirect(struct mkntfs
g_vol->upcase = ntfs_malloc(g_vol->upcase_len * sizeof(ntfschar));
if (!g_vol->upcase)
goto done;
-
+
init_upcase_table(g_vol->upcase, g_vol->upcase_len * sizeof(ntfschar));
if (g_vol->major_ver < 3) {
g_vol->attrdef = ntfs_calloc(36000);
Index: ntfsclone.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/ntfsprogs/ntfsclone.c,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -p -r1.91 -r1.92
--- ntfsclone.c 18 Oct 2006 14:41:41 -0000 1.91
+++ ntfsclone.c 27 Oct 2006 12:24:30 -0000 1.92
@@ -755,9 +755,9 @@ static void wipe_index_entry_timestams(I
e->key.file_name.last_data_change_time = timestamp;
e->key.file_name.last_mft_change_time = timestamp;
e->key.file_name.last_access_time = timestamp;
-
+
wiped_timestamp_data += 32;
-
+
e = (INDEX_ENTRY *)((u8 *)e + le16_to_cpu(e->length));
}
}
@@ -785,7 +785,7 @@ static void wipe_index_allocation_timest
name = (ntfschar *)((u8 *)attr + le16_to_cpu(attr->name_offset));
name_len = attr->name_length;
-
+
byte = bitmap = ntfs_attr_readall(ni, AT_BITMAP, name, name_len, NULL);
if (!byte) {
perr_printf("Failed to read $BITMAP attribute");
@@ -812,7 +812,7 @@ static void wipe_index_allocation_timest
bit = 0;
while ((u8 *)tmp_indexa < (u8 *)indexa + na->data_size) {
- if (*byte & (1 << bit)) {
+ if (*byte & (1 << bit)) {
if (ntfs_mst_post_read_fixup((NTFS_RECORD *)tmp_indexa,
le32_to_cpu(
indexr->index_block_size))) {
@@ -834,7 +834,7 @@ static void wipe_index_allocation_timest
goto out_indexa;
}
}
- tmp_indexa = (INDEX_ALLOCATION *)((u8 *)tmp_indexa +
+ tmp_indexa = (INDEX_ALLOCATION *)((u8 *)tmp_indexa +
le32_to_cpu(indexr->index_block_size));
bit++;
if (bit > 7) {
@@ -842,7 +842,7 @@ static void wipe_index_allocation_timest
byte++;
}
}
-
+
if (ntfs_rl_pwrite(vol, na->rl, 0, na->data_size, indexa) != na->data_size)
perr_printf("ntfs_rl_pwrite failed for inode %lld", ni->mft_no);
out_indexa:
@@ -924,7 +924,7 @@ static void wipe_timestamps(ntfs_walk_cl
else if (a->type == AT_STANDARD_INFORMATION)
WIPE_TIMESTAMPS(STANDARD_INFORMATION, a, timestamp);
-
+
else if (a->type == AT_INDEX_ROOT)
wipe_index_root_timestamps(a, timestamp);
}
@@ -1168,7 +1168,7 @@ static void mft_record_write_with_same_u
{
if (ntfs_mft_usn_dec(ni->mrec))
perr_exit("ntfs_mft_usn_dec");
-
+
if (ntfs_mft_record_write(volume, ni->mft_no, ni->mrec))
perr_exit("ntfs_mft_record_write");
}
@@ -1176,12 +1176,12 @@ static void mft_record_write_with_same_u
static void mft_inode_write_with_same_usn(ntfs_volume *volume, ntfs_inode *ni)
{
s32 i;
-
+
mft_record_write_with_same_usn(volume, ni);
-
+
if (ni->nr_extents <= 0)
return;
-
+
for (i = 0; i < ni->nr_extents; ++i) {
ntfs_inode *eni = ni->extent_nis[i];
mft_record_write_with_same_usn(volume, eni);
@@ -1719,7 +1719,7 @@ static void check_dest_free_space(u64 sr
if (opt.metadata || opt.blkdev_out || opt.std_out)
return;
- /*
+ /*
* TODO: save_image needs a bit more space than src_bytes
* due to the free space encoding overhead.
*/
@@ -1732,7 +1732,7 @@ static void check_dest_free_space(u64 sr
dest_bytes = (u64)stvfs.f_frsize * stvfs.f_bfree;
if (!dest_bytes)
dest_bytes = (u64)stvfs.f_bsize * stvfs.f_bfree;
-
+
if (dest_bytes < src_bytes)
err_exit("Destination doesn't have enough free space: "
"%llu MB < %llu MB\n",
Index: ntfscmp.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/ntfsprogs/ntfscmp.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- ntfscmp.c 18 Oct 2006 14:41:41 -0000 1.19
+++ ntfscmp.c 27 Oct 2006 12:24:30 -0000 1.20
@@ -496,7 +496,7 @@ static int setup_cmp_ia(ntfs_attr *na, s
perr_println("Failed to readall BITMAP");
return -1;
}
- cia->byte = cia->bitmap;
+ cia->byte = cia->bitmap;
cia->tmp_ia = cia->ia = ntfs_malloc(na->data_size);
if (!cia->tmp_ia)
@@ -506,7 +506,7 @@ static int setup_cmp_ia(ntfs_attr *na, s
perr_println("Failed to pread INDEX_ALLOCATION");
goto free_ia;
}
-
+
return 0;
free_ia:
free(cia->ia);
@@ -520,28 +520,28 @@ static void cmp_index_allocation(ntfs_at
struct cmp_ia cia1, cia2;
int bit, ret1, ret2;
u32 ib_size;
-
+
if (setup_cmp_ia(na1, &cia1))
return;
if (setup_cmp_ia(na2, &cia2))
return;
- /*
+ /*
* FIXME: ia can be the same even if the bitmap sizes are different.
*/
if (cia1.bm_size != cia1.bm_size)
goto out;
-
+
if (cmp_buffer(cia1.bitmap, cia2.bitmap, cia1.bm_size, na1))
goto out;
-
+
if (cmp_buffer((u8 *)cia1.ia, (u8 *)cia2.ia, 0x18, na1))
goto out;
ib_size = cia1.ia->index.allocated_size + 0x18;
-
+
bit = 0;
while ((u8 *)cia1.tmp_ia < (u8 *)cia1.ia + na1->data_size) {
- if (*cia1.byte & (1 << bit)) {
+ if (*cia1.byte & (1 << bit)) {
ret1 = ntfs_mst_post_read_fixup((NTFS_RECORD *)cia1.tmp_ia,
ib_size);
ret2 = ntfs_mst_post_read_fixup((NTFS_RECORD *)cia2.tmp_ia,
@@ -550,19 +550,19 @@ static void cmp_index_allocation(ntfs_at
print_differ(na1);
goto out;
}
-
+
if (ret1 == -1)
continue;
-
- if (cmp_buffer(((u8 *)cia1.tmp_ia) + 0x18,
+
+ if (cmp_buffer(((u8 *)cia1.tmp_ia) + 0x18,
((u8 *)cia2.tmp_ia) + 0x18,
cia1.ia->index.index_length, na1))
goto out;
}
-
+
cia1.tmp_ia = (INDEX_ALLOCATION *)((u8 *)cia1.tmp_ia + ib_size);
cia2.tmp_ia = (INDEX_ALLOCATION *)((u8 *)cia2.tmp_ia + ib_size);
-
+
bit++;
if (bit > 7) {
bit = 0;
@@ -615,7 +615,7 @@ static void cmp_attribute_data(ntfs_attr
printf("%lld != %lld\n", pos + count1, na1->data_size);
exit(1);
}
-
+
if (cmp_buffer(buf1, buf2, count1, na1))
return;
}
Index: ntfsinfo.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/ntfsprogs/ntfsinfo.c,v
retrieving revision 1.148
retrieving revision 1.149
diff -u -p -r1.148 -r1.149
--- ntfsinfo.c 16 Aug 2006 09:24:19 -0000 1.148
+++ ntfsinfo.c 27 Oct 2006 12:24:30 -0000 1.149
@@ -617,7 +617,7 @@ static void ntfs_dump_attr_standard_info
(unsigned)value_length);
}
}
-
+
static void ntfs_dump_bytes(u8 *buf, int start, int stop)
{
int i;
@@ -647,7 +647,7 @@ static void ntfs_dump_attr_list(ATTR_REC
value = ntfs_malloc(l);
if (!value)
return;
-
+
l = ntfs_get_attribute_value(vol, attr, value);
if (!l) {
ntfs_log_perror("ntfs_get_attribute_value failed");
@@ -698,7 +698,7 @@ static void ntfs_dump_attr_list(ATTR_REC
} else
printf("unnamed\n");
printf("\t\tPadding:\t");
- ntfs_dump_bytes((u8 *)entry, entry->name_offset +
+ ntfs_dump_bytes((u8 *)entry, entry->name_offset +
sizeof(ntfschar) * entry->name_length,
le16_to_cpu(entry->length));
printf("\n");
@@ -864,7 +864,7 @@ static void ntfs_dump_acl(const char *pr
printf("%sRevision\t %u\n", prefix, acl->revision);
- /*
+ /*
* Do not recalculate le16_to_cpu every iteration (minor speedup on
* big-endian machines.
*/
@@ -913,7 +913,7 @@ static void ntfs_dump_security_descripto
const char *indent)
{
char *sid;
-
+
printf("%s\tRevision:\t\t %u\n", indent, sec_desc->revision);
/* TODO: parse the flags */
@@ -921,17 +921,16 @@ static void ntfs_dump_security_descripto
le16_to_cpu(sec_desc->control));
if (~sec_desc->control & SE_SELF_RELATIVE) {
-
SECURITY_DESCRIPTOR *sd = (SECURITY_DESCRIPTOR *)sec_desc;
-
+
printf("%s\tOwner SID pointer:\t %p\n", indent, sd->owner);
printf("%s\tGroup SID pointer:\t %p\n", indent, sd->group);
printf("%s\tSACL pointer:\t\t %p\n", indent, sd->sacl);
printf("%s\tDACL pointer:\t\t %p\n", indent, sd->dacl);
-
+
return;
}
-
+
if (sec_desc->owner) {
sid = ntfs_sid_to_mbs((SID *)((char *)sec_desc +
le32_to_cpu(sec_desc->owner)), NULL, 0);
@@ -1017,8 +1016,8 @@ static void ntfs_dump_attr_security_desc
}
ntfs_dump_security_descriptor(sec_desc_attr, "");
-
- if (attr->non_resident)
+
+ if (attr->non_resident)
free(sec_desc_attr);
}
@@ -1099,7 +1098,7 @@ static void ntfs_dump_attr_volume_inform
}
static ntfschar NTFS_DATA_SDS[5] = { const_cpu_to_le16('$'),
- const_cpu_to_le16('S'), const_cpu_to_le16('D'),
+ const_cpu_to_le16('S'), const_cpu_to_le16('D'),
const_cpu_to_le16('S'), const_cpu_to_le16('\0') };
static void ntfs_dump_sds_entry(SECURITY_DESCRIPTOR_HEADER *sds)
@@ -1117,10 +1116,10 @@ static void ntfs_dump_sds_entry(SECURITY
ntfs_log_verbose("\t\tLength:\t\t\t %u (0x%x)\n",
(unsigned)le32_to_cpu(sds->length),
(unsigned)le32_to_cpu(sds->length));
-
+
sd = (SECURITY_DESCRIPTOR_RELATIVE *)((char *)sds +
sizeof(SECURITY_DESCRIPTOR_HEADER));
-
+
ntfs_dump_security_descriptor(sd, "\t");
}
@@ -1131,22 +1130,22 @@ static void ntfs_dump_sds(ATTR_RECORD *a
int name_len;
s64 data_size;
u64 inode;
-
+
inode = ni->mft_no;
if (ni->nr_extents < 0)
inode = ni->base_ni->mft_no;
if (FILE_Secure != inode)
return;
-
+
name_len = attr->name_length;
if (!name_len)
return;
-
+
name = (ntfschar *)((u8 *)attr + le16_to_cpu(attr->name_offset));
if (!ntfs_names_are_equal(NTFS_DATA_SDS, sizeof(NTFS_DATA_SDS) / 2 - 1,
name, name_len, 0, NULL, 0))
return;
-
+
sd = sds = ntfs_attr_readall(ni, AT_DATA, name, name_len, &data_size);
if (!sd) {
ntfs_log_perror("Failed to read $SDS attribute");
@@ -1156,10 +1155,10 @@ static void ntfs_dump_sds(ATTR_RECORD *a
* FIXME: The right way is based on the indexes, so we couldn't
* miss real entries. For now, dump until it makes sense.
*/
- while (sd->length && sd->hash &&
+ while (sd->length && sd->hash &&
le64_to_cpu(sd->offset) < (u64)data_size &&
le32_to_cpu(sd->length) < (u64)data_size &&
- le64_to_cpu(sd->offset) +
+ le64_to_cpu(sd->offset) +
le32_to_cpu(sd->length) < (u64)data_size) {
ntfs_dump_sds_entry(sd);
sd = (SECURITY_DESCRIPTOR_HEADER *)((char*)sd +
@@ -1193,10 +1192,10 @@ static const char *get_attribute_type_na
return "$UNKNOWN";
}
-
+
static void ntfs_dump_attribute_header(ATTR_RECORD *a, ntfs_volume *vol)
{
- printf("Dumping attribute %s (0x%x)\n",
+ printf("Dumping attribute %s (0x%x)\n",
get_attribute_type_name(a->type),
(unsigned)le32_to_cpu(a->type));
@@ -1274,7 +1273,7 @@ static void ntfs_dump_attribute_header(A
sle64_to_cpu(a->initialized_size));
if (a->compression_unit || a->flags & ATTR_IS_COMPRESSED ||
a->flags & ATTR_IS_SPARSE)
- printf("\tCompressed size:\t %llu (0x%llx)\n",
+ printf("\tCompressed size:\t %llu (0x%llx)\n",
(signed long long)
sle64_to_cpu(a->compressed_size),
(signed long long)
@@ -1324,7 +1323,7 @@ static void ntfs_dump_index_key(INDEX_EN
{
char *sid;
char printable_GUID[37];
-
+
switch (type) {
case INDEX_ATTR_SECURE_SII:
ntfs_log_verbose("\t\tKey security id:\t %u (0x%x)\n",
@@ -1382,9 +1381,9 @@ typedef union {
static void ntfs_dump_index_data(INDEX_ENTRY *entry, INDEX_ATTR_TYPE type)
{
INDEX_ENTRY_DATA *data;
-
+
data = (INDEX_ENTRY_DATA *)((u8 *)entry + entry->data_offset);
-
+
switch (type) {
case INDEX_ATTR_SECURE_SII:
ntfs_log_verbose("\t\tHash:\t\t\t 0x%08x\n",
@@ -1580,7 +1579,7 @@ static INDEX_ATTR_TYPE get_index_attr_ty
if (!attr->name_length)
return INDEX_ATTR_UNKNOWN;
-
+
if (index_root->type) {
if (index_root->type == AT_FILE_NAME)
return INDEX_ATTR_DIRECTORY_I30;
@@ -1590,12 +1589,12 @@ static INDEX_ATTR_TYPE get_index_attr_ty
index_root->type);
return INDEX_ATTR_UNKNOWN;
}
-
+
if (utils_is_metadata(ni) <= 0)
return INDEX_ATTR_UNKNOWN;
if (utils_inode_get_name(ni, file_name, sizeof(file_name)) <= 0)
return INDEX_ATTR_UNKNOWN;
-
+
if (COMPARE_INDEX_NAMES(attr, NTFS_INDEX_SDH))
return INDEX_ATTR_SECURE_SDH;
else if (COMPARE_INDEX_NAMES(attr, NTFS_INDEX_SII))
@@ -1612,7 +1611,7 @@ static INDEX_ATTR_TYPE get_index_attr_ty
else if (!strcmp(file_name, "/$Extend/$ObjId"))
return INDEX_ATTR_OBJID_O;
}
-
+
return INDEX_ATTR_UNKNOWN;
}
@@ -1649,7 +1648,7 @@ static void ntfs_dump_index_header(const
(unsigned)le32_to_cpu(idx->allocated_size),
(unsigned)le32_to_cpu(idx->allocated_size));
printf("%sIndex header flags:\t 0x%02x\n", indent, idx->flags);
-
+
/* FIXME: there are 3 reserved bytes here */
}
@@ -1670,7 +1669,7 @@ static void ntfs_dump_attr_index_root(AT
type = get_index_attr_type(ni, attr, index_root);
printf("\tIndexed Attr Type:\t ");
ntfs_dump_index_attr_type(type);
-
+
/* collation rule dumping */
printf("\tCollation Rule:\t\t %u (0x%x)\n",
(unsigned)le32_to_cpu(index_root->collation_rule),
@@ -1717,7 +1716,7 @@ static s32 ntfs_dump_index_block(INDEX_B
u32 ib_size)
{
INDEX_ENTRY *entry;
-
+
if (ntfs_mst_post_read_fixup((NTFS_RECORD*)ib, ib_size)) {
ntfs_log_perror("Damaged INDX record");
return -1;
@@ -1729,15 +1728,15 @@ static s32 ntfs_dump_index_block(INDEX_B
ntfs_log_verbose("\t\tNode VCN:\t\t %lld (0x%llx)\n",
(unsigned long long)sle64_to_cpu(ib->index_block_vcn),
(unsigned long long)sle64_to_cpu(ib->index_block_vcn));
-
- entry = (INDEX_ENTRY*)((u8*)ib +
+
+ entry = (INDEX_ENTRY*)((u8*)ib +
le32_to_cpu(ib->index.entries_offset) + 0x18);
-
+
if (opts.verbose) {
ntfs_dump_index_header("\t\t", &ib->index);
printf("\n");
}
-
+
return ntfs_dump_index_entries(entry, type);
}
@@ -1764,19 +1763,19 @@ static void ntfs_dump_attr_index_allocat
ntfs_log_perror("Failed to read $INDEX_ROOT attribute");
return;
}
-
+
type = get_index_attr_type(ni, attr, ir);
-
+
name = (ntfschar *)((u8 *)attr + le16_to_cpu(attr->name_offset));
name_len = attr->name_length;
-
+
byte = bitmap = ntfs_attr_readall(ni, AT_BITMAP, name, name_len, NULL);
if (!byte) {
ntfs_log_perror("Failed to read $BITMAP attribute");
goto out_index_root;
}
- tmp_alloc = allocation = ntfs_attr_readall(ni, AT_INDEX_ALLOCATION,
+ tmp_alloc = allocation = ntfs_attr_readall(ni, AT_INDEX_ALLOCATION,
name, name_len, &data_size);
if (!tmp_alloc) {
ntfs_log_perror("Failed to read $INDEX_ALLOCATION attribute");
@@ -1787,7 +1786,7 @@ static void ntfs_dump_attr_index_allocat
while ((u8 *)tmp_alloc < (u8 *)allocation + data_size) {
if (*byte & (1 << bit)) {
int entries;
-
+
entries = ntfs_dump_index_block(tmp_alloc, type,
le32_to_cpu(
ir->index_block_size));
@@ -1797,7 +1796,7 @@ static void ntfs_dump_attr_index_allocat
printf("\tIndex entries:\t\t %d\n", entries);
}
}
- tmp_alloc = (INDEX_ALLOCATION *)((u8 *)tmp_alloc +
+ tmp_alloc = (INDEX_ALLOCATION *)((u8 *)tmp_alloc +
le32_to_cpu(
ir->index_block_size));
bit++;
@@ -1809,7 +1808,7 @@ static void ntfs_dump_attr_index_allocat
printf("\tIndex entries total:\t %d\n", total_entries);
printf("\tINDX blocks total:\t %d\n", total_indx_blocks);
-
+
free(allocation);
out_bitmap:
free(bitmap);
@@ -2083,9 +2082,9 @@ static void ntfs_dump_inode_general_info
printf("Next Attribute Instance: %u (0x%x)\n",
(unsigned)le16_to_cpu(mrec->next_attr_instance),
(unsigned)le16_to_cpu(mrec->next_attr_instance));
-
+
printf("MFT Padding:\t");
- ntfs_dump_bytes((u8 *)mrec, le16_to_cpu(mrec->usa_ofs) +
+ ntfs_dump_bytes((u8 *)mrec, le16_to_cpu(mrec->usa_ofs) +
2 * le16_to_cpu(mrec->usa_count),
le16_to_cpu(mrec->attrs_offset));
printf("\n");
@@ -2102,7 +2101,6 @@ static void ntfs_dump_file_attributes(nt
see ntfs_attr_lookup documentation for detailed explanation */
ctx = ntfs_attr_get_search_ctx(inode, NULL);
while (!ntfs_attr_lookup(AT_UNUSED, NULL, 0, 0, 0, NULL, 0, ctx)) {
-
if (ctx->attr->type == AT_END || ctx->attr->type == AT_UNUSED) {
printf("Weird: %s attribute type was found, please "
"report this.\n",
@@ -2110,9 +2108,9 @@ static void ntfs_dump_file_attributes(nt
ctx->attr->type));
continue;
}
-
+
ntfs_dump_attribute_header(ctx->attr, inode->vol);
-
+
switch (ctx->attr->type) {
case AT_STANDARD_INFORMATION:
ntfs_dump_attr_standard_information(ctx->attr);
@@ -2194,7 +2192,7 @@ int main(int argc, char **argv)
ntfs_volume *vol;
setlinebuf(stdout);
-
+
ntfs_log_set_handler(ntfs_log_handler_outerr);
if (!parse_options(argc, argv)) {
Index: ntfsresize.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/ntfsprogs/ntfsresize.c,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -p -r1.121 -r1.122
--- ntfsresize.c 18 Oct 2006 14:43:04 -0000 1.121
+++ ntfsresize.c 27 Oct 2006 12:24:30 -0000 1.122
@@ -2028,7 +2028,7 @@ static int check_bad_sectors(ntfs_volume
if (!ctx->attr->non_resident)
err_exit("Resident attribute in $BadClust! Please report to "
"%s\n", NTFS_DEV_LIST);
- /*
+ /*
* FIXME: The below would be partial for non-base records in the
* not yet supported multi-record case. Alternatively use audited
* ntfs_attr_truncate after an umount & mount.
|
