Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-11-20 06:15:26 +00:00
Code Issues Projects Releases Packages Wiki Activity

[FORMAT]

Browse source 
Rename variables in order to avoid conflicts with the FMIFS.Format function.

svn path=/trunk/; revision=63695
This commit is contained in:
Eric Kohl 2014-07-06 15:57:16 +00:00
parent 6fe19b5048
commit 03119a10c1
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
reactos/base/system/format/format.c
View file

@ -24,7 +24,7 @@ BOOL CompressDrive = FALSE;
BOOL GotALabel = FALSE; BOOL GotALabel = FALSE;
LPTSTR Label = _T(""); LPTSTR Label = _T("");
LPTSTR Drive = NULL; LPTSTR Drive = NULL;
LPTSTR Format = _T("FAT"); LPTSTR FileSystem = _T("FAT");
TCHAR RootDirectory[MAX_PATH]; TCHAR RootDirectory[MAX_PATH];
TCHAR LabelString[12]; TCHAR LabelString[12];
@ -113,7 +113,7 @@ static int ParseCommandLine( int argc, TCHAR *argv[] )
if( !_tcsnicmp( &argv[i][1], _T("FS:"), 3 )) { if( !_tcsnicmp( &argv[i][1], _T("FS:"), 3 )) {
if( gotFormat) return -1; if( gotFormat) return -1;
Format = &argv[i][4]; FileSystem = &argv[i][4];
gotFormat = TRUE; gotFormat = TRUE;
@ -332,7 +332,7 @@ _tmain(int argc, TCHAR *argv[])
DWORD flags, maxComponent; DWORD flags, maxComponent;
ULARGE_INTEGER freeBytesAvailableToCaller, totalNumberOfBytes, totalNumberOfFreeBytes; ULARGE_INTEGER freeBytesAvailableToCaller, totalNumberOfBytes, totalNumberOfFreeBytes;
#ifndef UNICODE #ifndef UNICODE
WCHAR RootDirectoryW[MAX_PATH], FormatW[MAX_PATH], LabelW[MAX_PATH]; WCHAR RootDirectoryW[MAX_PATH], FileSystemW[MAX_PATH], LabelW[MAX_PATH];
#endif #endif
TCHAR szMsg[RC_STRING_MAX_SIZE]; TCHAR szMsg[RC_STRING_MAX_SIZE];
@ -526,12 +526,12 @@ _tmain(int argc, TCHAR *argv[])
// //
#ifndef UNICODE #ifndef UNICODE
MultiByteToWideChar(CP_ACP, 0, RootDirectory, -1, RootDirectoryW, MAX_PATH); 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); MultiByteToWideChar(CP_ACP, 0, Label, -1, LabelW, MAX_PATH);
FormatEx( RootDirectoryW, media, FormatW, LabelW, QuickFormat, FormatEx( RootDirectoryW, media, FileSystemW, LabelW, QuickFormat,
ClusterSize, FormatExCallback ); ClusterSize, FormatExCallback );
#else #else
FormatEx( RootDirectory, media, Format, Label, QuickFormat, FormatEx( RootDirectory, media, FileSystem, Label, QuickFormat,
ClusterSize, FormatExCallback ); ClusterSize, FormatExCallback );
#endif #endif
if( Error ) return -1; if( Error ) return -1;