piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-30 09:39:46 -06:00
Code Issues Packages Projects Releases Wiki Activity

Clean up gcc/g++ compiler warnings that have accumulated.

Browse Source
This commit is contained in:
Glenn Rice
2012-12-10 00:40:28 -06:00
parent 43d673b576
commit e85438cba0
42 changed files with 82 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Core/DolphinWX/Src/Debugger/CodeWindow.cpp
View File

@ -319,7 +319,7 @@ void CCodeWindow::UpdateLists()
{
int idx = callers->Append(wxString::FromAscii(StringFromFormat
("< %s (%08x)", caller_symbol->name.c_str(), caller_addr).c_str()));
callers->SetClientData(idx, (void*)caller_addr);
callers->SetClientData(idx, (void*)(u64)caller_addr);
}
}
@ -332,7 +332,7 @@ void CCodeWindow::UpdateLists()
{
int idx = calls->Append(wxString::FromAscii(StringFromFormat
("> %s (%08x)", call_symbol->name.c_str(), call_addr).c_str()));
calls->SetClientData(idx, (void*)call_addr);
calls->SetClientData(idx, (void*)(u64)call_addr);
}
}
}

1
Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp
View File

@ -624,7 +624,6 @@ void FifoPlayerDlg::OnObjectListSelectionChanged(wxCommandEvent& event)
int cmd = *objectdata++;
int stream_size = Common::swap16(objectdata);
objectdata += 2;
int vertex_size = (objectdata_end - objectdata) / stream_size;
wxString newLabel = wxString::Format(wxT("%08X: %02X %04X "), obj_offset, cmd, stream_size);
if ((objectdata_end - objectdata) % stream_size) newLabel += _("NOTE: Stream size doesn't match actual data length\n");
while (objectdata < objectdata_end)

3
Source/Core/DolphinWX/Src/FrameTools.cpp
View File

@ -1320,9 +1320,8 @@ void CFrame::StatusBarMessage(const char * Text, ...)
const int MAX_BYTES = 1024*10;
char Str[MAX_BYTES];
va_list ArgPtr;
int Cnt;
va_start(ArgPtr, Text);
Cnt = vsnprintf(Str, MAX_BYTES, Text, ArgPtr);
vsnprintf(Str, MAX_BYTES, Text, ArgPtr);
va_end(ArgPtr);
if (this->GetStatusBar()->IsEnabled()) this->GetStatusBar()->SetStatusText(wxString::FromAscii(Str),0);

2
Source/Core/DolphinWX/Src/GameListCtrl.cpp
View File

@ -652,7 +652,7 @@ void CGameListCtrl::ScanForISOs()
for (std::vector<std::string>::const_iterator iter = drives.begin(); iter != drives.end(); ++iter)
{
std::auto_ptr<GameListItem> gli(new GameListItem(*iter));
std::unique_ptr<GameListItem> gli(new GameListItem(*iter));
if (gli->IsValid())
m_ISOFiles.push_back(gli.release());

2
Source/Core/DolphinWX/Src/ISOFile.cpp
View File

@ -285,7 +285,7 @@ bool GameListItem::GetName(std::wstring& wName, int index) const
index++;
if ((index >=0) && (index < 10))
{
if (m_wNames.size() > index)
if (m_wNames.size() > (size_t)index)
{
wName = m_wNames[index];
return true;

3
Source/Core/DolphinWX/Src/ISOProperties.cpp
View File

@ -687,14 +687,13 @@ void CISOProperties::OnExtractFile(wxCommandEvent& WXUNUSED (event))
void CISOProperties::ExportDir(const char* _rFullPath, const char* _rExportFolder, const int partitionNum)
{
char exportName[512];
u32 index[2] = {0, 0}, offsetShift = 0;
u32 index[2] = {0, 0};
std::vector<const DiscIO::SFileInfo *> fst;
DiscIO::IFileSystem *FS = 0;
if (DiscIO::IsVolumeWiiDisc(OpenISO))
{
FS = WiiDisc.at(partitionNum).FileSystem;
offsetShift = 2;
}
else
FS = pFileSystem;

6
Source/Core/DolphinWX/Src/Main.cpp
View File

@ -105,7 +105,7 @@ bool DolphinApp::OnInit()
bool UseDebugger = false;
bool UseLogger = false;
bool selectVideoBackend = false;
bool selectAudioEmulation = false;
//bool selectAudioEmulation = false;
wxString videoBackendName;
wxString audioEmulationName;
@ -167,8 +167,8 @@ bool DolphinApp::OnInit()
selectVideoBackend = parser.Found(wxT("video_backend"),
&videoBackendName);
// TODO: This currently has no effect. Implement or delete.
selectAudioEmulation = parser.Found(wxT("audio_emulation"),
&audioEmulationName);
//selectAudioEmulation = parser.Found(wxT("audio_emulation"),
// &audioEmulationName);
#endif // wxUSE_CMDLINE_PARSER
#if defined _DEBUG && defined _WIN32

2
Source/Core/DolphinWX/Src/X11Utils.cpp
View File

@ -225,7 +225,7 @@ void XRRConfiguration::Update()
}
else
sscanf(SConfig::GetInstance().m_LocalCoreStartupParameter.strFullscreenResolution.c_str(),
"%a[^:]: %ux%u", &output_name, &fullWidth, &fullHeight);
"%m[^:]: %ux%u", &output_name, &fullWidth, &fullHeight);
for (int i = 0; i < screenResources->noutput; i++)
{