Sync with trunk r63743.

[reactos.git] / base / system / format / format.c

diff --git a/base/system/format/format.c b/base/system/format/format.c
index 3a298d9..73d3b07 100644 (file)
--- a/base/system/format/format.c
+++ b/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;