summaryrefslogtreecommitdiff
path: root/src/tools
diff options
context:
space:
mode:
authorEugene Zemtsov <Eugene.Zemtsov@microsoft.com>2015-07-29 16:38:07 -0700
committerEugene Zemtsov <Eugene.Zemtsov@microsoft.com>2015-07-29 16:38:07 -0700
commit4c036c0801950f48c3316aeef414819a1c43b194 (patch)
tree3fd1f84d92ed9cba1efb4b10b27c003298f98af0 /src/tools
parentf5794741fdcacc227db3405f462a44a681c6d0d2 (diff)
downloadcoreclr-4c036c0801950f48c3316aeef414819a1c43b194.tar.gz
coreclr-4c036c0801950f48c3316aeef414819a1c43b194.tar.bz2
coreclr-4c036c0801950f48c3316aeef414819a1c43b194.zip
Fix prefast warnings in CLR code
[tfs-changeset: 1507366]
Diffstat (limited to 'src/tools')
-rw-r--r--src/tools/util/consoleargs.cpp6
-rw-r--r--src/tools/util/consoleargs.h6
2 files changed, 6 insertions, 6 deletions
diff --git a/src/tools/util/consoleargs.cpp b/src/tools/util/consoleargs.cpp
index 5bf88a5a59..fd89726541 100644
--- a/src/tools/util/consoleargs.cpp
+++ b/src/tools/util/consoleargs.cpp
@@ -337,7 +337,7 @@ void ConsoleArgs::CleanUpArgs()
}
}
-bool ConsoleArgs::GetFullFileName(LPCWSTR szSource, __deref_out_ecount(cchFilenameBuffer) LPWSTR filenameBuffer, DWORD cchFilenameBuffer, bool fOutputFilename)
+bool ConsoleArgs::GetFullFileName(LPCWSTR szSource, __out_ecount(cchFilenameBuffer) LPWSTR filenameBuffer, DWORD cchFilenameBuffer, bool fOutputFilename)
{
#ifdef PLATFORM_UNIX
WCHAR tempBuffer[MAX_PATH];
@@ -367,7 +367,7 @@ bool ConsoleArgs::GetFullFileName(LPCWSTR szSource, __deref_out_ecount(cchFilena
// Clear previous error message if any and set the new one by copying into m_lastErrorMessage.
// We are responsible for freeing the memory destruction.
//
-void ConsoleArgs::SetErrorMessage(__deref_in LPCWSTR pwzMessage)
+void ConsoleArgs::SetErrorMessage(__in LPCWSTR pwzMessage)
{
if (m_lastErrorMessage != nullptr)
{
@@ -675,7 +675,7 @@ LEADINGWHITE:
// We expand any response files that may be contained in the args and return a new
// set of args, pargc2 and pppargv2 that contain the full flat command line.
//
-bool ConsoleArgs::ExpandResponseFiles(__in int argc, __deref_in_ecount(argc) const LPCWSTR * argv, __deref_out int * pargc2, __out LPWSTR ** pppargv2)
+bool ConsoleArgs::ExpandResponseFiles(__in int argc, __deref_in_ecount(argc) const LPCWSTR * argv, int * pargc2, __deref_out_ecount(*pargc2) LPWSTR ** pppargv2)
{
*pargc2 = 0;
*pppargv2 = NULL;
diff --git a/src/tools/util/consoleargs.h b/src/tools/util/consoleargs.h
index e9bc93bcdc..ed4a85659e 100644
--- a/src/tools/util/consoleargs.h
+++ b/src/tools/util/consoleargs.h
@@ -21,7 +21,7 @@ class ConsoleArgs
{
public:
// Place the fully-qualified filename in the given output buffer
- bool GetFullFileName(LPCWSTR szSource, __deref_out_ecount(cbFilenameBuffer) LPWSTR filenameBuffer, DWORD cbFilenameBuffer, bool fOutputFilename);
+ bool GetFullFileName(LPCWSTR szSource, __out_ecount(cbFilenameBuffer) LPWSTR filenameBuffer, DWORD cbFilenameBuffer, bool fOutputFilename);
ConsoleArgs() :
m_rgArgs(NULL),
@@ -37,7 +37,7 @@ public:
};
// returns false if there are errors
- bool ExpandResponseFiles(__in int argc, __deref_in_ecount(argc) const LPCWSTR * argv, __deref_out int * pargc2, __out LPWSTR ** pppargv2);
+ bool ExpandResponseFiles(__in int argc, __deref_in_ecount(argc) const LPCWSTR * argv, int * pargc2, __deref_out_ecount(*pargc2) LPWSTR ** pppargv2);
// Frees all memory used by the arg list and the argv/argc array
void CleanUpArgs();
@@ -55,7 +55,7 @@ public:
}
private:
- void SetErrorMessage(__deref_in LPCWSTR pwzMessage);
+ void SetErrorMessage(__in LPCWSTR pwzMessage);
b_tree * MakeLeaf( LPCWSTR szText);
void CleanupTree( b_tree * root);
HRESULT TreeAdd( b_tree ** root, LPCWSTR szAdd);