From fcca2747d6a366853ce19140ee0527344110451c Mon Sep 17 00:00:00 2001 From: Sven Strickroth Date: Fri, 25 Mar 2016 15:04:21 +0100 Subject: [PATCH] Use AppendFormat and prevent usage of temporary strings Signed-off-by: Sven Strickroth --- src/Git/Git.cpp | 24 +++++------------- src/Git/GitHash.h | 6 +---- src/Git/GitStatusListCtrl.cpp | 5 ++-- src/TortoiseGitBlame/TortoiseGitBlameView.cpp | 5 ++-- src/TortoiseProc/AppUtils.cpp | 24 +++--------------- src/TortoiseProc/CheckCertificateDlg.cpp | 10 ++------ src/TortoiseProc/CommitDlg.cpp | 4 +-- src/TortoiseProc/GitLogListBase.cpp | 6 ++--- src/TortoiseProc/GitProgressList.cpp | 5 +--- src/TortoiseProc/RebaseDlg.cpp | 4 +-- src/TortoiseProc/Settings/SetOverlayHandlers.cpp | 5 ++-- src/TortoiseProc/Settings/SetProxyPage.cpp | 4 +-- src/TortoiseProc/StatGraphDlg.cpp | 8 ++---- src/Utils/Graphviz.cpp | 31 ++++++------------------ src/Utils/PathUtils.cpp | 18 +++----------- 15 files changed, 40 insertions(+), 119 deletions(-) diff --git a/src/Git/Git.cpp b/src/Git/Git.cpp index 6cd565657..7ccc98824 100644 --- a/src/Git/Git.cpp +++ b/src/Git/Git.cpp @@ -1037,43 +1037,31 @@ CString CGit::GetLogCmd(const CString& range, const CTGitPath* path, int mask, } Filter->m_From = (DWORD)time.GetTime() - (Filter->m_NumberOfLogs * substract); } - CString st1; if (Filter->m_NumberOfLogsScale == CFilterData::SHOW_LAST_N_COMMITS) - st1.Format(_T(" -n%ld"), Filter->m_NumberOfLogs); + param.AppendFormat(L" -n%ld", Filter->m_NumberOfLogs); else if (Filter->m_NumberOfLogsScale >= CFilterData::SHOW_LAST_SEL_DATE && Filter->m_From > 0) - st1.Format(_T(" --max-age=%I64u"), Filter->m_From); - param += st1; + param.AppendFormat(L" --max-age=%I64u", Filter->m_From); } if( Filter && (Filter->m_To != -1)) - { - CString st2; - st2.Format(_T(" --min-age=%I64u"), Filter->m_To); - param += st2; - } + param.AppendFormat(L" --min-age=%I64u", Filter->m_To); bool isgrep = false; if( Filter && (!Filter->m_Author.IsEmpty())) { - CString st1; - st1.Format(_T(" --author=\"%s\"" ), (LPCTSTR)Filter->m_Author); - param += st1; + param.AppendFormat(L" --author=\"%s\"", (LPCTSTR)Filter->m_Author); isgrep = true; } if( Filter && (!Filter->m_Committer.IsEmpty())) { - CString st1; - st1.Format(_T(" --committer=\"%s\"" ), (LPCTSTR)Filter->m_Author); - param += st1; + param.AppendFormat(L" --committer=\"%s\"", (LPCTSTR)Filter->m_Author); isgrep = true; } if( Filter && (!Filter->m_MessageFilter.IsEmpty())) { - CString st1; - st1.Format(_T(" --grep=\"%s\"" ), (LPCTSTR)Filter->m_MessageFilter); - param += st1; + param.AppendFormat(L" --grep=\"%s\"", (LPCTSTR)Filter->m_MessageFilter); isgrep = true; } diff --git a/src/Git/GitHash.h b/src/Git/GitHash.h index 8b330912c..c41ed0666 100644 --- a/src/Git/GitHash.h +++ b/src/Git/GitHash.h @@ -115,12 +115,8 @@ public: CString ToString() const { CString str; - CString a; for (int i = 0; i < GIT_HASH_SIZE; ++i) - { - a.Format(_T("%02x"),m_hash[i]); - str+=a; - } + str.AppendFormat(L"%02x", m_hash[i]); return str; } operator CString () const diff --git a/src/Git/GitStatusListCtrl.cpp b/src/Git/GitStatusListCtrl.cpp index 975d14e57..0bc242aa4 100644 --- a/src/Git/GitStatusListCtrl.cpp +++ b/src/Git/GitStatusListCtrl.cpp @@ -1059,10 +1059,9 @@ void CGitStatusListCtrl::AddEntry(CTGitPath * GitPath, WORD /*langID*/, int list { if (!abbreviateRenamings) { + entryname += L' '; // relative path - CString rename; - rename.Format(from, (LPCTSTR)GitPath->GetGitOldPathString()); - entryname += _T(" ") + rename; + entryname.AppendFormat(from, (LPCTSTR)GitPath->GetGitOldPathString()); } else { diff --git a/src/TortoiseGitBlame/TortoiseGitBlameView.cpp b/src/TortoiseGitBlame/TortoiseGitBlameView.cpp index c46a70e13..67405a17f 100644 --- a/src/TortoiseGitBlame/TortoiseGitBlameView.cpp +++ b/src/TortoiseGitBlame/TortoiseGitBlameView.cpp @@ -481,13 +481,12 @@ void CTortoiseGitBlameView::ContextMenuAction(int cmd, GitRev *pRev, GIT_REV_LIS CString path = ResolveCommitFile(parentFilename[index]); CString endrev = parentHashWithFile[index].ToString(); int line = m_data.GetOriginalLineNumber(m_MouseLine); - CString lineNumber; - lineNumber.Format(_T("%d"), line); CString procCmd = _T("/path:\"") + path + _T("\" "); procCmd += _T(" /command:blame"); procCmd += _T(" /endrev:") + endrev; - procCmd += _T(" /line:") + lineNumber; + procCmd += L" /line:"; + procCmd.AppendFormat(L"%d", line); CCommonAppUtils::RunTortoiseGitProc(procCmd); } diff --git a/src/TortoiseProc/AppUtils.cpp b/src/TortoiseProc/AppUtils.cpp index a7bda8edb..640ef921f 100644 --- a/src/TortoiseProc/AppUtils.cpp +++ b/src/TortoiseProc/AppUtils.cpp @@ -288,11 +288,7 @@ BOOL CAppUtils::StartExtMerge( com = com + _T(" /base:%base /theirs:%theirs /mine:%mine /result:%merged"); com = com + _T(" /basetitle:%bname /theirstitle:%tname /minetitle:%yname"); if (resolveMsgHwnd) - { - CString s; - s.Format(L" /resolvemsghwnd:%I64d", (__int64)resolveMsgHwnd); - com += s; - } + com.AppendFormat(L" /resolvemsghwnd:%I64d", (__int64)resolveMsgHwnd); } else { @@ -304,11 +300,7 @@ BOOL CAppUtils::StartExtMerge( com = com + _T(" /basename:%bname /theirsname:%tname /minename:%yname /mergedname:%mname"); com += _T(" /saverequired"); if (resolveMsgHwnd) - { - CString s; - s.Format(L" /resolvemsghwnd:%I64d", (__int64)resolveMsgHwnd); - com += s; - } + com.AppendFormat(L" /resolvemsghwnd:%I64d", (__int64)resolveMsgHwnd); if (bDeleteBaseTheirsMineOnClose) com += _T(" /deletebasetheirsmineonclose"); } @@ -552,11 +544,7 @@ bool CAppUtils::StartExtDiff( viewer += _T(" /readonly"); if (jumpToLine > 0) - { - CString temp; - temp.Format(_T(" /line:%d"), jumpToLine); - viewer += temp; - } + viewer.AppendFormat(L" /line:%d", jumpToLine); return LaunchApplication(viewer, IDS_ERR_EXTDIFFSTART, flags.bWait); } @@ -3176,11 +3164,7 @@ BOOL CAppUtils::Merge(const CString* commit, bool showStashPop) args += _T(" --no-commit"); if (dlg.m_bLog) - { - CString fmt; - fmt.Format(_T(" --log=%d"), dlg.m_nLog); - args += fmt; - } + args.AppendFormat(L" --log=%d", dlg.m_nLog); if (!dlg.m_MergeStrategy.IsEmpty()) { diff --git a/src/TortoiseProc/CheckCertificateDlg.cpp b/src/TortoiseProc/CheckCertificateDlg.cpp index 18dd38907..e6fb706d6 100644 --- a/src/TortoiseProc/CheckCertificateDlg.cpp +++ b/src/TortoiseProc/CheckCertificateDlg.cpp @@ -76,15 +76,9 @@ static CString getCertificateHash(HCRYPTPROV hCryptProv, ALG_ID algId, BYTE* cer readable.Empty(); for (const BYTE* it = pHash.get(); it < pHash.get() + hashLen; ++it) - { - CString tmp; - tmp.Format(L"%02X", *it); - if (!readable.IsEmpty()) - readable += L":"; - readable += tmp; - } + readable.AppendFormat(L"%02X:", *it); - return readable; + return readable.TrimRight(L":"); } BOOL CCheckCertificateDlg::OnInitDialog() diff --git a/src/TortoiseProc/CommitDlg.cpp b/src/TortoiseProc/CommitDlg.cpp index b916f0c83..cf0aba374 100644 --- a/src/TortoiseProc/CommitDlg.cpp +++ b/src/TortoiseProc/CommitDlg.cpp @@ -1953,7 +1953,6 @@ bool CCommitDlg::HandleMenuItemClick(int cmd, CSciEdit * pSciEdit) CTGitPath * entry = (CTGitPath*)m_ListCtrl.GetItemData(i); if (entry&&entry->m_Checked) { - CString line; CString status = entry->GetActionName(); if(entry->m_Action & CTGitPath::LOGACTIONS_UNVER) status = _T("Add"); // I18N TODO @@ -1963,8 +1962,7 @@ bool CCommitDlg::HandleMenuItemClick(int cmd, CSciEdit * pSciEdit) if (m_ProjectProperties.bFileListInEnglish) langID = 1033; - line.Format(_T("%-10s %s\r\n"),status , (LPCTSTR)m_ListCtrl.GetItemText(i,0)); - logmsg += line; + logmsg.AppendFormat(L"%-10s %s\r\n", (LPCTSTR)status, (LPCTSTR)m_ListCtrl.GetItemText(i, 0)); } } pSciEdit->InsertText(logmsg); diff --git a/src/TortoiseProc/GitLogListBase.cpp b/src/TortoiseProc/GitLogListBase.cpp index e49f47e5f..198d9ca4e 100644 --- a/src/TortoiseProc/GitLogListBase.cpp +++ b/src/TortoiseProc/GitLogListBase.cpp @@ -2421,10 +2421,8 @@ void CGitLogListBase::CopySelectionToClipBoard(int toCopy) sPaths += ((CTGitPath&)pLogEntry->GetFiles(this)[cpPathIndex]).GetActionName() + _T(": ") + pLogEntry->GetFiles(this)[cpPathIndex].GetGitPathString(); if (((CTGitPath&)pLogEntry->GetFiles(this)[cpPathIndex]).m_Action & (CTGitPath::LOGACTIONS_REPLACED|CTGitPath::LOGACTIONS_COPY) && !((CTGitPath&)pLogEntry->GetFiles(this)[cpPathIndex]).GetGitOldPathString().IsEmpty()) { - CString rename; - rename.Format(from, (LPCTSTR)((CTGitPath&)pLogEntry->GetFiles(this)[cpPathIndex]).GetGitOldPathString()); - sPaths += _T(' '); - sPaths += rename; + sPaths += L' '; + sPaths.AppendFormat(from, (LPCTSTR)((CTGitPath&)pLogEntry->GetFiles(this)[cpPathIndex]).GetGitOldPathString()); } sPaths += _T("\r\n"); } diff --git a/src/TortoiseProc/GitProgressList.cpp b/src/TortoiseProc/GitProgressList.cpp index e859ab30d..7e7a4b1fe 100644 --- a/src/TortoiseProc/GitProgressList.cpp +++ b/src/TortoiseProc/GitProgressList.cpp @@ -1056,10 +1056,7 @@ BOOL CGitProgressList::PreTranslateMessage(MSG* pMsg) CString sAction = GetItemText(nItem, 0); CString sPath = GetItemText(nItem, 1); CString sMime = GetItemText(nItem, 2); - CString sLogCopyText; - sLogCopyText.Format(_T("%s: %s %s\r\n"), - (LPCTSTR)sAction, (LPCTSTR)sPath, (LPCTSTR)sMime); - sClipdata += sLogCopyText; + sClipdata.AppendFormat(L"%s: %s %s\r\n", (LPCTSTR)sAction, (LPCTSTR)sPath, (LPCTSTR)sMime); } CStringUtils::WriteAsciiStringToClipboard(sClipdata); } diff --git a/src/TortoiseProc/RebaseDlg.cpp b/src/TortoiseProc/RebaseDlg.cpp index 496bcea9f..09b8245e9 100644 --- a/src/TortoiseProc/RebaseDlg.cpp +++ b/src/TortoiseProc/RebaseDlg.cpp @@ -1862,9 +1862,7 @@ int CRebaseDlg::DoRebase() if (ret == 3) return - 1; - CString mergeParam; - mergeParam.Format(L"-m %d ", ret); - cherryPickedFrom += mergeParam; + cherryPickedFrom.AppendFormat(L"-m %d ", ret); } while (true) diff --git a/src/TortoiseProc/Settings/SetOverlayHandlers.cpp b/src/TortoiseProc/Settings/SetOverlayHandlers.cpp index 9df299a3f..9fac1fc90 100644 --- a/src/TortoiseProc/Settings/SetOverlayHandlers.cpp +++ b/src/TortoiseProc/Settings/SetOverlayHandlers.cpp @@ -206,9 +206,8 @@ void CSetOverlayHandlers::UpdateInfoLabel() if (!sInfo2.IsEmpty()) { - CString sTemp; - sTemp.Format(IDS_SETTINGS_OVERLAYINFO2, (LPCWSTR)sInfo2); - sInfo += L"\n" + sTemp; + sInfo += L'\n'; + sInfo.AppendFormat(IDS_SETTINGS_OVERLAYINFO2, (LPCTSTR)sInfo2); } SetDlgItemText(IDC_HANDLERHINT, sInfo); } diff --git a/src/TortoiseProc/Settings/SetProxyPage.cpp b/src/TortoiseProc/Settings/SetProxyPage.cpp index 3c76164ef..6b00fddbd 100644 --- a/src/TortoiseProc/Settings/SetProxyPage.cpp +++ b/src/TortoiseProc/Settings/SetProxyPage.cpp @@ -266,8 +266,8 @@ BOOL CSetProxyPage::OnApply() if(m_serverport) { - temp.Format(_T("%u"), m_serverport); - http_proxy += _T(":")+temp; + http_proxy += L':'; + http_proxy.AppendFormat(L"%u", m_serverport); } } diff --git a/src/TortoiseProc/StatGraphDlg.cpp b/src/TortoiseProc/StatGraphDlg.cpp index 7d8ef3c77..b4ff21bfd 100644 --- a/src/TortoiseProc/StatGraphDlg.cpp +++ b/src/TortoiseProc/StatGraphDlg.cpp @@ -1104,8 +1104,7 @@ void CStatGraphDlg::ShowByDate(int stringx, int title, IntervalDataMap &data) tstring othersName; if (!others.empty()) { - temp.Format(_T(" (%Iu)"), others.size()); - sOthers += temp; + sOthers.AppendFormat(L" (%Iu)", others.size()); othersName = (LPCWSTR)sOthers; authorGraphMap[othersName] = m_graph.AppendGroup(sOthers); } @@ -1856,11 +1855,8 @@ void CStatGraphDlg::DrawOthers(const std::list &others, MyGraphSeries * for (std::list::const_iterator it = others.begin(); it != others.end(); ++it) nCommits += RollPercentageOfAuthorship(map[*it]); - CString temp; - temp.Format(_T(" (%Iu)"), others.size()); - CString sOthers(MAKEINTRESOURCE(IDS_STATGRAPH_OTHERGROUP)); - sOthers += temp; + sOthers.AppendFormat(L" (%Iu)", others.size()); int group = m_graph.AppendGroup(sOthers); graphData->SetData(group, (int)nCommits); } diff --git a/src/Utils/Graphviz.cpp b/src/Utils/Graphviz.cpp index 0ace47942..6d8f8a138 100644 --- a/src/Utils/Graphviz.cpp +++ b/src/Utils/Graphviz.cpp @@ -26,26 +26,15 @@ void Graphviz::DrawNode(CString id, CString text, CString fontName, int fontSize content.Append(_T("\t")); content.Append(id); - CString format; - format.Format(_T(" [label=\"%s\""), (LPCTSTR)text); - content.Append(format); + content.AppendFormat(L" [label=\"%s\"", (LPCTSTR)text); if (m_defaultFontName != fontName) - { - format.Format(_T(", fontname=\"%s\""), (LPCTSTR)fontName); - content.Append(format); - } + content.AppendFormat(L", fontname=\"%s\"", (LPCTSTR)fontName); if (m_defaultFontSize != fontSize) - { - format.Format(_T(", fontsize=\"%d\""), fontSize); - content.Append(format); - } + content.AppendFormat(L", fontsize=\"%d\"", fontSize); if (m_defaultBackColor.GetValue() != backColor.GetValue()) - { - format.Format(_T(", color=\"#%06X\""), backColor.GetValue() & 0xffffff); - content.Append(format); - } + content.AppendFormat(L", color=\"#%06X\"", backColor.GetValue() & 0xffffff); content.Append(_T("];\r\n")); } @@ -61,17 +50,15 @@ void Graphviz::BeginDrawTableNode(CString id, CString fontName, int fontSize, in bool hasAttr = false; if (m_defaultFontName != fontName) { - format.Format(_T("fontname=\"%s\""), (LPCTSTR)fontName); - content.Append(format); + content.AppendFormat(L"fontname=\"%s\"", (LPCTSTR)fontName); hasAttr = true; } if (m_defaultFontSize != fontSize) { if (hasAttr) - content.Append(_T(", ")); - format.Format(_T("fontsize=\"%d\""), fontSize); - content.Append(format); + content.Append(L", "); + content.AppendFormat(L"fontsize=\"%d\"", fontSize); hasAttr = true; } @@ -84,9 +71,7 @@ void Graphviz::BeginDrawTableNode(CString id, CString fontName, int fontSize, in void Graphviz::DrawTableNode(CString text, Gdiplus::Color backColor) { - CString format; - format.Format(_T("\t%s\r\n"), m_tableNodeNum++, backColor.GetValue() & 0xffffff, (LPCTSTR)text); - content.Append(format); + content.AppendFormat(L"\t%s\r\n", m_tableNodeNum++, backColor.GetValue() & 0xffffff, (LPCTSTR)text); } void Graphviz::EndDrawTableNode() diff --git a/src/Utils/PathUtils.cpp b/src/Utils/PathUtils.cpp index 688fdfef1..67ff957fd 100644 --- a/src/Utils/PathUtils.cpp +++ b/src/Utils/PathUtils.cpp @@ -200,13 +200,8 @@ CStringA CPathUtils::PathEscape(const CStringA& path) // no escaping needed for that char ret2 += (unsigned char)path[i]; } - else - { - // char needs escaping - CStringA temp; - temp.Format("%%%02X", (unsigned char)c); - ret2 += temp; - } + else // char needs escaping + ret2.AppendFormat("%%%02X", (unsigned char)c); } CStringA ret; for (i=0; ret2[i]; ++i) @@ -217,13 +212,8 @@ CStringA CPathUtils::PathEscape(const CStringA& path) // no escaping needed for that char ret += (unsigned char)ret2[i]; } - else - { - // char needs escaping - CStringA temp; - temp.Format("%%%02X", (unsigned char)c); - ret += temp; - } + else // char needs escaping + ret.AppendFormat("%%%02X", (unsigned char)c); } if ((ret.Left(11).Compare("file:///%5C") == 0) && (ret.Find('%', 12) < 0)) -- 2.11.4.GIT