[Linux-NTFS-cvs] CVS: ntfsprogs/include/ntfs layout.h,1.46,1.47

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

Changes by: szaka

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

Modified Files:
	layout.h 
Log Message:
Name consistently the same $SDS, $SDH and $SII fields


Index: layout.h
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/include/ntfs/layout.h,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -p -r1.46 -r1.47
--- layout.h	11 Nov 2005 23:35:56 -0000	1.46
+++ layout.h	12 Nov 2005 15:35:51 -0000	1.47
@@ -1911,20 +1911,15 @@ typedef struct {
 typedef struct {
 	u32 hash;          /* Hash of the security descriptor. */
 	u32 security_id;   /* The security_id assigned to the descriptor. */
-	u64 offset_in_sds; /* Offset of the descriptor in $SDS data stream. */
-	u32 size_in_sds;   /* Size of the descriptor in $SDS data stream. */
+	u64 offset;	   /* Byte offset of this entry in the $SDS stream. */
+	u32 length;	   /* Size in bytes of this entry in $SDS stream. */
 	u32 reserved_II;   /* Padding - always unicode "II". */
 } __attribute__((__packed__)) SDH_INDEX_DATA;
 
 /**
  * struct SII_INDEX_DATA -
  */
-typedef struct {
-	u32 hash;          /* Hash of the security descriptor. */
-	u32 security_id;   /* The security_id assigned to the descriptor. */
-	u64 offset_in_sds; /* Offset of the descriptor in $SDS data stream. */
-	u32 size_in_sds;   /* Size of the descriptor in $SDS data stream. */
-} __attribute__((__packed__)) SII_INDEX_DATA;
+typedef SECURITY_DESCRIPTOR_HEADER SII_INDEX_DATA;
 
 /**
  * struct QUOTA_O_INDEX_DATA -