[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs mkntfs.c,1.142,1.143

[Yuval <uv...@us...>]

Changes by: uvman

Update of /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv25883/ntfsprogs

Modified Files:
	mkntfs.c 
Log Message:
mkntfs.c refactoring and compile fix for Cygwin

Index: mkntfs.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/mkntfs.c,v
retrieving revision 1.142
retrieving revision 1.143
diff -u -p -r1.142 -r1.143
--- mkntfs.c	19 Apr 2006 21:43:11 -0000	1.142
+++ mkntfs.c	16 May 2006 12:12:45 -0000	1.143
@@ -3437,6 +3437,29 @@ done:
 }
 
 /**
+ * mkntfs_get_page_size - detect the system's memory page size.
+ */
+static long mkntfs_get_page_size()
+{
+	long page_size;
+#ifdef _SC_PAGESIZE
+	page_size = sysconf(_SC_PAGESIZE);
+	if (page_size < 0)
+#endif
+#ifdef _SC_PAGE_SIZE
+		page_size = sysconf(_SC_PAGE_SIZE);
+	if (page_size < 0)
+#endif
+	{
+		ntfs_log_warning("Failed to determine system page size.  "
+				"Assuming safe default of 4096 bytes.\n");
+		return 4096;
+	}
+	ntfs_log_debug("System page size is %li bytes.\n", page_size);
+	return page_size;
+}
+
+/**
  * mkntfs_override_vol_params -
  */
 static BOOL mkntfs_override_vol_params(ntfs_volume *vol)
@@ -3678,16 +3701,7 @@ static BOOL mkntfs_override_vol_params(n
 				"of the device will be used.\n");
 		return FALSE;
 	}
-	page_size = sysconf(_SC_PAGESIZE);
-	if (page_size < 0)
-		page_size = sysconf(_SC_PAGE_SIZE);
-	if (page_size >= 0)
-		ntfs_log_debug("System page size is %li bytes.\n", page_size);
-	else {
-		ntfs_log_warning("Failed to determine system page size.  "
-				"Assuming safe default of 4096 bytes.\n");
-		page_size = 4096;
-	}
+	page_size = mkntfs_get_page_size();
 	/*
 	 * Set the mft record size.  By default this is 1024 but it has to be
 	 * at least as big as a sector and not bigger than a page on the system