[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs ntfsinfo.c,1.125,1.126

[Anton A. <ai...@de...>]

Changes by: aia21

Update of /cvs/linux-ntfs/ntfsprogs/ntfsprogs
In directory delta357.server4you.de:/tmp/cvs-serv6382/ntfsprogs

Modified Files:
	ntfsinfo.c 
Log Message:
- Fix STUPID vcn printing bug in ntfsinfo that waster over 18 hours of my life
  trying to debug the ntfs driver when it was ntfsinfo that was wrong. )))-:

- Switch vcn output in index listings to show the vcn in hex not decimal.

- Show index block flags for each index block.


Index: ntfsinfo.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/ntfsprogs/ntfsinfo.c,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -p -r1.125 -r1.126
--- ntfsinfo.c	23 Apr 2006 11:01:07 -0000	1.125
+++ ntfsinfo.c	20 May 2006 21:27:15 -0000	1.126
@@ -1364,8 +1364,8 @@ static int ntfs_dump_index_entries(INDEX
 			le16_to_cpu(entry->flags));
 
 		if (entry->flags & INDEX_ENTRY_NODE)
-			ntfs_log_verbose("\t\tSubnode VCN:\t\t %lld\n",
-				le64_to_cpu(*((u8*)entry +
+			ntfs_log_verbose("\t\tSubnode VCN:\t\t 0x%llx\n",
+				sle64_to_cpu(*(VCN*)((u8*)entry +
 				le16_to_cpu(entry->length) - sizeof(VCN))));
 		if (entry->flags & INDEX_ENTRY_END)
 			break;
@@ -1575,13 +1575,14 @@ static void ntfs_dump_attr_index_allocat
 			}
 			entry = (INDEX_ENTRY *)((u8 *)tmp_alloc + le32_to_cpu(
 				tmp_alloc->index.entries_offset) + 0x18);
-			ntfs_log_verbose("\tDumping index block (VCN %lld, "
-					"used %u/%u):\n", le64_to_cpu(
-					tmp_alloc->index_block_vcn),
+			ntfs_log_verbose("\tDumping index block (VCN 0x%llx, "
+					"used %u/%u, flags 0x%02x):\n",
+					le64_to_cpu(tmp_alloc->index_block_vcn),
 					(unsigned int)le32_to_cpu(tmp_alloc->
 					index.index_length), (unsigned int)
 					le32_to_cpu(tmp_alloc->index.
-					allocated_size));
+					allocated_size),
+					tmp_alloc->index.flags);
 			if (opts.verbose) {
 				ntfs_dump_usa_lsn("\t\t", 
 						  (MFT_RECORD *)tmp_alloc);