[Linux-NTFS-cvs] CVS: ntfsprogs/libntfs bootsect.c,1.18,1.19 volume.c,1.64,1.65

[Richard R. <fl...@us...>]

Changes by: flatcap

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

Modified Files:
	bootsect.c volume.c 
Log Message:
simplify a few things

Index: bootsect.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/bootsect.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- bootsect.c	21 Oct 2005 18:05:13 -0000	1.18
+++ bootsect.c	5 Nov 2005 01:34:21 -0000	1.19
@@ -96,8 +96,7 @@ BOOL ntfs_boot_sector_is_ntfs(NTFS_BOOT_
 	/* Check sectors per cluster value is valid. */
 	ntfs_log_debug("Checking sectors per cluster... ");
 	switch (b->bpb.sectors_per_cluster) {
-	case 1: case 2: case 4: case 8: case 16:
-	case 32: case 64: case 128:
+	case 1: case 2: case 4: case 8: case 16: case 32: case 64: case 128:
 		break;
 	default:
 		goto not_ntfs;

Index: volume.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/volume.c,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -p -r1.64 -r1.65
--- volume.c	2 Nov 2005 18:06:49 -0000	1.64
+++ volume.c	5 Nov 2005 01:34:21 -0000	1.65
@@ -75,23 +75,7 @@
  */
 ntfs_volume *ntfs_volume_alloc(void)
 {
-	ntfs_volume *vol;
-
-	vol = (ntfs_volume*)calloc(1, sizeof(ntfs_volume));
-	if (vol) {
-		vol->dev = NULL;
-		vol->vol_name = NULL;
-		vol->lcnbmp_ni = NULL;
-		vol->lcnbmp_na = NULL;
-		vol->mft_ni = NULL;
-		vol->mft_na = NULL;
-		vol->mftbmp_na = NULL;
-		vol->mftmirr_ni = NULL;
-		vol->mftmirr_na = NULL;
-		vol->upcase = NULL;
-		vol->attrdef = NULL;
-	}
-	return vol;
+	return calloc(1, sizeof(ntfs_volume));
 }
 
 /**