mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-27 15:32:52 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix rest of shadow warnings

Browse Source 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@275 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Branch: ni/coolstream
Commit: 615258c0a3
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2010-02-06 (Sat, 06 Feb 2010)

Origin message was:
------------------
-fix rest of shadow warnings

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@275 e54a6e83-5905-42d5-8d5c-058d10e6a962


------------------
This commit was generated by Migit
This commit is contained in:
Jacek Jendrzej
2010-02-06 16:59:49 +00:00
parent 322a7e84ad
commit 1c9dea7fa5
5 changed files with 25 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/driver/pictureviewer/png.cpp
View File

@@ -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)) if (width * 3 != png_get_rowbytes(png_ptr, info_ptr))
{ {
printf("[png.cpp]: Error processing %s - please report (including image).\n", name); 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); fclose(fh);
return(FH_ERROR_FORMAT); return(FH_ERROR_FORMAT);
} }

1
src/gui/infoclock.cpp
View File

@@ -65,6 +65,7 @@ void* CInfoClock::TimerProc(void *arg)
show_dot = !show_dot; show_dot = !show_dot;
InfoClock->paintTime(show_dot); InfoClock->paintTime(show_dot);
} }
return 0;
} }
void CInfoClock::StartClock() void CInfoClock::StartClock()

18
src/nhttpd/tuxboxapi/neutrinoyparser.cpp
View File

