mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-27 23:42:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

- fix constness

Browse Source 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@911 e54a6e83-5905-42d5-8d5c-058d10e6a962
This commit is contained in:
seife
2010-11-28 22:00:54 +00:00
parent 237b53724e
commit 6184b6c1dc
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/gui/update.cpp
View File

@@ -265,10 +265,11 @@ bool CFlashUpdate::selectHttpImage(void)
bool CFlashUpdate::getUpdateImage(const std::string & version) bool CFlashUpdate::getUpdateImage(const std::string & version)
{ {
CHTTPTool httpTool; CHTTPTool httpTool;
char const * fname;
char dest_name[100]; char dest_name[100];
httpTool.setStatusViewer(this); httpTool.setStatusViewer(this);
const char *fname = rindex(filename.c_str(), '/'); fname = rindex(filename.c_str(), '/');
if(fname != NULL) fname++; if(fname != NULL) fname++;
else return false; else return false;
@@ -362,7 +363,7 @@ printf("[update] mode is %d\n", g_settings.softupdate_mode);
return false; return false;
} }
hide(); hide();
const char *ptr = rindex(filename.c_str(), '.'); char const * ptr = rindex(filename.c_str(), '.');
if(ptr) { if(ptr) {
ptr++; ptr++;
if(!strcmp(ptr, "bin")) fileType = 'A'; if(!strcmp(ptr, "bin")) fileType = 'A';
@@ -408,7 +409,7 @@ int CFlashUpdate::exec(CMenuTarget* parent, const std::string &)
if(g_settings.softupdate_mode==1) //internet-update if(g_settings.softupdate_mode==1) //internet-update
{ {
const char * fname = rindex(filename.c_str(), '/') +1; char const * fname = rindex(filename.c_str(), '/') +1;
char fullname[255]; char fullname[255];
if(!getUpdateImage(newVersion)) { if(!getUpdateImage(newVersion)) {

4
src/system/setting_helpers.cpp
View File

@@ -609,13 +609,13 @@ printf("CSubtitleChangeExec::exec: action %s\n", actionKey.c_str());
return menu_return::RETURN_EXIT; return menu_return::RETURN_EXIT;
} }
if(!strncmp(actionKey.c_str(), "DVB", 3)) { if(!strncmp(actionKey.c_str(), "DVB", 3)) {
const char *pidptr = strchr(actionKey.c_str(), ':'); char const * pidptr = strchr(actionKey.c_str(), ':');
int pid = atoi(pidptr+1); int pid = atoi(pidptr+1);
tuxtx_stop_subtitle(); tuxtx_stop_subtitle();
dvbsub_pause(); dvbsub_pause();
dvbsub_start(pid); dvbsub_start(pid);
} else { } else {
const char *ptr = strchr(actionKey.c_str(), ':'); char const * ptr = strchr(actionKey.c_str(), ':');
ptr++; ptr++;
int pid = atoi(ptr); int pid = atoi(ptr);
ptr = strchr(ptr, ':'); ptr = strchr(ptr, ':');