Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/dotnet/runtime.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBruce Forstall <brucefo@microsoft.com>2021-05-14 01:11:30 +0300
committerGitHub <noreply@github.com>2021-05-14 01:11:30 +0300
commitce396bb9690625b0716a36d58bd3bcf4847e1d70 (patch)
tree4ed80acd3cc7f59918d655cd05bff40fd15090bf /src/coreclr/ToolBox
parent3f4e6ba81726a23f42eccdf1a2f6702e27670045 (diff)
Fix mcs merge error for missing pattern (#52715)
1. Print the Unicode pattern properly 2. Return an error code
Diffstat (limited to 'src/coreclr/ToolBox')
-rw-r--r--src/coreclr/ToolBox/superpmi/mcs/verbmerge.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/coreclr/ToolBox/superpmi/mcs/verbmerge.cpp b/src/coreclr/ToolBox/superpmi/mcs/verbmerge.cpp
index c141c1864b0..4504f4d5419 100644
--- a/src/coreclr/ToolBox/superpmi/mcs/verbmerge.cpp
+++ b/src/coreclr/ToolBox/superpmi/mcs/verbmerge.cpp
@@ -259,7 +259,8 @@ int verbMerge::FilterDirectory(LPCWSTR searchPattern,
}
else
{
- LogError("Failed to find pattern '%s'. GetLastError()=%u", searchPattern, GetLastError());
+ LogError("Failed to find pattern '%S'. GetLastError()=%u", searchPattern, GetLastError());
+ result = -1;
}
goto CLEAN_UP;
}