Fix whitespace (part 5/6) (convert tabs into 4-space indent).

svn path=/trunk/; revision=59385
This commit is contained in:
Hermès Bélusca-Maïto 2013-06-30 12:38:11 +00:00
parent 04b66da6bb
commit a1fdcd172a
3 changed files with 691 additions and 694 deletions

View file

@ -73,7 +73,6 @@ INT CommandChcp (LPTSTR param)
} }
freep (arg); freep (arg);
return 0; return 0;
} }

View file

@ -27,8 +27,8 @@
* 04-Feb-1999 (Eric Kohl) * 04-Feb-1999 (Eric Kohl)
* Fixed date input bug. * Fixed date input bug.
* *
* 03-Apr-2005 (Magnus Olsen) <magnus@greatlord.com>) * 03-Apr-2005 (Magnus Olsen) <magnus@greatlord.com>
* Remove all hardcode string to En.rc * Remove all hardcoded strings in En.rc
*/ */
#include "precomp.h" #include "precomp.h"
@ -63,7 +63,6 @@ PrintDateString (VOID)
} }
} }
static BOOL static BOOL
ReadNumber (LPTSTR *s, LPWORD lpwValue) ReadNumber (LPTSTR *s, LPWORD lpwValue)
{ {
@ -79,7 +78,6 @@ ReadNumber (LPTSTR *s, LPWORD lpwValue)
return FALSE; return FALSE;
} }
static BOOL static BOOL
ReadSeparator (LPTSTR *s) ReadSeparator (LPTSTR *s)
{ {
@ -91,7 +89,6 @@ ReadSeparator (LPTSTR *s)
return FALSE; return FALSE;
} }
static BOOL static BOOL
ParseDate (LPTSTR s) ParseDate (LPTSTR s)
{ {
@ -230,7 +227,6 @@ INT cmd_date (LPTSTR param)
return 0; return 0;
} }
ConErrResPuts(STRING_DATE_ERROR); ConErrResPuts(STRING_DATE_ERROR);
} }
} }
else else
@ -257,7 +253,6 @@ INT cmd_date (LPTSTR param)
} }
freep (arg); freep (arg);
return 0; return 0;
} }
#endif /* INCLUDE_CMD_DATE */ #endif /* INCLUDE_CMD_DATE */

View file

@ -1133,8 +1133,6 @@ DirPrintFiles(LPWIN32_FIND_DATA ptrFiles[], /* [IN] Files' Info */
} }
} }
/* /*
* CompareFiles * CompareFiles
* *
@ -1279,8 +1277,6 @@ QsortFiles(LPWIN32_FIND_DATA ptrArray[], /* [IN/OUT] The array with file info po
} }
} }
/* /*
* DirList * DirList
* *
@ -1356,7 +1352,8 @@ DirList(LPTSTR szPath, /* [IN] The path that dir starts */
{ {
continue; continue;
/* Here we filter all the specified attributes */ /* Here we filter all the specified attributes */
}else if ((wfdFileInfo.dwFileAttributes & lpFlags->stAttribs.dwAttribMask ) }
else if ((wfdFileInfo.dwFileAttributes & lpFlags->stAttribs.dwAttribMask )
== (lpFlags->stAttribs.dwAttribMask & lpFlags->stAttribs.dwAttribVal )) == (lpFlags->stAttribs.dwAttribMask & lpFlags->stAttribs.dwAttribVal ))
{ {
ptrNextNode->ptrNext = cmd_alloc(sizeof(DIRFINDLISTNODE)); ptrNextNode->ptrNext = cmd_alloc(sizeof(DIRFINDLISTNODE));
@ -1524,8 +1521,6 @@ DirList(LPTSTR szPath, /* [IN] The path that dir starts */
return 0; return 0;
} }
/* /*
* dir * dir
* *
@ -1566,11 +1561,13 @@ CommandDir(LPTSTR rest)
/* read the parameters from the DIRCMD environment variable */ /* read the parameters from the DIRCMD environment variable */
if (GetEnvironmentVariable (_T("DIRCMD"), dircmd, 256)) if (GetEnvironmentVariable (_T("DIRCMD"), dircmd, 256))
{
if (!DirReadParam(dircmd, &params, &entries, &stFlags)) if (!DirReadParam(dircmd, &params, &entries, &stFlags))
{ {
nErrorLevel = 1; nErrorLevel = 1;
goto cleanup; goto cleanup;
} }
}
/* read the parameters */ /* read the parameters */
if (!DirReadParam(rest, &params, &entries, &stFlags) || CheckCtrlBreak(BREAK_INPUT)) if (!DirReadParam(rest, &params, &entries, &stFlags) || CheckCtrlBreak(BREAK_INPUT))
@ -1580,8 +1577,10 @@ CommandDir(LPTSTR rest)
} }
/* default to current directory */ /* default to current directory */
if(entries == 0) { if (entries == 0)
if(!add_entry(&entries, &params, _T("*"))) { {
if (!add_entry(&entries, &params, _T("*")))
{
nErrorLevel = 1; nErrorLevel = 1;
goto cleanup; goto cleanup;
} }
@ -1644,10 +1643,14 @@ CommandDir(LPTSTR rest)
*pszFilePart = _T('\0'); *pszFilePart = _T('\0');
} }
else else
{
_tcscpy(path, params[loop]); _tcscpy(path, params[loop]);
}
if (ChangedVolume && !stFlags.bBareFormat) { if (ChangedVolume && !stFlags.bBareFormat)
if (!PrintDirectoryHeader (params[loop], &stFlags)) { {
if (!PrintDirectoryHeader (params[loop], &stFlags))
{
nErrorLevel = 1; nErrorLevel = 1;
goto cleanup; goto cleanup;
} }