From 6d64dfa1348f70dd27b702986de3aaecb2d07c9b Mon Sep 17 00:00:00 2001 From: Stefan Seyfried Date: Sun, 12 May 2013 17:26:00 +0200 Subject: [PATCH] neutrino/femanager: fix format string warnings --- src/neutrino.cpp | 2 +- src/zapit/src/femanager.cpp | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/neutrino.cpp b/src/neutrino.cpp index 86e2837bf..6bb208439 100644 --- a/src/neutrino.cpp +++ b/src/neutrino.cpp @@ -1356,7 +1356,7 @@ void CNeutrinoApp::channelsInit(bool bOnly) CBouquet* hdBouquet = new CBouquet(0, g_Locale->getText(LOCALE_BOUQUETNAME_HDTV), false, true); hdBouquet->channelList->SetChannelList(&zapitList); TVallList->Bouquets.push_back(hdBouquet); - printf("[neutrino] got %d HD channels\n", zapitList.size()); fflush(stdout); + printf("[neutrino] got %d HD channels\n", (int)zapitList.size()); fflush(stdout); } } /* new channels */ diff --git a/src/zapit/src/femanager.cpp b/src/zapit/src/femanager.cpp index 0b6f64096..68efab161 100644 --- a/src/zapit/src/femanager.cpp +++ b/src/zapit/src/femanager.cpp @@ -61,7 +61,7 @@ void CFeDmx::Lock(transponder_id_t id) { tpid = id; usecount++; - INFO("[dmx%d] lock, usecount %d tp %llx", num, usecount, tpid); + INFO("[dmx%d] lock, usecount %d tp %" PRIx64, num, usecount, tpid); } void CFeDmx::Unlock() @@ -70,7 +70,7 @@ void CFeDmx::Unlock() usecount--; else tpid = 0; - INFO("[dmx%d] unlock, usecount %d tp %llx", num, usecount, tpid); + INFO("[dmx%d] unlock, usecount %d tp %" PRIx64, num, usecount, tpid); } CFEManager * CFEManager::manager = NULL; @@ -566,7 +566,7 @@ CFrontend * CFEManager::getFrontend(CZapitChannel * channel) bool loop_busy = false; for (unsigned int i = 0; i < mfe->linkmap.size(); i++) { CFrontend * fe = mfe->linkmap[i]; - FEDEBUG("Check fe%d: mode %d locked %d freq %d TP %llx - channel freq %d TP %llx", fe->fenumber, fe->getMode(), + FEDEBUG("Check fe%d: mode %d locked %d freq %d TP %" PRIx64 " - channel freq %d TP %" PRIx64, fe->fenumber, fe->getMode(), fe->Locked(), fe->getFrequency(), fe->getTsidOnid(), channel->getFreqId(), channel->getTransponderId()); if(fe->Locked()) { @@ -598,7 +598,7 @@ CFrontend * CFEManager::getFrontend(CZapitChannel * channel) free_frontend = free_twin; } if (mfe->getMode() == CFrontend::FE_MODE_INDEPENDENT) { - FEDEBUG("Check fe%d: mode %d locked %d freq %d TP %llx - channel freq %d TP %llx", mfe->fenumber, mfe->getMode(), + FEDEBUG("Check fe%d: mode %d locked %d freq %d TP %" PRIx64 " - channel freq %d TP %" PRIx64, mfe->fenumber, mfe->getMode(), mfe->Locked(), mfe->getFrequency(), mfe->getTsidOnid(), channel->getFreqId(), channel->getTransponderId()); if(mfe->Locked()) { if(mfe->tuned && mfe->sameTsidOnid(channel->getTransponderId())) {