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

streamts: fix format-string warnings

Browse Source 
Origin commit data
------------------
Commit: 1a8f4de81e
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-04-27 (Sun, 27 Apr 2014)
This commit is contained in:
Stefan Seyfried
2014-04-27 19:26:51 +02:00
parent 6fa76f2532
commit b380c76a2e
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/driver/streamts.cpp
View File

@@ -133,7 +133,7 @@ bool CStreamInstance::Send(ssize_t r)
} }
} while ((count > 0) && (i-- > 0)); } while ((count > 0) && (i-- > 0));
if (count) if (count)
printf("send err, fd %d: (%d from %d)\n", *it, r-count, r); printf("send err, fd %d: (%zd from %zd)\n", *it, r-count, r);
} }
return true; return true;
} }
@@ -282,7 +282,7 @@ CFrontend * CStreamManager::FindFrontend(CZapitChannel * channel)
t_channel_id chid = channel->getChannelID(); t_channel_id chid = channel->getChannelID();
if (CRecordManager::getInstance()->RecordingStatus(chid)) { if (CRecordManager::getInstance()->RecordingStatus(chid)) {
printf("CStreamManager::Parse: channel %llx recorded, aborting..\n", chid); printf("CStreamManager::Parse: channel %" PRIx64 " recorded, aborting..\n", chid);
return frontend; return frontend;
} }
@@ -401,7 +401,7 @@ bool CStreamManager::Parse(int fd, stream_pids_t &pids, t_channel_id &chid, CFro
#else #else
t_channel_id tmpid; t_channel_id tmpid;
bp = &cbuf[5]; bp = &cbuf[5];
if (sscanf(bp, "id=%llx", &tmpid) == 1) { if (sscanf(bp, "id=%" SCNx64, &tmpid) == 1) {
channel = CServiceManager::getInstance()->FindChannel(tmpid); channel = CServiceManager::getInstance()->FindChannel(tmpid);
chid = tmpid; chid = tmpid;
} }
@@ -409,7 +409,7 @@ bool CStreamManager::Parse(int fd, stream_pids_t &pids, t_channel_id &chid, CFro
if (!channel) if (!channel)
return false; return false;
printf("CStreamManager::Parse: channel_id %llx [%s]\n", chid, channel->getName().c_str()); printf("CStreamManager::Parse: channel_id %" PRIx64 " [%s]\n", chid, channel->getName().c_str());
frontend = FindFrontend(channel); frontend = FindFrontend(channel);
if (!frontend) { if (!frontend) {
@@ -425,7 +425,7 @@ bool CStreamManager::Parse(int fd, stream_pids_t &pids, t_channel_id &chid, CFro
void CStreamManager::AddPids(int fd, CZapitChannel *channel, stream_pids_t &pids) void CStreamManager::AddPids(int fd, CZapitChannel *channel, stream_pids_t &pids)
{ {
if (pids.empty()) { if (pids.empty()) {
printf("CStreamManager::AddPids: no pids in url, using channel %llx pids\n", channel->getChannelID()); printf("CStreamManager::AddPids: no pids in url, using channel %" PRIx64 " pids\n", channel->getChannelID());
if (channel->getVideoPid()) if (channel->getVideoPid())
pids.insert(channel->getVideoPid()); pids.insert(channel->getVideoPid());
for (int i = 0; i < channel->getAudioChannelCount(); i++) for (int i = 0; i < channel->getAudioChannelCount(); i++)