[ros-diffs] [ekohl] 63695: [FORMAT] Rename variables in order to avoid conflicts with the FMIFS.Format function.

Author: ekohl
Date: Sun Jul  6 15:57:16 2014
New Revision: 63695

URL: http://svn.reactos.org/svn/reactos?rev=63695&view=rev
Log:
[FORMAT]
Rename variables in order to avoid conflicts with the FMIFS.Format function.

Modified:
    trunk/reactos/base/system/format/format.c

Modified: trunk/reactos/base/system/format/format.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/format/format.…
==============================================================================
--- trunk/reactos/base/system/format/format.c	[iso-8859-1] (original)
+++ trunk/reactos/base/system/format/format.c	[iso-8859-1] Sun Jul  6 15:57:16 2014
@@ -24,7 +24,7 @@
 BOOL	GotALabel = FALSE;
 LPTSTR	Label = _T("");
 LPTSTR	Drive = NULL;
-LPTSTR	Format = _T("FAT");
+LPTSTR	FileSystem = _T("FAT");
 
 TCHAR	RootDirectory[MAX_PATH];
 TCHAR	LabelString[12];
@@ -113,7 +113,7 @@
 			if( !_tcsnicmp( &argv[i][1], _T("FS:"), 3 )) {
 
 				if( gotFormat) return -1;
-				Format = &argv[i][4];
+				FileSystem = &argv[i][4];
 				gotFormat = TRUE;
 
 
@@ -332,7 +332,7 @@
 	DWORD flags, maxComponent;
 	ULARGE_INTEGER freeBytesAvailableToCaller, totalNumberOfBytes, totalNumberOfFreeBytes;
 #ifndef UNICODE
-	WCHAR RootDirectoryW[MAX_PATH], FormatW[MAX_PATH], LabelW[MAX_PATH];
+	WCHAR RootDirectoryW[MAX_PATH], FileSystemW[MAX_PATH], LabelW[MAX_PATH];
 #endif
 	TCHAR szMsg[RC_STRING_MAX_SIZE];
 
@@ -526,12 +526,12 @@
 	//
 #ifndef UNICODE
 	MultiByteToWideChar(CP_ACP, 0, RootDirectory, -1, RootDirectoryW, MAX_PATH);
-	MultiByteToWideChar(CP_ACP, 0, Format, -1, FormatW, MAX_PATH);
+	MultiByteToWideChar(CP_ACP, 0, FileSystem, -1, FileSystemW, MAX_PATH);
 	MultiByteToWideChar(CP_ACP, 0, Label, -1, LabelW, MAX_PATH);
-	FormatEx( RootDirectoryW, media, FormatW, LabelW, QuickFormat,
+	FormatEx( RootDirectoryW, media, FileSystemW, LabelW, QuickFormat,
 			ClusterSize, FormatExCallback );
 #else
-	FormatEx( RootDirectory, media, Format, Label, QuickFormat,
+	FormatEx( RootDirectory, media, FileSystem, Label, QuickFormat,
 			ClusterSize, FormatExCallback );
 #endif
 	if( Error ) return -1;