[Linux-NTFS-cvs] CVS: linux-ntfs/libntfs mft.c,1.17,1.18 volume.c,1.23,1.24

[Anton A. <an...@us...>]

Changes by: antona

Update of /cvsroot/linux-ntfs/linux-ntfs/libntfs
In directory usw-pr-cvs1:/tmp/cvs-serv12277/libntfs

Modified Files:
	mft.c volume.c 
Log Message:
Really fix the library and mkntfs while at it.


Index: mft.c
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/libntfs/mft.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -U2 -r1.17 -r1.18
--- mft.c	15 Apr 2002 18:54:07 -0000	1.17
+++ mft.c	15 Apr 2002 19:02:40 -0000	1.18
@@ -183,5 +183,5 @@
 	if (!(m = (MFT_RECORD*)malloc(vol->mft_record_size)))
 		return -ENOMEM;
-	if ((er = get_mft_record(vol, m, mref)) != 1)
+	if ((er = read_mft_record(vol, *mref, m)) != 1)
 		goto failed;
 	if (!is_file_record(m->magic))

Index: volume.c
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/libntfs/volume.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -U2 -r1.23 -r1.24
--- volume.c	15 Apr 2002 18:54:07 -0000	1.23
+++ volume.c	15 Apr 2002 19:02:41 -0000	1.24
@@ -230,5 +230,5 @@
 	}
 	/* Can't use any of the higher level functions yet! */
-	br = mst_pread(vol->fd, vol->mft_lcn << vol->cluster_size_bits, 1,
+	br = ntfs_mst_pread(vol->fd, vol->mft_lcn << vol->cluster_size_bits, 1,
 			vol->mft_record_size, mb);
 	if (br != 1) {