diff --git a/rbutil/bootloaders.cpp b/rbutil/bootloaders.cpp index 3d2734b6b9..5a58f3b14b 100755 --- a/rbutil/bootloaders.cpp +++ b/rbutil/bootloaders.cpp @@ -360,7 +360,8 @@ bool h10(int mode) } } - + // shouldn't get here + return false; } // FWPatcher diff --git a/rbutil/irivertools.cpp b/rbutil/irivertools.cpp index 7632ca78f4..65891d546b 100755 --- a/rbutil/irivertools.cpp +++ b/rbutil/irivertools.cpp @@ -415,8 +415,6 @@ int iriver_encode(wxString infile_name, wxString outfile_name, unsigned int modi unsigned char * pChecksums, * ppChecksums; unsigned char ck; - enum striptype stripmode = STRIP_NONE; - if(!infile.Open(infile_name,wxFile::read)) { err.Printf(wxT("Could not open: %s"),infile_name.c_str()); @@ -545,7 +543,6 @@ bool PatchFirmware(wxString firmware,wxString bootloader,int series, int table_e wxString name1, name2, name3; char md5sum_str[32]; - int i; struct sumpairs *sums; int origin; diff --git a/rbutil/rbutil.cpp b/rbutil/rbutil.cpp index 1663725fbb..ceeb4a9222 100644 --- a/rbutil/rbutil.cpp +++ b/rbutil/rbutil.cpp @@ -388,7 +388,6 @@ int UnzipFile(wxString src, wxString destdir, bool isInstall) int Uninstall(const wxString dir, bool isFullUninstall) { wxString buf, uninst; - bool gooddata = false; unsigned int i; bool errflag = false; InstallLog *log = NULL; @@ -516,7 +515,7 @@ int Uninstall(const wxString dir, bool isFullUninstall) { wxRemoveFile(*buf2); } - if ( rc = ! wxRmdir(buf) ) + if ( (rc = ! wxRmdir(buf)) ) { buf = buf.Format(wxT("Can't remove directory %s"), buf.c_str()); @@ -525,7 +524,7 @@ int Uninstall(const wxString dir, bool isFullUninstall) { } } else if (wxFileExists(buf) ) { - if ( rc = ! wxRemoveFile(buf) ) + if ( (rc = ! wxRemoveFile(buf)) ) { buf = buf.Format(wxT("Can't delete file %s"), buf.c_str()); @@ -725,14 +724,14 @@ bool rm_rf(wxString file) if (wxDirExists(selected[i]) ) { - if (rc = ! wxRmdir(selected[i]) ) + if ((rc = ! wxRmdir(selected[i])) ) { buf.Printf(wxT("Can't remove directory %s"), selected[i].c_str()); errflag = true; WARN_DIALOG(buf.c_str(), wxT("Erase files")); } - } else if (rc = ! wxRemoveFile(selected[i]) ) + } else if ((rc = ! wxRemoveFile(selected[i])) ) { buf.Printf(wxT("Error deleting file %s"), selected[i].c_str() ); errflag = true; diff --git a/rbutil/rbutilFrm.cpp b/rbutil/rbutilFrm.cpp index fe92f2bb60..f41d290633 100644 --- a/rbutil/rbutilFrm.cpp +++ b/rbutil/rbutilFrm.cpp @@ -743,7 +743,7 @@ void rbutilFrm::OnThemesBtn(wxCommandEvent& event) if (wizard->RunWizard(page1) ) { bool success=true; - for(int i=0 ;i < gv->themesToInstall.GetCount();i++) + for(unsigned int i=0 ;i < gv->themesToInstall.GetCount();i++) { if(!InstallTheme(gv->themesToInstall[i])) { @@ -811,7 +811,6 @@ void rbutilFrm::OnPortableInstall(wxCommandEvent& event) wxString src, dest, buf; wxLogVerbose(wxT("=== begin rbutilFrm::OnPortableInstall(event)")); wxFileSystem fs; - wxFileConfig* buildinfo; wxDateSpan oneday; wxWizard *wizard = new wxWizard(this, wxID_ANY, diff --git a/rbutil/wizard_pages.cpp b/rbutil/wizard_pages.cpp index 644a7ba4bd..5649238ac8 100644 --- a/rbutil/wizard_pages.cpp +++ b/rbutil/wizard_pages.cpp @@ -262,7 +262,7 @@ bool wxThemesPage::TransferDataFromWindow() { gv->themesToInstall.Clear(); - for(int i=0; i < m_installTheme.GetCount(); i++) + for(unsigned int i=0; i < m_installTheme.GetCount(); i++) { if(m_installTheme[i]) { @@ -496,6 +496,7 @@ wxWizardPage* wxIpodLocationPage::GetPrev() const return wxWizardPageSimple::GetPrev()->GetPrev(); } + return wxWizardPageSimple::GetPrev(); } void wxIpodLocationPage::OnWizardPageChanging(wxWizardEvent& event)