[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs ntfsinfo.c,1.96,1.97

[Szabolcs S. <sz...@us...>]

Changes by: szaka

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

Modified Files:
	ntfsinfo.c 
Log Message:
output cosmetic change; explicit check for /$Extend/$ObjId in get_index_attr_type()


Index: ntfsinfo.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsinfo.c,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -p -r1.96 -r1.97
--- ntfsinfo.c	11 Nov 2005 23:55:15 -0000	1.96
+++ ntfsinfo.c	12 Nov 2005 12:59:20 -0000	1.97
@@ -497,7 +497,7 @@ static void ntfs_dump_flags(ATTR_TYPES t
 		flags &= ~FILE_ATTR_VIEW_INDEX_PRESENT;
 	}
 	if (flags)
-		printf(" UNKNOWN: 0x%x", (unsigned int)le32_to_cpu(flags));
+		printf(" UNKNOWN: 0x%04x", (unsigned int)le32_to_cpu(flags));
 	printf("\n");
 }
 
@@ -1251,8 +1251,6 @@ static int ntfs_dump_index_entries(INDEX
 		(ntfschar*)((char*)(attr) + le16_to_cpu((attr)->name_offset)), \
 		(attr)->name_length, 0, NULL, 0)
 
-static int get_index_root(ntfs_inode *ni, ATTR_RECORD *attr, INDEX_ROOT *iroot);
-
 static INDEX_ATTR_TYPE get_index_attr_type(ntfs_inode *ni, ATTR_RECORD *attr,
 					   INDEX_ROOT *index_root)
 {
@@ -1289,7 +1287,7 @@ static INDEX_ATTR_TYPE get_index_attr_ty
 	else if (COMPARE_INDEX_NAMES(attr, NTFS_INDEX_O)) {
 		if (!strcmp(file_name, "/$Extend/$Quota"))
 			return INDEX_ATTR_QUOTA_O;
-		else
+		else if (!strcmp(file_name, "/$Extend/$ObjId"))
 			return INDEX_ATTR_OBJID_O;
 	}
 	
@@ -1893,7 +1891,7 @@ static void ntfs_dump_inode_general_info
 			inode_flags &= ~MFT_RECORD_IS_VIEW_INDEX;
 		}
 		if (inode_flags)
-			printf("UNKNOWN:0x%04hx",inode_flags);
+			printf("UNKNOWN: 0x%04hx", inode_flags);
 	} else {
 		printf("none");
 	}