Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix wrong format specifiers in the samples.

Browse Source 
Use "%ld" instead of "%d" to format long values, using "%d" results in an
assert failure under LP64 systems as int and long have different sizes there.

Closes #14311.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71469 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2012-05-17 16:10:19 +00:00
parent f2c757c5cc
commit 3ecb4c01f2
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
samples/sockets/baseserver.cpp
View File

@@ -258,7 +258,7 @@ Server::DumpStatistics()
if ((int)(m_threadWorkersDone+m_eventWorkersDone) == m_maxConnections) if ((int)(m_threadWorkersDone+m_eventWorkersDone) == m_maxConnections)
{ {
wxLogMessage("%d connection(s) served, exiting",m_maxConnections); wxLogMessage("%ld connection(s) served, exiting",m_maxConnections);
ExitMainLoop(); ExitMainLoop();
} }
} }
@@ -279,7 +279,7 @@ Server::OnCmdLineParsed(wxCmdLineParser& pParser)
if (pParser.Found("m",&m_maxConnections)) if (pParser.Found("m",&m_maxConnections))
{ {
wxLogMessage("%d connection(s) to exit",m_maxConnections); wxLogMessage("%ld connection(s) to exit",m_maxConnections);
} }
long port; long port;
@@ -434,8 +434,8 @@ void Server::OnWorkerEvent(WorkerEvent& pEvent)
{ {
if (it->GetData() == pEvent.m_sender) if (it->GetData() == pEvent.m_sender)
{ {
wxLogVerbose("Deleting thread worker (%d left)", wxLogVerbose("Deleting thread worker (%lu left)",
m_threadWorkers.GetCount()); static_cast<unsigned long>( m_threadWorkers.GetCount() ));
it->GetData()->Wait(); it->GetData()->Wait();
delete it->GetData(); delete it->GetData();
m_threadWorkers.DeleteNode(it); m_threadWorkers.DeleteNode(it);
@@ -450,8 +450,8 @@ void Server::OnWorkerEvent(WorkerEvent& pEvent)
{ {
if (it2->GetData() == pEvent.m_sender) if (it2->GetData() == pEvent.m_sender)
{ {
wxLogVerbose("Deleting event worker (%d left)", wxLogVerbose("Deleting event worker (%lu left)",
m_eventWorkers.GetCount()); static_cast<unsigned long>( m_eventWorkers.GetCount() ));
delete it2->GetData(); delete it2->GetData();
m_eventWorkers.DeleteNode(it2); m_eventWorkers.DeleteNode(it2);
if (!pEvent.m_workerFailed) if (!pEvent.m_workerFailed)

4
samples/sockets/client.cpp
View File

@@ -612,9 +612,9 @@ void MyFrame::OnTestURL(wxCommandEvent& WXUNUSED(event))
} }
// Print the contents type and file size // Print the contents type and file size
wxLogMessage("Contents type: %s\nFile size: %i\nStarting to download...", wxLogMessage("Contents type: %s\nFile size: %lu\nStarting to download...",
url.GetProtocol().GetContentType(), url.GetProtocol().GetContentType(),
data->GetSize()); static_cast<unsigned long>( data->GetSize() ));
// Get the data // Get the data
wxStringOutputStream sout; wxStringOutputStream sout;