diff --git a/src/driver/pictureviewer/png.cpp b/src/driver/pictureviewer/png.cpp
index e94c23be7..9d352926d 100644
--- a/src/driver/pictureviewer/png.cpp
+++ b/src/driver/pictureviewer/png.cpp
@@ -101,7 +101,7 @@ int fh_png_load(const char *name,unsigned char **buffer,int* /*xp*/,int* /*yp*/)
if (width * 3 != png_get_rowbytes(png_ptr, info_ptr))
{
printf("[png.cpp]: Error processing %s - please report (including image).\n", name);
- printf(" width: %d rowbytes: %d\n", width, png_get_rowbytes(png_ptr, info_ptr));
+ printf(" width: %lu rowbytes: %lu\n", width, png_get_rowbytes(png_ptr, info_ptr));
fclose(fh);
return(FH_ERROR_FORMAT);
}
diff --git a/src/gui/infoclock.cpp b/src/gui/infoclock.cpp
index 4c6033119..2b445fdcd 100644
--- a/src/gui/infoclock.cpp
+++ b/src/gui/infoclock.cpp
@@ -65,6 +65,7 @@ void* CInfoClock::TimerProc(void *arg)
show_dot = !show_dot;
InfoClock->paintTime(show_dot);
}
+ return 0;
}
void CInfoClock::StartClock()
diff --git a/src/nhttpd/tuxboxapi/neutrinoyparser.cpp b/src/nhttpd/tuxboxapi/neutrinoyparser.cpp
index 8351d559d..d394342e9 100644
--- a/src/nhttpd/tuxboxapi/neutrinoyparser.cpp
+++ b/src/nhttpd/tuxboxapi/neutrinoyparser.cpp
@@ -300,8 +300,8 @@ std::string CNeutrinoYParser::func_get_channels_as_dropdown(CyhookHandler */*hh
CZapitChannel * channel = channels[j];
char buf[100],id[20];
sprintf(id,PRINTF_CHANNEL_ID_TYPE_NO_LEADING_ZEROS,channel->channel_id);
- std::string sid = std::string(id);
- sel = (sid == achannel_id) ? "selected=\"selected\"" : "";
+ std::string _sid = std::string(id);
+ sel = (_sid == achannel_id) ? "selected=\"selected\"" : "";
sectionsd_getActualEPGServiceKey(channel->channel_id&0xFFFFFFFFFFFFULL, &epg);
sprintf(buf,"\n", channel->channel_id, sel.c_str(), channel->getName().c_str(),epg.title.c_str());
yresult += buf;
@@ -931,12 +931,12 @@ std::string CNeutrinoYParser::func_set_timer_form(CyhookHandler *hh, std::strin
{
if(i!=(int)CTimerd::TIMER_NEXTPROGRAM)
{
- std::string sel;
+ std::string _sel;
std::string zType = NeutrinoAPI->timerEventType2Str((CTimerd::CTimerEventTypes) i);
if(cmd != "new")
- sel = (i==(int)timer.eventType) ? "selected=\"selected\"" : "";
+ _sel = (i==(int)timer.eventType) ? "selected=\"selected\"" : "";
else
- sel = (i==(int)CTimerd::TIMER_RECORD) ? "selected=\"selected\"" : "";
+ _sel = (i==(int)CTimerd::TIMER_RECORD) ? "selected=\"selected\"" : "";
hh->ParamList["timertype"] +=
string_printf("\n",
- (*cit)->channel_id, sel.c_str(), (*cit)->getName().c_str());
+ (*cit)->channel_id, _sel.c_str(), (*cit)->getName().c_str());
}
cit = g_bouquetManager->radioChannelsBegin();
for (; !(cit.EndOfChannels()); cit++) {
- std::string sel = ((*cit)->channel_id == current_channel) ? "selected=\"selected\"" : "";
+ std::string _sel = ((*cit)->channel_id == current_channel) ? "selected=\"selected\"" : "";
hh->ParamList["program_row"] +=
string_printf("\n",
- (*cit)->channel_id, sel.c_str(), (*cit)->getName().c_str());
+ (*cit)->channel_id, _sel.c_str(), (*cit)->getName().c_str());
}
#if 0
// program row
diff --git a/src/timerd/timermanager.cpp b/src/timerd/timermanager.cpp
index e9c77ebbc..bdc24caa8 100644
--- a/src/timerd/timermanager.cpp
+++ b/src/timerd/timermanager.cpp
@@ -1025,11 +1025,11 @@ void CTimerEvent_Sleeptimer::fireEvent()
//=============================================================
// Standby Event
//=============================================================
-CTimerEvent_Standby::CTimerEvent_Standby( time_t announceTime, time_t alarmTime,
+CTimerEvent_Standby::CTimerEvent_Standby( time_t announce_Time, time_t alarm_Time,
bool sb_on,
CTimerd::CTimerEventRepeat evrepeat,
uint32_t repeatcount):
- CTimerEvent(CTimerd::TIMER_STANDBY, announceTime, alarmTime, (time_t) 0, evrepeat,repeatcount)
+ CTimerEvent(CTimerd::TIMER_STANDBY, announceTime, alarm_Time, (time_t) 0, evrepeat,repeatcount)
{
standby_on = sb_on;
}
@@ -1064,13 +1064,13 @@ void CTimerEvent_Standby::saveToConfig(CConfigFile *config)
//=============================================================
// Record Event
//=============================================================
-CTimerEvent_Record::CTimerEvent_Record(time_t announceTime, time_t alarmTime, time_t stopTime,
+CTimerEvent_Record::CTimerEvent_Record(time_t announce_Time, time_t alarm_Time, time_t stop_Time,
t_channel_id channel_id,
event_id_t epgID,
time_t epg_starttime, unsigned char apids,
CTimerd::CTimerEventRepeat evrepeat,
uint32_t repeatcount, const std::string recDir) :
- CTimerEvent(getEventType(), announceTime, alarmTime, stopTime, evrepeat, repeatcount)
+ CTimerEvent(getEventType(), announce_Time, alarm_Time, stop_Time, evrepeat, repeatcount)
{
eventInfo.epgID = epgID;
eventInfo.epg_starttime = epg_starttime;
@@ -1249,12 +1249,12 @@ void CTimerEvent_Zapto::getEpgId()
//=============================================================
// NextProgram Event
//=============================================================
-CTimerEvent_NextProgram::CTimerEvent_NextProgram(time_t announceTime, time_t alarmTime, time_t stopTime,
+CTimerEvent_NextProgram::CTimerEvent_NextProgram(time_t announce_Time, time_t alarm_Time, time_t stop_Time,
t_channel_id channel_id,
event_id_t epgID,
time_t epg_starttime, CTimerd::CTimerEventRepeat evrepeat,
uint32_t repeatcount) :
- CTimerEvent(CTimerd::TIMER_NEXTPROGRAM, announceTime, alarmTime, stopTime, evrepeat,repeatcount)
+ CTimerEvent(CTimerd::TIMER_NEXTPROGRAM, announce_Time, alarm_Time, stop_Time, evrepeat,repeatcount)
{
eventInfo.epgID = epgID;
eventInfo.epg_starttime = epg_starttime;
@@ -1328,12 +1328,12 @@ void CTimerEvent_NextProgram::Reschedule()
//=============================================================
// Remind Event
//=============================================================
-CTimerEvent_Remind::CTimerEvent_Remind(time_t announceTime,
- time_t alarmTime,
+CTimerEvent_Remind::CTimerEvent_Remind(time_t announce_Time,
+ time_t alarm_Time,
const char * const msg,
CTimerd::CTimerEventRepeat evrepeat,
uint32_t repeatcount) :
- CTimerEvent(CTimerd::TIMER_REMIND, announceTime, alarmTime, (time_t) 0, evrepeat,repeatcount)
+ CTimerEvent(CTimerd::TIMER_REMIND, announce_Time, alarm_Time, (time_t) 0, evrepeat,repeatcount)
{
memset(message, 0, sizeof(message));
strncpy(message, msg, sizeof(message)-1);
@@ -1371,12 +1371,12 @@ void CTimerEvent_Remind::saveToConfig(CConfigFile *config)
//=============================================================
// ExecPlugin Event
//=============================================================
-CTimerEvent_ExecPlugin::CTimerEvent_ExecPlugin(time_t announceTime,
- time_t alarmTime,
+CTimerEvent_ExecPlugin::CTimerEvent_ExecPlugin(time_t announce_Time,
+ time_t alarm_Time,
const char * const plugin,
CTimerd::CTimerEventRepeat evrepeat,
uint32_t repeatcount) :
- CTimerEvent(CTimerd::TIMER_EXEC_PLUGIN, announceTime, alarmTime, (time_t) 0, evrepeat,repeatcount)
+ CTimerEvent(CTimerd::TIMER_EXEC_PLUGIN, announce_Time, alarm_Time, (time_t) 0, evrepeat,repeatcount)
{
memset(name, 0, sizeof(name));
strncpy(name, plugin, sizeof(name)-1);
diff --git a/src/zapit/src/sdt.cpp b/src/zapit/src/sdt.cpp
index 8e652b086..7cefb24b9 100644
--- a/src/zapit/src/sdt.cpp
+++ b/src/zapit/src/sdt.cpp
@@ -158,8 +158,8 @@ int parse_sdt(
/* service_description_section elements */
unsigned short section_length;
- unsigned short transport_stream_id;
- unsigned short original_network_id;
+ unsigned short transport_stream_id = 0;
+ unsigned short original_network_id = 0;
unsigned short service_id;
unsigned short descriptors_loop_length;
unsigned short running_status;