Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-02-21 16:04:57 +00:00
Code Issues Projects Releases Packages Wiki Activity

[CMD] Use pointers to const strings in error functions, where applicable.

Browse source
This commit is contained in:
Hermès Bélusca-Maïto 2020-09-12 20:29:54 +02:00
parent 3f8f3a2bba
commit 00ce3c48fe
No known key found for this signature in database
GPG key ID: 3B2539C65E7B93D0
3 changed files with 20 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
base/shell/cmd/cmd.h
View file

@ -179,22 +179,22 @@ INT CommandEchoserr (LPTSTR);
VOID VOID
ErrorMessage( ErrorMessage(
IN DWORD dwErrorCode, IN DWORD dwErrorCode,
IN LPTSTR szFormat OPTIONAL, IN PCTSTR szFormat OPTIONAL,
...); ...);
VOID error_no_pipe(VOID); VOID error_no_pipe(VOID);
VOID error_bad_command(LPTSTR); VOID error_bad_command(PCTSTR s);
VOID error_invalid_drive(VOID); VOID error_invalid_drive(VOID);
VOID error_req_param_missing(VOID); VOID error_req_param_missing(VOID);
VOID error_sfile_not_found(LPTSTR); VOID error_sfile_not_found(PCTSTR s);
VOID error_file_not_found(VOID); VOID error_file_not_found(VOID);
VOID error_path_not_found(VOID); VOID error_path_not_found(VOID);
VOID error_too_many_parameters(LPTSTR); VOID error_too_many_parameters(PCTSTR s);
VOID error_parameter_format(TCHAR); VOID error_parameter_format(TCHAR ch);
VOID error_invalid_switch(TCHAR); VOID error_invalid_switch(TCHAR ch);
VOID error_invalid_parameter_format(LPTSTR); VOID error_invalid_parameter_format(PCTSTR s);
VOID error_out_of_memory(VOID); VOID error_out_of_memory(VOID);
VOID error_syntax(LPTSTR); VOID error_syntax(PCTSTR s);
VOID msg_pause(VOID); VOID msg_pause(VOID);
@ -360,7 +360,7 @@ VOID EchoCommand(PARSED_COMMAND *Cmd);
TCHAR *Unparse(PARSED_COMMAND *Cmd, TCHAR *Out, TCHAR *OutEnd); TCHAR *Unparse(PARSED_COMMAND *Cmd, TCHAR *Out, TCHAR *OutEnd);
VOID FreeCommand(PARSED_COMMAND *Cmd); VOID FreeCommand(PARSED_COMMAND *Cmd);
void ParseErrorEx(LPTSTR s); VOID ParseErrorEx(IN PCTSTR s);
extern BOOL bParseError; extern BOOL bParseError;
extern TCHAR ParseLine[CMDLINE_LENGTH]; extern TCHAR ParseLine[CMDLINE_LENGTH];

18
base/shell/cmd/error.c
View file

@ -25,11 +25,11 @@
VOID VOID
ErrorMessage( ErrorMessage(
IN DWORD dwErrorCode, IN DWORD dwErrorCode,
IN LPTSTR szFormat OPTIONAL, IN PCTSTR szFormat OPTIONAL,
...) ...)
{ {
va_list arg_ptr; va_list arg_ptr;
LPTSTR szError; PTSTR szError;
TCHAR szMsg[RC_STRING_MAX_SIZE]; TCHAR szMsg[RC_STRING_MAX_SIZE];
TCHAR szMessage[1024]; TCHAR szMessage[1024];
@ -46,7 +46,7 @@ ErrorMessage(
if (FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_ALLOCATE_BUFFER, if (FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_ALLOCATE_BUFFER,
NULL, dwErrorCode, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), NULL, dwErrorCode, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
(LPTSTR)&szError, 0, NULL)) (PTSTR)&szError, 0, NULL))
{ {
ConErrPrintf(_T("%s%s%s"), szError, szMessage, (*szMessage ? _T("\n") : _T(""))); ConErrPrintf(_T("%s%s%s"), szError, szMessage, (*szMessage ? _T("\n") : _T("")));
if (szError) if (szError)
@ -76,7 +76,7 @@ VOID error_invalid_switch(TCHAR ch)
} }
VOID error_too_many_parameters(LPTSTR s) VOID error_too_many_parameters(PCTSTR s)
{ {
ConErrResPrintf(STRING_ERROR_TOO_MANY_PARAMETERS, s); ConErrResPrintf(STRING_ERROR_TOO_MANY_PARAMETERS, s);
nErrorLevel = 1; nErrorLevel = 1;
@ -97,12 +97,12 @@ VOID error_file_not_found(VOID)
} }
VOID error_sfile_not_found(LPTSTR f) VOID error_sfile_not_found(PCTSTR s)
{ {
TCHAR szMsg[RC_STRING_MAX_SIZE]; TCHAR szMsg[RC_STRING_MAX_SIZE];
LoadString(CMD_ModuleHandle, STRING_ERROR_FILE_NOT_FOUND, szMsg, ARRAYSIZE(szMsg)); LoadString(CMD_ModuleHandle, STRING_ERROR_FILE_NOT_FOUND, szMsg, ARRAYSIZE(szMsg));
ConErrPrintf(_T("%s - %s\n"), szMsg, f); ConErrPrintf(_T("%s - %s\n"), szMsg, s);
nErrorLevel = 1; nErrorLevel = 1;
} }
@ -121,7 +121,7 @@ VOID error_invalid_drive(VOID)
} }
VOID error_bad_command(LPTSTR s) VOID error_bad_command(PCTSTR s)
{ {
ConErrResPrintf(STRING_ERROR_BADCOMMAND, s); ConErrResPrintf(STRING_ERROR_BADCOMMAND, s);
nErrorLevel = 9009; nErrorLevel = 9009;
@ -142,14 +142,14 @@ VOID error_out_of_memory(VOID)
} }
VOID error_invalid_parameter_format(LPTSTR s) VOID error_invalid_parameter_format(PCTSTR s)
{ {
ConErrResPrintf(STRING_ERROR_INVALID_PARAM_FORMAT, s); ConErrResPrintf(STRING_ERROR_INVALID_PARAM_FORMAT, s);
nErrorLevel = 1; nErrorLevel = 1;
} }
VOID error_syntax(LPTSTR s) VOID error_syntax(PCTSTR s)
{ {
TCHAR szMsg[RC_STRING_MAX_SIZE]; TCHAR szMsg[RC_STRING_MAX_SIZE];

4
base/shell/cmd/parser.c
View file

@ -112,7 +112,7 @@ restart:
return (CurChar = Char); return (CurChar = Char);
} }
void ParseErrorEx(LPTSTR s) VOID ParseErrorEx(IN PCTSTR s)
{ {
/* Only display the first error we encounter */ /* Only display the first error we encounter */
if (!bParseError) if (!bParseError)
@ -120,7 +120,7 @@ void ParseErrorEx(LPTSTR s)
bParseError = TRUE; bParseError = TRUE;
} }
static void ParseError(void) static __inline VOID ParseError(VOID)
{ {
ParseErrorEx(CurrentTokenType != TOK_END ? CurrentToken : NULL); ParseErrorEx(CurrentTokenType != TOK_END ? CurrentToken : NULL);
} }