[Linux-NTFS-cvs] CVS: ntfsprogs/libntfs volume.c,1.47,1.48

[Yura P. <cha...@us...>]

Changes by: cha0smaster

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

Modified Files:
	volume.c 
Log Message:
Change errno and print more verbose message in case if logfile check failed. 


Index: volume.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/volume.c,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -p -r1.47 -r1.48
--- volume.c	18 Jul 2005 02:09:43 -0000	1.47
+++ volume.c	29 Jul 2005 14:44:24 -0000	1.48
@@ -562,7 +562,7 @@ static int ntfs_volume_check_logfile(ntf
 {
 	ntfs_inode *ni;
 	ntfs_attr *na = NULL;
-	int ret, err = 0;
+	int err = 0;
 
 	if ((ni = ntfs_inode_open(vol, FILE_LogFile)) == NULL) {
 		Dprintf("Failed to open inode FILE_LogFile.\n");
@@ -571,23 +571,20 @@ static int ntfs_volume_check_logfile(ntf
 	}
 	if ((na = ntfs_attr_open(ni, AT_DATA, AT_UNNAMED, 0)) == NULL) {
 		Dprintf("Failed to open $FILE_LogFile/$DATA\n");
-		ret = -1;
 		err = EIO;
 		goto exit;
 	}
-	if (ntfs_check_logfile(na) && ntfs_is_logfile_clean(na))
-		ret = 0;
-	else {
-		ret = -1;
-		err = EIO;
-	}
+	if (!ntfs_check_logfile(na) || !ntfs_is_logfile_clean(na))
+		err = EOPNOTSUPP;
 exit:
 	if (na)
 		ntfs_attr_close(na);
 	ntfs_inode_close(ni);
-	if (ret)
+	if (err) {
 		errno = err;
-	return ret;
+		return -1;
+	}
+	return 0;
 }
 
 /**