Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-06-28 00:41:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

[CMD] Fix the ErrorMessage() function.

Browse source 
Specify its szFormat parameter optional, and correctly initialize the
szMessage buffer.
This commit is contained in:
Hermès Bélusca-Maïto 2020-05-17 20:08:41 +02:00
parent d5784d6345
commit d0ced4ffdf
No known key found for this signature in database
GPG key ID: 3B2539C65E7B93D0
4 changed files with 17 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -165,7 +165,11 @@ INT CommandEchoerr (LPTSTR);
INT CommandEchoserr (LPTSTR); INT CommandEchoserr (LPTSTR);
/* Prototypes for ERROR.C */ /* Prototypes for ERROR.C */
VOID ErrorMessage (DWORD, LPTSTR, ...); VOID
ErrorMessage(
IN DWORD dwErrorCode,
IN LPTSTR szFormat OPTIONAL,
...);
VOID error_no_pipe (VOID); VOID error_no_pipe (VOID);
VOID error_bad_command (LPTSTR); VOID error_bad_command (LPTSTR);

2
base/shell/cmd/del.c
View file

@ -263,7 +263,7 @@ DeleteFiles(LPTSTR FileName, DWORD* dwFlags, DWORD dwAttrFlags)
} }
else else
{ {
ErrorMessage (GetLastError(), _T("")); ErrorMessage (GetLastError(), NULL);
// FindClose(hFile); // FindClose(hFile);
// return -1; // return -1;
} }

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

@ -22,19 +22,23 @@
#include "precomp.h" #include "precomp.h"
VOID
VOID ErrorMessage (DWORD dwErrorCode, LPTSTR szFormat, ...) ErrorMessage(
IN DWORD dwErrorCode,
IN LPTSTR szFormat OPTIONAL,
...)
{ {
TCHAR szMsg[RC_STRING_MAX_SIZE];
TCHAR szMessage[1024];
LPTSTR szError;
va_list arg_ptr; va_list arg_ptr;
LPTSTR szError;
TCHAR szMsg[RC_STRING_MAX_SIZE];
TCHAR szMessage[1024];
if (dwErrorCode == ERROR_SUCCESS) if (dwErrorCode == ERROR_SUCCESS)
return; return;
nErrorLevel = 1; nErrorLevel = 1;
*szMessage = 0;
if (szFormat) if (szFormat)
{ {
va_start(arg_ptr, szFormat); va_start(arg_ptr, szFormat);
@ -48,7 +52,7 @@ VOID ErrorMessage (DWORD dwErrorCode, LPTSTR szFormat, ...)
{ {
ConErrPrintf(_T("%s %s\n"), szError, szMessage); ConErrPrintf(_T("%s %s\n"), szError, szMessage);
if (szError) if (szError)
LocalFree (szError); LocalFree(szError);
return; return;
} }

2
base/shell/cmd/vol.c
View file

@ -41,7 +41,7 @@ PrintVolumeHeader (LPTSTR pszRootPath)
NULL, NULL,
0)) 0))
{ {
ErrorMessage(GetLastError (), _T("")); ErrorMessage(GetLastError (), NULL);
return 1; return 1;
} }