[Linux-ntfs-cvs] CVS: linux-ntfs/ntfstools ntfsfix.c,1.2,1.3

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

Changes by: antona

Update of /cvsroot/linux-ntfs/linux-ntfs/ntfstools
In directory usw-pr-cvs1:/tmp/cvs-serv8956/ntfstools

Modified Files:
	ntfsfix.c 
Log Message:
Fixed the compilation issues.


Index: ntfsfix.c
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/ntfstools/ntfsfix.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** ntfsfix.c	2001/01/27 14:22:02	1.2
--- ntfsfix.c	2001/01/30 12:55:21	1.3
***************
*** 109,113 ****
  	
  /* Lazyness caused define for offset from one Mft record to the next. (-; */
! #define mrs (vol->MftRecordSize)
  
  	printf("\nBeginning processing of the $Mft and $MftMirr...\n");
--- 109,113 ----
  	
  /* Lazyness caused define for offset from one Mft record to the next. (-; */
! #define mrs (vol->mft_record_size)
  
  	printf("\nBeginning processing of the $Mft and $MftMirr...\n");
***************
*** 215,222 ****
  	for (i = 0, ebits = 0; i < 4; ++i) {
  		if (memcmp(b1+i*mrs, b2+i*mrs,
! 			   get_mft_record_size((MFT_RECORD_HEADER*)(b1+i*mrs)))) {
  			ebits |= 1 << i;
  #ifdef DEBUG
! 			printf("in memcmp: i = %x, count = 0x%x\n", i, get_mft_record_size((MFT_RECORD_HEADER*)(b1+i*mrs)));
  #endif
  		}
--- 215,225 ----
  	for (i = 0, ebits = 0; i < 4; ++i) {
  		if (memcmp(b1+i*mrs, b2+i*mrs,
! 			   get_mft_record_data_size((MFT_RECORD_HEADER*)(b1 + 
! 								i * mrs)))) {
  			ebits |= 1 << i;
  #ifdef DEBUG
! 			printf("in memcmp: i = %x, count = 0x%x\n", i,
! 			       get_mft_record_data_size((MFT_RECORD_HEADER*)(b1
! 								+ i * mrs)));
  #endif
  		}
***************
*** 313,317 ****
  	printf("Writing $Volume to $MftMirr... ");
  	br = mst_pwrite(vol->fd, b2 + (3 * mrs), mrs, 
! 			(vol->mft_mirr_lcn << vol->cluster_size_bits) +
  		       						(3 * mrs));
  	if (br != mrs) {
--- 316,320 ----
  	printf("Writing $Volume to $MftMirr... ");
  	br = mst_pwrite(vol->fd, b2 + (3 * mrs), mrs, 
! 			(vol->mftmirr_lcn << vol->cluster_size_bits) +
  		       						(3 * mrs));
  	if (br != mrs) {
***************
*** 339,343 ****
  	}
  	/* The $DATA attribute of the $LogFile has to be non-resident. */
! 	if (!a->non_resident) {
  		puts(FAILED);
  		fprintf(stderr, "$LogFile $DATA attribute is resident!?!\n");
--- 342,346 ----
  	}
  	/* The $DATA attribute of the $LogFile has to be non-resident. */
! 	if (!a->attribute.non_resident) {
  		puts(FAILED);
  		fprintf(stderr, "$LogFile $DATA attribute is resident!?!\n");
***************
*** 414,418 ****
  		free(b1);
  	if (vol)
! 		ntfs_close(vol);
  	return i;
  error_exit:
--- 417,421 ----
  		free(b1);
  	if (vol)
! 		ntfs_close(vol, 0);
  	return i;
  error_exit: