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

Fix type casts and invalid format specifiers in interactive tests

Browse Source
This commit is contained in:
Maarten Bent
2018-07-29 11:58:01 +02:00
parent bfee89e3c4
commit 5da4e81e10
2 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/interactive/input.cpp
View File

@@ -176,7 +176,7 @@ void InteractiveInputTestCase::TestRegExInteractive()
break; break;
} }
wxPrintf(wxT("Subexpr %u matched '%s'\n"), wxPrintf(wxT("Subexpr %zu matched '%s'\n"),
n, wxString(text + start, len)); n, wxString(text + start, len));
} }
} }

17
tests/interactive/output.cpp
View File

@@ -110,8 +110,7 @@ void InteractiveOutputTestCase::TestDllListLoaded()
size_t len wxDUMMY_INITIALIZE(0); size_t len wxDUMMY_INITIALIZE(0);
if ( details.GetAddress(&addr, &len) ) if ( details.GetAddress(&addr, &len) )
{ {
wxPrintf(" %08lx:%08lx", wxPrintf(" %p:%p", addr, (void *)((char *)addr + len));
(unsigned long)addr, (unsigned long)((char *)addr + len));
} }
wxPrintf(" %s\n", details.GetVersion()); wxPrintf(" %s\n", details.GetVersion());
@@ -137,7 +136,7 @@ void InteractiveOutputTestCase::TestMimeEnum()
size_t count = wxTheMimeTypesManager->EnumAllFileTypes(mimetypes); size_t count = wxTheMimeTypesManager->EnumAllFileTypes(mimetypes);
wxPrintf(wxT("*** All %lu known filetypes: ***\n"), static_cast<unsigned long>(count)); wxPrintf(wxT("*** All %zu known filetypes: ***\n"), count);
wxArrayString exts; wxArrayString exts;
wxString desc; wxString desc;
@@ -261,7 +260,7 @@ void InteractiveOutputTestCase::TestOsInfo()
wxPrintf(wxT("Running under: %s, version %d.%d\n"), wxPrintf(wxT("Running under: %s, version %d.%d\n"),
wxGetOsDescription(), major, minor); wxGetOsDescription(), major, minor);
wxPrintf(wxT("%ld free bytes of memory left.\n"), wxGetFreeMemory().ToLong()); wxPrintf(wxT("%lld free bytes of memory left.\n"), wxGetFreeMemory());
wxPrintf(wxT("Host name is %s (%s).\n"), wxPrintf(wxT("Host name is %s (%s).\n"),
wxGetHostName(), wxGetFullHostName()); wxGetHostName(), wxGetFullHostName());
@@ -330,7 +329,7 @@ public:
protected: protected:
virtual void OnStackFrame(const wxStackFrame& frame) virtual void OnStackFrame(const wxStackFrame& frame)
{ {
wxPrintf("[%2d] ", (int) frame.GetLevel()); wxPrintf("[%2zu] ", frame.GetLevel());
wxString name = frame.GetName(); wxString name = frame.GetName();
if ( !name.empty() ) if ( !name.empty() )
@@ -339,12 +338,12 @@ protected:
} }
else else
{ {
wxPrintf("0x%08lx", (unsigned long)frame.GetAddress()); wxPrintf("0x%p", frame.GetAddress());
} }
if ( frame.HasSourceLocation() ) if ( frame.HasSourceLocation() )
{ {
wxPrintf("\t%s:%d", frame.GetFileName(), (int)frame.GetLine()); wxPrintf("\t%s:%zu", frame.GetFileName(), frame.GetLine());
} }
puts(""); puts("");
@@ -456,7 +455,7 @@ void InteractiveOutputTestCase::TestFSVolume()
return; return;
} }
wxPrintf(wxT("%u mounted volumes found:\n"), count); wxPrintf(wxT("%zu mounted volumes found:\n"), count);
for ( size_t n = 0; n < count; n++ ) for ( size_t n = 0; n < count; n++ )
{ {
@@ -467,7 +466,7 @@ void InteractiveOutputTestCase::TestFSVolume()
continue; continue;
} }
wxPrintf(wxT("%u: %s (%s), %s, %s, %s\n"), wxPrintf(wxT("%zu: %s (%s), %s, %s, %s\n"),
n + 1, n + 1,
vol.GetDisplayName(), vol.GetDisplayName(),
vol.GetName(), vol.GetName(),