From 7d0e6b3c8a433e801880d656b51d05b1d5fae21d Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sat, 5 Apr 2014 10:44:31 +0000 Subject: [PATCH] Don't use %i format specifier for size_t values. In 64 bit build, size_t can be 64 bits while %i expects a 32 bit value. Fix this by just avoiding the unnecessary use of size_t, the number of entries in the index is not going to be greater than 2^32. Closes #16163. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_3_0_BRANCH@76285 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/html/helpwnd.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/html/helpwnd.cpp b/src/html/helpwnd.cpp index c208c756d6..204a5791b1 100644 --- a/src/html/helpwnd.cpp +++ b/src/html/helpwnd.cpp @@ -1625,10 +1625,10 @@ void wxHtmlHelpWindow::DoIndexFind() m_IndexList->Clear(); const wxHtmlHelpMergedIndex& index = *m_mergedIndex; - size_t cnt = index.size(); + const unsigned cnt = index.size(); int displ = 0; - for (size_t i = 0; i < cnt; i++) + for (unsigned i = 0; i < cnt; i++) { if (index[i].name.Lower().find(sr) != wxString::npos) { @@ -1678,7 +1678,7 @@ void wxHtmlHelpWindow::DoIndexFind() } wxString cnttext; - cnttext.Printf(_("%i of %i"), displ, cnt); + cnttext.Printf(_("%i of %u"), displ, cnt); m_IndexCountInfo->SetLabel(cnttext); m_IndexText->SetSelection(0, sr.length()); @@ -1697,10 +1697,10 @@ void wxHtmlHelpWindow::DoIndexAll() m_IndexList->Clear(); const wxHtmlHelpMergedIndex& index = *m_mergedIndex; - size_t cnt = index.size(); + const unsigned cnt = index.size(); bool first = true; - for (size_t i = 0; i < cnt; i++) + for (unsigned i = 0; i < cnt; i++) { m_IndexList->Append(index[i].name, (char*)(&index[i])); if (first) @@ -1716,7 +1716,7 @@ void wxHtmlHelpWindow::DoIndexAll() } wxString cnttext; - cnttext.Printf(_("%i of %i"), cnt, cnt); + cnttext.Printf(_("%u of %u"), cnt, cnt); m_IndexCountInfo->SetLabel(cnttext); }