Nyaaori/rockbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix warnings in rbutil. FS#6865 thanx to GodEater

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@12860 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Dominik Wenger 2007-03-20 14:37:36 +00:00
parent 571d3245f7
commit 151a67253c
5 changed files with 9 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
rbutil/bootloaders.cpp
View file

@ -360,7 +360,8 @@ bool h10(int mode)
}
}
// shouldn't get here
return false;
}
// FWPatcher

3
rbutil/irivertools.cpp
View file

@ -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;

9
rbutil/rbutil.cpp
View file

@ -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;

3
rbutil/rbutilFrm.cpp
View file

@ -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,

3
rbutil/wizard_pages.cpp
View file

@ -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)