mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-28 07:51:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

some gcc5 compil fixes

Browse Source
This commit is contained in:
Jacek Jendrzej
2015-12-26 17:03:42 +01:00
parent 31f2f1275a
commit ddb3c15d4b
5 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/driver/record.cpp
View File

@@ -731,7 +731,7 @@ void CRecordInstance::MakeExtFileName(CZapitChannel * channel, std::string &File
std::string channel_name = channel->getName(); std::string channel_name = channel->getName();
if (!(channel_name.empty())) { if (!(channel_name.empty())) {
snprintf(buf, sizeof(buf), UTF8_TO_FILESYSTEM_ENCODING(channel_name.c_str())); snprintf(buf, sizeof(buf),"%s", UTF8_TO_FILESYSTEM_ENCODING(channel_name.c_str()));
ZapitTools::replace_char(buf); ZapitTools::replace_char(buf);
StringReplace(FilenameTemplate,"%C",buf); StringReplace(FilenameTemplate,"%C",buf);
} }
@@ -741,7 +741,7 @@ void CRecordInstance::MakeExtFileName(CZapitChannel * channel, std::string &File
CShortEPGData epgdata; CShortEPGData epgdata;
if(CEitManager::getInstance()->getEPGidShort(epgid, &epgdata)) { if(CEitManager::getInstance()->getEPGidShort(epgid, &epgdata)) {
if (!(epgdata.title.empty())) { if (!(epgdata.title.empty())) {
snprintf(buf, sizeof(buf), epgdata.title.c_str()); snprintf(buf, sizeof(buf),"%s", epgdata.title.c_str());
ZapitTools::replace_char(buf); ZapitTools::replace_char(buf);
StringReplace(FilenameTemplate,"%T",buf); StringReplace(FilenameTemplate,"%T",buf);
} }
@@ -749,7 +749,7 @@ void CRecordInstance::MakeExtFileName(CZapitChannel * channel, std::string &File
StringReplace(FilenameTemplate,"%T","no_title"); StringReplace(FilenameTemplate,"%T","no_title");
if (!(epgdata.info1.empty())) { if (!(epgdata.info1.empty())) {
snprintf(buf, sizeof(buf), epgdata.info1.c_str()); snprintf(buf, sizeof(buf),"%s", epgdata.info1.c_str());
ZapitTools::replace_char(buf); ZapitTools::replace_char(buf);
StringReplace(FilenameTemplate,"%I",buf); StringReplace(FilenameTemplate,"%I",buf);
} }

2
src/gui/components/cc_frm.cpp
View File

@@ -251,7 +251,7 @@ int CComponentsForm::genIndex()
CComponentsItem* CComponentsForm::getCCItem(const uint& cc_item_id) CComponentsItem* CComponentsForm::getCCItem(const uint& cc_item_id)
{ {
if (cc_item_id >= size()){ if (cc_item_id >= size()){
dprintf(DEBUG_NORMAL, "[CComponentsForm] [%s - %d] Error: parameter cc_item_id = %u, out of range (size = %u)...\n", __func__, __LINE__, cc_item_id, size()); dprintf(DEBUG_NORMAL, "[CComponentsForm] [%s - %d] Error: parameter cc_item_id = %u, out of range (size = %" PRIx64")...\n", __func__, __LINE__, cc_item_id, size());
return NULL; return NULL;
} }

2
src/nhttpd/tuxboxapi/controlapi.cpp
View File

@@ -857,7 +857,7 @@ void CControlAPI::LogolistCGI(CyhookHandler *hh)
if (pos < v.size()) if (pos < v.size())
continue; continue;
v.push_back(channel->getChannelID()); v.push_back(channel->getChannelID());
result += string_printf(PRINTF_CHANNEL_ID_TYPE_NO_LEADING_ZEROS";%s;"PRINTF_CHANNEL_ID_TYPE_NO_LEADING_ZEROS"", channel->getChannelID(), channel->getName().c_str(), (channel->getChannelID() & 0xFFFFFFFFFFFFULL)); result += string_printf(PRINTF_CHANNEL_ID_TYPE_NO_LEADING_ZEROS";%s;" PRINTF_CHANNEL_ID_TYPE_NO_LEADING_ZEROS"", channel->getChannelID(), channel->getName().c_str(), (channel->getChannelID() & 0xFFFFFFFFFFFFULL));
if (hh->ParamList["1"].compare("files") == 0) if (hh->ParamList["1"].compare("files") == 0)
{ {

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

@@ -383,7 +383,7 @@ std::string CNeutrinoYParser::func_get_bouquets_with_epg(CyhookHandler *hh, std:
yresult += string_printf( yresult += string_printf(
"<td class=\"%c logo_cell %s\" width=\"44\" rowspan=\"2\">" "<td class=\"%c logo_cell %s\" width=\"44\" rowspan=\"2\">"
"<a href=\"javascript:do_zap('"PRINTF_CHANNEL_ID_TYPE_NO_LEADING_ZEROS"')\">" "<a href=\"javascript:do_zap('" PRINTF_CHANNEL_ID_TYPE_NO_LEADING_ZEROS"')\">"
"%s" "%s"
"</a>" "</a>"
"</td>" "</td>"
@@ -531,7 +531,7 @@ std::string CNeutrinoYParser::func_get_logo_name(CyhookHandler *hh, std::string
{ {
if (hh->WebserverConfigList["Tuxbox.DisplayLogos"] == "true") { if (hh->WebserverConfigList["Tuxbox.DisplayLogos"] == "true") {
t_channel_id cid; t_channel_id cid;
if (1 == sscanf(channelId.c_str(), "%llx", &cid)) if (1 == sscanf(channelId.c_str(), "%" PRIx64, &cid))
return NeutrinoAPI->getLogoFile(hh->WebserverConfigList["Tuxbox.LogosURL"], cid); return NeutrinoAPI->getLogoFile(hh->WebserverConfigList["Tuxbox.LogosURL"], cid);
} }
return ""; return "";

3
src/system/helpers.cpp
View File

@@ -30,6 +30,7 @@
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <unistd.h> #include <unistd.h>
#include <inttypes.h>
#include <sys/wait.h> #include <sys/wait.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <sys/types.h> #include <sys/types.h>
@@ -282,7 +283,7 @@ int check_dir(const char * dir, bool allow_tmp)
ret = 0; // ok ret = 0; // ok
} }
if(ret == -1) if(ret == -1)
printf("Wrong Filessystem Type: 0x%x\n",s.f_type); printf("Wrong Filessystem Type: 0x%" PRIx64"\n",s.f_type);
} }
return ret; return ret;
} }