From: Eric Kohl <eric.kohl@reactos.org>
Date: Sun, 6 Jul 2014 15:57:16 +0000 (+0000)
Subject: [FORMAT]
X-Git-Tag: backups/0.3.17@66124~916
X-Git-Url: https://git.reactos.org/?p=reactos.git;a=commitdiff_plain;h=03119a10c1afb3f0135ff865ec206f7850ab14ba;hp=6fe19b504869022d9a6ab28de07fed959163c53f

[FORMAT]
Rename variables in order to avoid conflicts with the FMIFS.Format function.

svn path=/trunk/; revision=63695
---

diff --git a/reactos/base/system/format/format.c b/reactos/base/system/format/format.c
index 3a298d9d42b..73d3b0711ec 100644
--- a/reactos/base/system/format/format.c
+++ b/reactos/base/system/format/format.c
@@ -24,7 +24,7 @@ BOOL	CompressDrive = FALSE;
 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 @@ static int ParseCommandLine( int argc, TCHAR *argv[] )
 			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 @@ _tmain(int argc, TCHAR *argv[])
 	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 @@ _tmain(int argc, TCHAR *argv[])
 	//
 #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;