diff options
| -rw-r--r-- | pages/multischedule.ecpp | 6 | ||||
| -rw-r--r-- | po/fi_FI.po | 8 | ||||
| -rw-r--r-- | preload.cpp | 2 | ||||
| -rw-r--r-- | users.cpp | 3 |
4 files changed, 10 insertions, 9 deletions
diff --git a/pages/multischedule.ecpp b/pages/multischedule.ecpp index 39bf20a..f73bff6 100644 --- a/pages/multischedule.ecpp +++ b/pages/multischedule.ecpp @@ -167,7 +167,7 @@ pageTitle = tr("MultiSchedule"); } } - if ( channel >= channel_groups_numbers.size() ) + if ( channel >= (int)channel_groups_numbers.size() ) channel = 0; channel_group = channel; { @@ -282,7 +282,7 @@ pageTitle = tr("MultiSchedule"); std::list<SchedEntry> table[MAX_CHANNELS]; std::vector<std::string> channel_names(channel_groups_numbers[ channel ].size() ); std::vector<tChannelID> channel_IDs(channel_groups_numbers[ channel ].size() ); - if ( channel >= channel_groups_numbers.size() ) + if ( channel >= (int)channel_groups_numbers.size() ) channel = channel_groups_numbers.size()-1; //for ( int chan = 0; chan<MAX_CHANNELS; chan++) for ( unsigned int j = 0; j<channel_groups_numbers[ channel ].size(); j++) @@ -381,7 +381,7 @@ pageTitle = tr("MultiSchedule"); for ( unsigned int channel = 0; channel< channel_names.size() ; channel++) { </%cpp> - <td> <div class="boxheader"> <div> <div><$ StringEscapeAndBreak(channel_names[channel]) $> + <td> <div class="boxheader"> <div> <div><$ channel_names[channel] $> <# reply.sout() automatically escapes special characters to html entities #> <& pageelems.ajax_action_href action="switch_channel" tip=(tr("Switch to this channel.")) param=(channel_IDs[channel]) image="zap.png" alt="" &> <& pageelems.vlc_stream_channel channelId=(channel_IDs[channel]) &> </div></div> </div></td> diff --git a/po/fi_FI.po b/po/fi_FI.po index d9bc903..0911870 100644 --- a/po/fi_FI.po +++ b/po/fi_FI.po @@ -474,7 +474,7 @@ msgid "What's on?" msgstr "Menossa?" msgid "MultiSchedule" -msgstr "Ohjelmistot" +msgstr "Ohjelmaopas" msgid "Search" msgstr "Etsi" @@ -507,7 +507,7 @@ msgid "%A, %b %d %Y" msgstr "%A, %d.%m.%Y" msgid "Time" -msgstr "Kellonaika" +msgstr "Ajankohta" msgid "Switch to this channel." msgstr "Vaihda kanavalle" @@ -773,13 +773,13 @@ msgid "Format is HH:MM. Separate multiple times with a semicolon" msgstr "Käytä HH:MM formaattia ja erota ajankohdat puolipisteellä" msgid "Channel groups for MultiSchedule" -msgstr "Kanavaryhmät 'Ohjelmistot'-sivulle" +msgstr "Kanavaryhmät 'Ohjelmaopas'-sivulle" msgid "Separate channels with a comma ',', separate groups with a semi-colon ';'" msgstr "Käytä pilkkua erottimena kanaville ja puolipistettä kanavaryhmille" msgid "Duration of MultiSchedule in hours" -msgstr "'Ohjelmistot'-sivun kesto tunteina" +msgstr "'Ohjelmaopas'-sivun kesto tunteina" msgid "Show channels without EPG" msgstr "Näytä ohjelmaoppaattomat kanavat" diff --git a/preload.cpp b/preload.cpp index 83b282e..10e066e 100644 --- a/preload.cpp +++ b/preload.cpp @@ -111,6 +111,6 @@ namespace vdrlive { } i++; } - isyslog("LIVE: initial file cache has %d entries and needs %d bytes of data!", fc.count(), fc.weight()); + isyslog("LIVE: initial file cache has %zu entries and needs %zu bytes of data!", fc.count(), fc.weight()); } } @@ -100,7 +100,8 @@ bool cUser::Parse(const char *s) const char *cUser::ToText(void) { char* buffer = NULL; - asprintf(&buffer, "%d:%s:%s:%d", m_ID, m_Name.c_str(), m_PasswordMD5.c_str(), m_Userrights); + if (asprintf(&buffer, "%d:%s:%s:%d", m_ID, m_Name.c_str(), m_PasswordMD5.c_str(), m_Userrights) < 0) + return NULL; return buffer; } |