[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs mkntfs.c,1.76,1.77 ntfsmount.c,1.44,1.45 ntfswipe.c,1.39,1.40 utils.c,1.53,1.54

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

Changes by: szaka

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

Modified Files:
	mkntfs.c ntfsmount.c ntfswipe.c utils.c 
Log Message:
NTFS_INDEX_ prefix $I30, $SII, $SDH, $O and $Q indexes


Index: mkntfs.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/mkntfs.c,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -p -r1.76 -r1.77
--- mkntfs.c	21 Oct 2005 18:05:14 -0000	1.76
+++ mkntfs.c	23 Oct 2005 18:35:58 -0000	1.77
@@ -2897,12 +2897,12 @@ static int initialize_secure(char *sds, 
 		sii_data->size_in_sds = sds_header->length;
 		if ((err = insert_index_entry_in_res_dir_index(idx_entry_sdh,
 			sdh_size, m,
-			SDH, 4, AT_UNUSED)))
+			NTFS_INDEX_SDH, 4, AT_UNUSED)))
 			break;
 
 		if ((err = insert_index_entry_in_res_dir_index(idx_entry_sii,
 			sii_size, m,
-			SII, 4, AT_UNUSED)))
+			NTFS_INDEX_SII, 4, AT_UNUSED)))
 			break;
 		sds_header = (SECURITY_DESCRIPTOR_HEADER*)((char*)sds_header +
 				(cpu_to_le32(sds_header->length + 0x0F) &
@@ -2961,7 +2961,7 @@ static int initialize_quota(MFT_RECORD *
 
 	err = insert_index_entry_in_res_dir_index(idx_entry_o,
 		o_size, m,
-		O, 2, AT_UNUSED);
+		NTFS_INDEX_O, 2, AT_UNUSED);
 	free(idx_entry_o);
 	if (err) return err;
 
@@ -2988,7 +2988,7 @@ static int initialize_quota(MFT_RECORD *
 
 	err = insert_index_entry_in_res_dir_index(idx_entry_q1,
 		q1_size, m,
-		Q, 2, AT_UNUSED);
+		NTFS_INDEX_Q, 2, AT_UNUSED);
 	free(idx_entry_q1);
 	if (err) return err;
 
@@ -3023,7 +3023,7 @@ static int initialize_quota(MFT_RECORD *
 
 	err = insert_index_entry_in_res_dir_index(idx_entry_q2,
 		q2_size, m,
-		Q, 2, AT_UNUSED);
+		NTFS_INDEX_Q, 2, AT_UNUSED);
 	free(idx_entry_q2);
 
 	return err;
@@ -3063,7 +3063,7 @@ static int initialize_objid(MFT_RECORD *
 	idx_entry_o_data->domain_id = *zero_guid;
 	err = insert_index_entry_in_res_dir_index(idx_entry_o,
 		o_size, m,
-		O, 2, AT_UNUSED);
+		NTFS_INDEX_O, 2, AT_UNUSED);
 	if (idx_entry_o) free (idx_entry_o);
 
 	return err;
@@ -3294,7 +3294,7 @@ static int create_hardlink_res(MFT_RECOR
 	idx_entry_new->key_length = fn_size;
 	memcpy((char*)idx_entry_new+0x10, (char*)fn, fn_size);
 	i = insert_index_entry_in_res_dir_index(idx_entry_new, idx_size + 0x10
-		 , m_parent, I30, 4, AT_FILE_NAME);
+		 , m_parent, NTFS_INDEX_I30, 4, AT_FILE_NAME);
 	if (i < 0) {
 		Eprintf("create_hardlink failed inserting index entry: %s\n",
 				strerror(-i));
@@ -4966,7 +4966,7 @@ int main(int argc, char **argv)
 //   update during each subsequent c&w of each system file.
 	Vprintf("Syncing root directory index record.\n");
 	mkntfs_sync_index_record(index_block, (MFT_RECORD*)(buf +
-		5 * vol->mft_record_size), I30, 4);
+		5 * vol->mft_record_size), NTFS_INDEX_I30, 4);
 
 	Vprintf("Syncing $Bitmap.\n");
 	m = (MFT_RECORD*)(buf + 6 * vol->mft_record_size);

Index: ntfsmount.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsmount.c,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -p -r1.44 -r1.45
--- ntfsmount.c	23 Oct 2005 11:54:00 -0000	1.44
+++ ntfsmount.c	23 Oct 2005 18:35:59 -0000	1.45
@@ -298,7 +298,7 @@ static int ntfs_fuse_getattr(const char 
 		if (ni->mrec->flags & MFT_RECORD_IS_DIRECTORY &&
 				!stream_name_len) {
 			stbuf->st_mode = S_IFDIR | (0777 & ~ctx->dmask);
-			na = ntfs_attr_open(ni, AT_INDEX_ALLOCATION, I30, 4);
+			na = ntfs_attr_open(ni, AT_INDEX_ALLOCATION, NTFS_INDEX_I30, 4);
 			if (na) {
 				stbuf->st_size = na->data_size;
 				stbuf->st_blocks = na->allocated_size >>

Index: ntfswipe.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfswipe.c,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- ntfswipe.c	7 Oct 2005 14:10:57 -0000	1.39
+++ ntfswipe.c	23 Oct 2005 18:35:59 -0000	1.40
@@ -979,7 +979,7 @@ static s64 wipe_directory (ntfs_volume *
 			goto close_inode;
 		}
 
-		naa = ntfs_attr_open (ni, AT_INDEX_ALLOCATION, I30, 4);
+		naa = ntfs_attr_open (ni, AT_INDEX_ALLOCATION, NTFS_INDEX_I30, 4);
 		if (!naa) {
 			if (opts.verbose > 2)
 				Vprintf ("Couldn't open $INDEX_ALLOCATION\n");
@@ -1002,7 +1002,7 @@ static s64 wipe_directory (ntfs_volume *
 			goto close_attr_allocation;
 		}
 
-		nab = ntfs_attr_open (ni, AT_BITMAP, I30, 4);
+		nab = ntfs_attr_open (ni, AT_BITMAP, NTFS_INDEX_I30, 4);
 		if (!nab) {
 			Vprintf ("Couldn't open $BITMAP\n");
 			Eprintf ("damaged fs: $INDEX_ALLOCATION is present, "
@@ -1011,7 +1011,7 @@ static s64 wipe_directory (ntfs_volume *
 			goto close_attr_allocation;
 		}
 
-		nar = ntfs_attr_open (ni, AT_INDEX_ROOT, I30, 4);
+		nar = ntfs_attr_open (ni, AT_INDEX_ROOT, NTFS_INDEX_I30, 4);
 		if (!nar) {
 			Vprintf ("Couldn't open $INDEX_ROOT\n");
 			Eprintf ("damaged fs: $INDEX_ALLOCATION is present, but "

Index: utils.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/utils.c,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -p -r1.53 -r1.54
--- utils.c	21 Oct 2005 18:05:14 -0000	1.53
+++ utils.c	23 Oct 2005 18:35:59 -0000	1.54
@@ -934,7 +934,7 @@ int mft_next_record (struct mft_search_c
 			if (ctx->flags_search & FEMR_DIR) {
 				attr_ctx = ntfs_attr_get_search_ctx (ctx->inode, NULL);
 				if (attr_ctx) {
-					if (ntfs_attr_lookup (AT_INDEX_ROOT, I30, 4, 0, 0, NULL, 0, attr_ctx) == 0)
+					if (ntfs_attr_lookup (AT_INDEX_ROOT, NTFS_INDEX_I30, 4, 0, 0, NULL, 0, attr_ctx) == 0)
 						ctx->flags_match |= FEMR_DIR;
 
 					ntfs_attr_put_search_ctx (attr_ctx);