@@ -300,8 +300,8 @@ std::string CNeutrinoYParser::func_get_channels_as_dropdown(CyhookHandler */*hh
CZapitChannel * channel = channels[j]; CZapitChannel * channel = channels[j];
char buf[100],id[20]; char buf[100],id[20];
sprintf(id,PRINTF_CHANNEL_ID_TYPE_NO_LEADING_ZEROS,channel->channel_id); sprintf(id,PRINTF_CHANNEL_ID_TYPE_NO_LEADING_ZEROS,channel->channel_id);
std::string sid = std::string(id); std::string _sid = std::string(id);
sel = (sid == achannel_id) ? "selected=\"selected\"" : ""; sel = (_sid == achannel_id) ? "selected=\"selected\"" : "";
sectionsd_getActualEPGServiceKey(channel->channel_id&0xFFFFFFFFFFFFULL, &epg); sectionsd_getActualEPGServiceKey(channel->channel_id&0xFFFFFFFFFFFFULL, &epg);
sprintf(buf,"<option value="PRINTF_CHANNEL_ID_TYPE_NO_LEADING_ZEROS" %s>%.20s - %.30s</option>\n", channel->channel_id, sel.c_str(), channel->getName().c_str(),epg.title.c_str()); sprintf(buf,"<option value="PRINTF_CHANNEL_ID_TYPE_NO_LEADING_ZEROS" %s>%.20s - %.30s</option>\n", channel->channel_id, sel.c_str(), channel->getName().c_str(),epg.title.c_str());
yresult += buf; yresult += buf;
@@ -931,12 +931,12 @@ std::string CNeutrinoYParser::func_set_timer_form(CyhookHandler *hh, std::strin
{ {
if(i!=(int)CTimerd::TIMER_NEXTPROGRAM) if(i!=(int)CTimerd::TIMER_NEXTPROGRAM)
{ {
std::string sel; std::string _sel;
std::string zType = NeutrinoAPI->timerEventType2Str((CTimerd::CTimerEventTypes) i); std::string zType = NeutrinoAPI->timerEventType2Str((CTimerd::CTimerEventTypes) i);
if(cmd != "new") if(cmd != "new")
sel = (i==(int)timer.eventType) ? "selected=\"selected\"" : ""; _sel = (i==(int)timer.eventType) ? "selected=\"selected\"" : "";
else else
sel = (i==(int)CTimerd::TIMER_RECORD) ? "selected=\"selected\"" : ""; _sel = (i==(int)CTimerd::TIMER_RECORD) ? "selected=\"selected\"" : "";
hh->ParamList["timertype"] += hh->ParamList["timertype"] +=
string_printf("<option value=\"%d\" %s>%s\n",i,sel.c_str(),zType.c_str()); string_printf("<option value=\"%d\" %s>%s\n",i,sel.c_str(),zType.c_str());
} }
@@ -978,21 +978,21 @@ std::string CNeutrinoYParser::func_set_timer_form(CyhookHandler *hh, std::strin
t_channel_id current_channel = (cmd == "new") ? live_channel_id /*NeutrinoAPI->Zapit->getCurrentServiceID()*/ : timer.channel_id; t_channel_id current_channel = (cmd == "new") ? live_channel_id /*NeutrinoAPI->Zapit->getCurrentServiceID()*/ : timer.channel_id;
CBouquetManager::ChannelIterator cit = g_bouquetManager->tvChannelsBegin(); CBouquetManager::ChannelIterator cit = g_bouquetManager->tvChannelsBegin();
for (; !(cit.EndOfChannels()); cit++) { 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"] += hh->ParamList["program_row"] +=
string_printf("<option value=\"" string_printf("<option value=\""
PRINTF_CHANNEL_ID_TYPE_NO_LEADING_ZEROS PRINTF_CHANNEL_ID_TYPE_NO_LEADING_ZEROS
"\" %s>%s</option>\n", "\" %s>%s</option>\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(); cit = g_bouquetManager->radioChannelsBegin();
for (; !(cit.EndOfChannels()); cit++) { 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"] += hh->ParamList["program_row"] +=
string_printf("<option value=\"" string_printf("<option value=\""
PRINTF_CHANNEL_ID_TYPE_NO_LEADING_ZEROS PRINTF_CHANNEL_ID_TYPE_NO_LEADING_ZEROS
"\" %s>%s</option>\n", "\" %s>%s</option>\n",
(*cit)->channel_id, sel.c_str(), (*cit)->getName().c_str()); (*cit)->channel_id, _sel.c_str(), (*cit)->getName().c_str());
} }
#if 0 #if 0
// program row // program row

24
src/timerd/timermanager.cpp
View File

@@ -1025,11 +1025,11 @@ void CTimerEvent_Sleeptimer::fireEvent()
//============================================================= //=============================================================
// Standby Event // 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, bool sb_on,
CTimerd::CTimerEventRepeat evrepeat, CTimerd::CTimerEventRepeat evrepeat,
uint32_t repeatcount): 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; standby_on = sb_on;
} }
@@ -1064,13 +1064,13 @@ void CTimerEvent_Standby::saveToConfig(CConfigFile *config)
//============================================================= //=============================================================
// Record Event // 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, t_channel_id channel_id,
event_id_t epgID, event_id_t epgID,
time_t epg_starttime, unsigned char apids, time_t epg_starttime, unsigned char apids,
CTimerd::CTimerEventRepeat evrepeat, CTimerd::CTimerEventRepeat evrepeat,
uint32_t repeatcount, const std::string recDir) : 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.epgID = epgID;
eventInfo.epg_starttime = epg_starttime; eventInfo.epg_starttime = epg_starttime;
@@ -1249,12 +1249,12 @@ void CTimerEvent_Zapto::getEpgId()
//============================================================= //=============================================================
// NextProgram Event // 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, t_channel_id channel_id,
event_id_t epgID, event_id_t epgID,
time_t epg_starttime, CTimerd::CTimerEventRepeat evrepeat, time_t epg_starttime, CTimerd::CTimerEventRepeat evrepeat,
uint32_t repeatcount) : 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.epgID = epgID;
eventInfo.epg_starttime = epg_starttime; eventInfo.epg_starttime = epg_starttime;
@@ -1328,12 +1328,12 @@ void CTimerEvent_NextProgram::Reschedule()
//============================================================= //=============================================================
// Remind Event // Remind Event
//============================================================= //=============================================================
CTimerEvent_Remind::CTimerEvent_Remind(time_t announceTime, CTimerEvent_Remind::CTimerEvent_Remind(time_t announce_Time,
time_t alarmTime, time_t alarm_Time,
const char * const msg, const char * const msg,
CTimerd::CTimerEventRepeat evrepeat, CTimerd::CTimerEventRepeat evrepeat,
uint32_t repeatcount) : 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)); memset(message, 0, sizeof(message));
strncpy(message, msg, sizeof(message)-1); strncpy(message, msg, sizeof(message)-1);
@@ -1371,12 +1371,12 @@ void CTimerEvent_Remind::saveToConfig(CConfigFile *config)
//============================================================= //=============================================================
// ExecPlugin Event // ExecPlugin Event
//============================================================= //=============================================================
CTimerEvent_ExecPlugin::CTimerEvent_ExecPlugin(time_t announceTime, CTimerEvent_ExecPlugin::CTimerEvent_ExecPlugin(time_t announce_Time,
time_t alarmTime, time_t alarm_Time,
const char * const plugin, const char * const plugin,
CTimerd::CTimerEventRepeat evrepeat, CTimerd::CTimerEventRepeat evrepeat,
uint32_t repeatcount) : 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)); memset(name, 0, sizeof(name));
strncpy(name, plugin, sizeof(name)-1); strncpy(name, plugin, sizeof(name)-1);

4
src/zapit/src/sdt.cpp
View File

@@ -158,8 +158,8 @@ int parse_sdt(
/* service_description_section elements */ /* service_description_section elements */
unsigned short section_length; unsigned short section_length;
unsigned short transport_stream_id; unsigned short transport_stream_id = 0;
unsigned short original_network_id; unsigned short original_network_id = 0;
unsigned short service_id; unsigned short service_id;
unsigned short descriptors_loop_length; unsigned short descriptors_loop_length;
unsigned short running_status; unsigned short running_status;