Skip to content

Commit

Permalink
Remove all uses of SString::Printf() accepting WCHAR (#76571)
Browse files Browse the repository at this point in the history
* Remove uses of SString::Printf(const WCHAR*, ...)

* Remove SString::Printf(const WCHAR*, ...)

* Remove unused dbg event redirection logic
  • Loading branch information
AaronRobinsonMSFT authored Oct 5, 2022
1 parent 588fa49 commit fec0221
Show file tree
Hide file tree
Showing 32 changed files with 171 additions and 904 deletions.
6 changes: 4 additions & 2 deletions src/coreclr/binder/bindertracing.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -305,7 +305,9 @@ namespace BinderTracing

case FUSION_E_REF_DEF_MISMATCH:
result = Result::MismatchedAssemblyName;
errorMsg.Printf(W("Requested assembly name '%s' does not match found assembly name"), m_assemblyName.GetUnicode());
errorMsg.Append(W("Requested assembly name '"));
errorMsg.Append(m_assemblyName.GetUnicode());
errorMsg.Append(W("' does not match found assembly name"));
if (resultAssembly != nullptr)
{
errorMsg.Append(W(" '"));
Expand All @@ -325,7 +327,7 @@ namespace BinderTracing
else
{
result = Result::Failure;
errorMsg.Printf(W("Resolution failed with HRESULT (%08x)"), m_hr);
errorMsg.Printf("Resolution failed with HRESULT (%08x)", m_hr);
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/coreclr/binder/textualidentityparser.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ namespace BINDER_SPACE
if (AssemblyIdentity::Have(dwIdentityFlags, AssemblyIdentity::IDENTITY_FLAG_VERSION))
{
tmpString.Clear();
tmpString.Printf(W("%d.%d.%d.%d"),
tmpString.Printf("%d.%d.%d.%d",
(DWORD)(USHORT)pAssemblyIdentity->m_version.GetMajor(),
(DWORD)(USHORT)pAssemblyIdentity->m_version.GetMinor(),
(DWORD)(USHORT)pAssemblyIdentity->m_version.GetBuild(),
Expand Down
1 change: 0 additions & 1 deletion src/coreclr/debug/di/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ set(CORDBDI_SOURCES
dbgtransportmanager.cpp
hash.cpp
module.cpp
nativepipeline.cpp
platformspecific.cpp
process.cpp
rsappdomain.cpp
Expand Down
349 changes: 0 additions & 349 deletions src/coreclr/debug/di/eventredirectionpipeline.cpp

This file was deleted.

Loading

0 comments on commit fec0221

Please sign in to comment.