[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs mkntfs.c,1.92,1.93

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

Changes by: flatcap

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

Modified Files:
	mkntfs.c 
Log Message:
global variables don't belong in opts
highlight the global nature of the variables in their name

Index: mkntfs.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/mkntfs.c,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -p -r1.92 -r1.93
--- mkntfs.c	5 Nov 2005 05:03:05 -0000	1.92
+++ mkntfs.c	5 Nov 2005 06:11:42 -0000	1.93
@@ -166,80 +166,73 @@ const char *EXEC_NAME = "mkntfs";
  * global variables
  * Need these global so mkntfs_exit can access them.
  */
-u8 *buf = NULL;
-u8 *buf2 = NULL;
-int buf2_size = 0;
-char *buf_sds = NULL;
-char *buf_sds_init = NULL;
-int buf_sds_size = 0;
-int buf_sds_first_size;
-int mft_bitmap_size, mft_bitmap_byte_size;
[...2206 lines suppressed...]
 		*usnp = cpu_to_le16(usn);
 		if (!opts.no_action)
-			lw = ntfs_mst_pwrite(vol->dev, pos, 1,
-					vol->mft_record_size,
-					buf + i * vol->mft_record_size);
+			lw = ntfs_mst_pwrite(g_vol->dev, pos, 1,
+					g_vol->mft_record_size,
+					g_buf + i * g_vol->mft_record_size);
 		if (lw != 1)
 			err_exit("%s\n", lw == -1 ? strerror(errno) :
 					"unknown error");
-		pos += vol->mft_record_size;
+		pos += g_vol->mft_record_size;
 	}
 	ntfs_log_verbose("Syncing device.\n");
-	if (vol->dev->d_ops->sync(vol->dev))
+	if (g_vol->dev->d_ops->sync(g_vol->dev))
 		err_exit("Syncing device. FAILED: %s", strerror(errno));
 	ntfs_log_quiet("mkntfs completed successfully. Have a nice day.\n");
 	/*