Changes by: antona
Update of /cvsroot/linux-ntfs/linux-ntfs/ntfstools
In directory usw-pr-cvs1:/tmp/cvs-serv27644a/ntfstools
Modified Files:
ntfsdump_logfile.c ntfsfix.c
Log Message:
Rename mft code adding ntfs_ prefix. Change all return values to zero on success. Thanks to mattjf for pointing out the inconsistencies.
Index: ntfsdump_logfile.c
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/ntfstools/ntfsdump_logfile.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -U2 -r1.16 -r1.17
--- ntfsdump_logfile.c 19 Apr 2002 21:09:55 -0000 1.16
+++ ntfsdump_logfile.c 20 Apr 2002 01:53:03 -0000 1.17
@@ -124,5 +124,5 @@
/* Read in $LogFile. */
mref = (MFT_REF)FILE_$LogFile;
- if (read_file_record(vol, mref, &m, NULL)) {
+ if (ntfs_read_file_record(vol, mref, &m, NULL)) {
fprintf(stderr, "Error reading mft record for $LogFile.\n");
goto error_exit;
Index: ntfsfix.c
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/ntfstools/ntfsfix.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -U2 -r1.26 -r1.27
--- ntfsfix.c 19 Apr 2002 21:09:55 -0000 1.26
+++ ntfsfix.c 20 Apr 2002 01:53:03 -0000 1.27
@@ -130,6 +130,6 @@
printf("Going to read $Mft... ");
mref = (MFT_REF)FILE_$MFT;
- br = read_mft_records(vol, mref, 4, (MFT_RECORD*)b1);
- if (br != 4) {
+ br = ntfs_read_mft_records(vol, mref, 4, (MFT_RECORD*)b1);
+ if (br) {
puts(FAILED);
goto error_exit;
@@ -246,7 +246,7 @@
/* Do the writes now. */
mref = (MFT_REF)i;
- br = write_mft_record(vol, mref,
+ br = ntfs_write_mft_record(vol, mref,
(MFT_RECORD*)(b1 + mrs * i));
- if (br != 1)
+ if (br)
goto mirr_sync_failed;
br = ntfs_mst_pwrite(vol->fd, (vol->mftmirr_lcn <<
@@ -312,6 +312,6 @@
printf("Writing $Volume to $Mft... ");
mref = (MFT_REF)FILE_$Volume;
- br = write_mft_record(vol, mref, (MFT_RECORD*)(b1 + 3 * mrs));
- if (br != 1) {
+ br = ntfs_write_mft_record(vol, mref, (MFT_RECORD*)(b1 + 3 * mrs));
+ if (br) {
puts(FAILED);
#define ESTR "Error writing $Volume to $Mft"
|
