diff --git a/src/driver/record.cpp b/src/driver/record.cpp index a9f42398a..7aedd725d 100644 --- a/src/driver/record.cpp +++ b/src/driver/record.cpp @@ -731,7 +731,7 @@ void CRecordInstance::MakeExtFileName(CZapitChannel * channel, std::string &File std::string channel_name = channel->getName(); 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); StringReplace(FilenameTemplate,"%C",buf); } @@ -741,7 +741,7 @@ void CRecordInstance::MakeExtFileName(CZapitChannel * channel, std::string &File CShortEPGData epgdata; if(CEitManager::getInstance()->getEPGidShort(epgid, &epgdata)) { 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); StringReplace(FilenameTemplate,"%T",buf); } @@ -749,7 +749,7 @@ void CRecordInstance::MakeExtFileName(CZapitChannel * channel, std::string &File StringReplace(FilenameTemplate,"%T","no_title"); 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); StringReplace(FilenameTemplate,"%I",buf); } diff --git a/src/gui/components/cc_frm.cpp b/src/gui/components/cc_frm.cpp index fb4b3c779..3b4e6c3fe 100644 --- a/src/gui/components/cc_frm.cpp +++ b/src/gui/components/cc_frm.cpp @@ -251,7 +251,7 @@ int CComponentsForm::genIndex() CComponentsItem* CComponentsForm::getCCItem(const uint& cc_item_id) { 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; } diff --git a/src/nhttpd/tuxboxapi/controlapi.cpp b/src/nhttpd/tuxboxapi/controlapi.cpp index 586c51b39..90a6d2735 100644 --- a/src/nhttpd/tuxboxapi/controlapi.cpp +++ b/src/nhttpd/tuxboxapi/controlapi.cpp @@ -857,7 +857,7 @@ void CControlAPI::LogolistCGI(CyhookHandler *hh) if (pos < v.size()) continue; 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) { diff --git a/src/nhttpd/tuxboxapi/neutrinoyparser.cpp b/src/nhttpd/tuxboxapi/neutrinoyparser.cpp index c0522547c..c38776db3 100644 --- a/src/nhttpd/tuxboxapi/neutrinoyparser.cpp +++ b/src/nhttpd/tuxboxapi/neutrinoyparser.cpp @@ -383,7 +383,7 @@ std::string CNeutrinoYParser::func_get_bouquets_with_epg(CyhookHandler *hh, std: yresult += string_printf( "" - "" + "" "%s" "" "" @@ -531,7 +531,7 @@ std::string CNeutrinoYParser::func_get_logo_name(CyhookHandler *hh, std::string { if (hh->WebserverConfigList["Tuxbox.DisplayLogos"] == "true") { 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 ""; diff --git a/src/system/helpers.cpp b/src/system/helpers.cpp index a66f53e8c..8ff3fbd4a 100644 --- a/src/system/helpers.cpp +++ b/src/system/helpers.cpp @@ -30,6 +30,7 @@ #include #include #include +#include #include #include #include @@ -282,7 +283,7 @@ int check_dir(const char * dir, bool allow_tmp) ret = 0; // ok } 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; }