From e0acbd3ddb39051bda05ea9c298adb7a900d5795 Mon Sep 17 00:00:00 2001 From: Stefan Seyfried Date: Sat, 3 Nov 2012 13:56:26 +0100 Subject: [PATCH] neutrino: fix 32<->64bit format string warnings use portable C99 format string macros for 64bit types to fix many warnings when compiling for 64bit architectures, add some (int) casts for size_t --- src/Makefile.am | 2 +- src/daemonc/Makefile.am | 2 +- src/daemonc/remotecontrol.cpp | 2 +- src/driver/Makefile.am | 2 +- src/driver/netfile.cpp | 4 +- src/driver/rcinput.cpp | 10 +-- src/driver/record.cpp | 46 +++++----- src/eitd/Makefile.am | 2 +- src/eitd/SIevents.cpp | 3 +- src/eitd/dmx.cpp | 3 +- src/eitd/sectionsd.cpp | 48 +++++------ src/eitd/xmlutil.cpp | 6 +- src/gui/Makefile.am | 2 +- src/gui/cam_menu.cpp | 3 +- src/gui/channellist.cpp | 10 +-- src/gui/epgview.cpp | 12 +-- src/gui/filebrowser.cpp | 12 +-- src/gui/hdd_menu.cpp | 12 +-- src/gui/moviebrowser.cpp | 83 +++++++++---------- src/gui/movieinfo.cpp | 14 ++-- src/gui/scan.cpp | 12 +-- src/gui/scan_setup.cpp | 2 +- src/gui/zapit_setup.cpp | 6 +- src/neutrino.cpp | 18 ++-- src/nhttpd/tuxboxapi/coolstream/Makefile.am | 2 +- .../tuxboxapi/coolstream/controlapi.cpp | 4 +- src/system/helpers.cpp | 2 +- src/timerd/Makefile.am | 2 +- src/timerd/timermanager.cpp | 10 ++- src/zapit/include/zapit/types.h | 8 +- src/zapit/src/Makefile.am | 2 +- src/zapit/src/bouquets.cpp | 4 +- src/zapit/src/capmt.cpp | 5 +- src/zapit/src/femanager.cpp | 9 +- src/zapit/src/frontend.cpp | 6 +- src/zapit/src/getservices.cpp | 12 +-- src/zapit/src/pzapit.cpp | 10 +-- src/zapit/src/scan.cpp | 12 +-- src/zapit/src/scanbat.cpp | 6 +- src/zapit/src/transponder.cpp | 7 +- src/zapit/src/zapit.cpp | 24 +++--- 41 files changed, 208 insertions(+), 233 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 378806373..e646660ec 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,4 +1,4 @@ -AM_CXXFLAGS = -fno-rtti -fno-exceptions +AM_CXXFLAGS = -fno-rtti -fno-exceptions -D__STDC_FORMAT_MACROS SUBDIRS = zapit gui daemonc driver system eitd timerd nhttpd diff --git a/src/daemonc/Makefile.am b/src/daemonc/Makefile.am index b57f8f2e5..c8a0d85e5 100644 --- a/src/daemonc/Makefile.am +++ b/src/daemonc/Makefile.am @@ -1,4 +1,4 @@ -AM_CPPFLAGS = -fno-rtti -fno-exceptions +AM_CPPFLAGS = -fno-rtti -fno-exceptions -D__STDC_FORMAT_MACROS INCLUDES = \ -I$(top_builddir) \ diff --git a/src/daemonc/remotecontrol.cpp b/src/daemonc/remotecontrol.cpp index f22ee3d38..5d55163c4 100644 --- a/src/daemonc/remotecontrol.cpp +++ b/src/daemonc/remotecontrol.cpp @@ -332,7 +332,7 @@ int CRemoteControl::handleMsg(const neutrino_msg_t msg, neutrino_msg_data_t data #endif else if (msg == NeutrinoMessages::EVT_TUNE_COMPLETE) { t_channel_id chid = *(t_channel_id *)data; -printf("CRemoteControl::handleMsg: EVT_TUNE_COMPLETE (%016llx)\n", chid); +printf("CRemoteControl::handleMsg: EVT_TUNE_COMPLETE (%016" PRIx64 ")\n", chid); if(chid) g_Sectionsd->setServiceChanged( chid, true ); else diff --git a/src/driver/Makefile.am b/src/driver/Makefile.am index 65db01cc5..0f6ed16c5 100644 --- a/src/driver/Makefile.am +++ b/src/driver/Makefile.am @@ -1,4 +1,4 @@ -AM_CXXFLAGS = -fno-rtti -fno-exceptions +AM_CXXFLAGS = -fno-rtti -fno-exceptions -D__STDC_FORMAT_MACROS SUBDIRS = pictureviewer audiodec diff --git a/src/driver/netfile.cpp b/src/driver/netfile.cpp index 3a235e3fa..ae92ff3ef 100644 --- a/src/driver/netfile.cpp +++ b/src/driver/netfile.cpp @@ -2,6 +2,8 @@ | Neutrino-GUI - DBoxII-Project | | Copyright (C) 2004 by Sanaia +| Copyright (C) 2010-2012 Stefan Seyfried +| | netfile - remote file access mapper | | @@ -400,7 +402,7 @@ int request_file(URL *url) /* if we have a entity, announce it to the server */ if(url->entity[0]) { - snprintf(str, sizeof(str)-1, "Content-Length: %d\r\n", strlen(url->entity)); + snprintf(str, sizeof(str)-1, "Content-Length: %d\r\n", (int)strlen(url->entity)); dprintf(stderr, "> %s", str); send(url->fd, str, strlen(str), 0); } diff --git a/src/driver/rcinput.cpp b/src/driver/rcinput.cpp index 1b5e32a60..6876fbafe 100644 --- a/src/driver/rcinput.cpp +++ b/src/driver/rcinput.cpp @@ -4,13 +4,7 @@ Copyright (C) 2001 Steffen Hehn 'McClean' 2003 thegoodguy - Kommentar: - - Diese GUI wurde von Grund auf neu programmiert und sollte nun vom - Aufbau und auch den Ausbaumoeglichkeiten gut aussehen. Neutrino basiert - auf der Client-Server Idee, diese GUI ist also von der direkten DBox- - Steuerung getrennt. Diese wird dann von Daemons uebernommen. - + Copyright (C) 2008-2012 Stefan Seyfried License: GPL @@ -924,7 +918,7 @@ void CRCInput::getMsg_us(neutrino_msg_t * msg, neutrino_msg_data_t * data, uint6 p = new unsigned char[sizeof(int64_t)]; *(int64_t*) p = timeNew - timeOld; #endif - printf("[neutrino] CSectionsdClient::EVT_TIMESET: timediff %lld\n", *(int64_t*) p); + printf("[neutrino] CSectionsdClient::EVT_TIMESET: timediff %" PRId64 "\n", *(int64_t*) p); /* FIXME what this code really do ? */ if ((int64_t)last_keypress > *(int64_t*)p) last_keypress += *(int64_t *)p; diff --git a/src/driver/record.cpp b/src/driver/record.cpp index 3c45dd4b1..9fdb848bb 100644 --- a/src/driver/record.cpp +++ b/src/driver/record.cpp @@ -3,7 +3,7 @@ Copyright (C) 2001 Steffen Hehn 'McClean' Copyright (C) 2011 CoolStream International Ltd - Copyright (C) 2011 Stefan Seyfried + Copyright (C) 2011-2012 Stefan Seyfried License: GPLv2 @@ -220,7 +220,7 @@ bool CRecordInstance::Stop(bool remove_event) CHintBox hintBox(LOCALE_MESSAGEBOX_INFO, rec_stop_msg.c_str()); hintBox.paint(); - printf("%s: channel %llx recording_id %d\n", __FUNCTION__, channel_id, recording_id); + printf("%s: channel %" PRIx64 " recording_id %d\n", __func__, channel_id, recording_id); SaveXml(); /* Stop do close fd - if started */ record->Stop(); @@ -255,7 +255,7 @@ bool CRecordInstance::Update() CZapitChannel * channel = CServiceManager::getInstance()->FindChannel(channel_id); if(channel == NULL) { - printf("%s: channel %llx not found!\n", __FUNCTION__, channel_id); + printf("%s: channel %" PRIx64 " not found!\n", __func__, channel_id); return false; } @@ -383,10 +383,10 @@ record_error_msg_t CRecordInstance::Record() { APIDList apid_list; - printf("%s: channel %llx recording_id %d\n", __FUNCTION__, channel_id, recording_id); + printf("%s: channel %" PRIx64 " recording_id %d\n", __func__, channel_id, recording_id); CZapitChannel * channel = CServiceManager::getInstance()->FindChannel(channel_id); if(channel == NULL) { - printf("%s: channel %llx not found!\n", __FUNCTION__, channel_id); + printf("%s: channel %" PRIx64 " not found!\n", __func__, channel_id); return RECORD_INVALID_CHANNEL; } @@ -414,7 +414,7 @@ record_error_msg_t CRecordInstance::Record() } } recording_id = g_Timerd->addImmediateRecordTimerEvent(channel_id, now, record_end, epgid, epg_time, apidmode); - printf("%s: channel %llx -> timer eventID %d\n", __FUNCTION__, channel_id, recording_id); + printf("%s: channel %" PRIx64 " -> timer eventID %d\n", __func__, channel_id, recording_id); } return ret; } @@ -646,7 +646,7 @@ void CRecordInstance::GetRecordString(std::string &str) { CZapitChannel * channel = CServiceManager::getInstance()->FindChannel(channel_id); if(channel == NULL) { - printf("%s: channel %llx not found!\n", __FUNCTION__, channel_id); + printf("%s: channel %" PRIx64 " not found!\n", __func__, channel_id); str = "Unknown channel : " + GetEpgTitle(); return; } @@ -838,7 +838,7 @@ bool CRecordManager::Record(const CTimerd::RecordingInfo * const eventinfo, cons * neutrino check if this channel_id already recording, may be not needed */ bool direct_record = timeshift || strlen(eventinfo->recordingDir) == 0; - printf("%s channel_id %llx epg: %llx, apidmode 0x%X\n", __FUNCTION__, + printf("%s channel_id %" PRIx64 " epg: %" PRIx64 ", apidmode 0x%X\n", __func__, eventinfo->channel_id, eventinfo->epgID, eventinfo->apids); #if 0 @@ -896,7 +896,7 @@ bool CRecordManager::Record(const CTimerd::RecordingInfo * const eventinfo, cons } } else if(!direct_record) { CTimerd::RecordingInfo * evt = new CTimerd::RecordingInfo(*eventinfo); - printf("%s add %llx : %s to pending\n", __FUNCTION__, evt->channel_id, evt->epgTitle); + printf("%s add %" PRIx64 " : %s to pending\n", __func__, evt->channel_id, evt->epgTitle); nextmap.push_back((CTimerd::RecordingInfo *)evt); } } else @@ -977,7 +977,7 @@ bool CRecordManager::CheckRecording(const CTimerd::RecordingInfo * const eventin void CRecordManager::StartNextRecording() { CTimerd::RecordingInfo * eventinfo = NULL; - printf("%s: pending count %d\n", __FUNCTION__, nextmap.size()); + printf("%s: pending count %d\n", __func__, (int)nextmap.size()); for(nextmap_iterator_t it = nextmap.begin(); it != nextmap.end(); it++) { eventinfo = *it; @@ -1078,7 +1078,7 @@ void CRecordManager::StopInstance(CRecordInstance * inst, bool remove_event) bool CRecordManager::Stop(const t_channel_id channel_id) { - printf("%s: %llx\n", __FUNCTION__, channel_id); + printf("%s: %" PRIx64 "\n", __func__, channel_id); mutex.lock(); @@ -1087,7 +1087,7 @@ bool CRecordManager::Stop(const t_channel_id channel_id) if(inst != NULL) StopInstance(inst); else - printf("%s: channel %llx not recording\n", __FUNCTION__, channel_id); + printf("%s: channel %" PRIx64 " not recording\n", __func__, channel_id); mutex.unlock(); @@ -1104,7 +1104,7 @@ bool CRecordManager::IsRecording(const CTimerd::RecordingStopInfo * recinfo) if(inst != NULL && recinfo->eventID == inst->GetRecordingId()) ret = true; mutex.unlock(); - printf("[%s] eventID: %d, channel_id: 0x%llx, ret: %d\n", __FUNCTION__, recinfo->eventID, recinfo->channel_id, ret); + printf("[%s] eventID: %d, channel_id: 0x%" PRIx64 ", ret: %d\n", __func__, recinfo->eventID, recinfo->channel_id, ret); return ret; } @@ -1112,7 +1112,7 @@ bool CRecordManager::Stop(const CTimerd::RecordingStopInfo * recinfo) { bool ret = false; - printf("%s: eventID %d channel_id %llx\n", __FUNCTION__, recinfo->eventID, recinfo->channel_id); + printf("%s: eventID %d channel_id %" PRIx64 "\n", __func__, recinfo->eventID, recinfo->channel_id); mutex.lock(); @@ -1123,7 +1123,7 @@ bool CRecordManager::Stop(const CTimerd::RecordingStopInfo * recinfo) } else { for(nextmap_iterator_t it = nextmap.begin(); it != nextmap.end(); it++) { if((*it)->eventID == recinfo->eventID) { - printf("%s: removing pending eventID %d channel_id %llx\n", __FUNCTION__, recinfo->eventID, recinfo->channel_id); + printf("%s: removing pending eventID %d channel_id %" PRIx64 "\n", __func__, recinfo->eventID, recinfo->channel_id); /* Note: CTimerd::RecordingInfo is a class! => typecast to avoid destructor call */ delete[] (unsigned char *) (*it); nextmap.erase(it); @@ -1133,7 +1133,7 @@ bool CRecordManager::Stop(const CTimerd::RecordingStopInfo * recinfo) } } if(!ret) - printf("%s: eventID %d channel_id %llx : not found\n", __FUNCTION__, recinfo->eventID, recinfo->channel_id); + printf("%s: eventID %d channel_id %" PRIx64 " : not found\n", __func__, recinfo->eventID, recinfo->channel_id); mutex.unlock(); @@ -1159,7 +1159,7 @@ bool CRecordManager::Update(const t_channel_id channel_id) if(inst != NULL) inst->Update(); else - printf("%s: channel %llx not recording\n", __FUNCTION__, channel_id); + printf("%s: channel %" PRIx64 " not recording\n", __func__, channel_id); mutex.unlock(); return (inst != NULL); @@ -1323,7 +1323,7 @@ int CRecordManager::exec(CMenuTarget* parent, const std::string & actionKey ) snprintf(rec_msg, sizeof(rec_msg)-1, rec_msg1, records-i, records); inst->SetStopMessage(rec_msg); - printf("CRecordManager::exec(ExitAll line %d) found channel %llx recording_id %d\n", __LINE__, channel_id, inst->GetRecordingId()); + printf("CRecordManager::exec(ExitAll line %d) found channel %" PRIx64 " recording_id %d\n", __LINE__, channel_id, inst->GetRecordingId()); g_Timerd->stopTimerEvent(inst->GetRecordingId()); i++; } @@ -1461,7 +1461,7 @@ bool CRecordManager::ShowMenu(void) mutex.lock(); CRecordInstance * inst = FindInstanceID(recording_ids[select]); if(inst == NULL || recording_ids[select] != inst->GetRecordingId()) { - printf("%s: channel %llx event id %d not found\n", __FUNCTION__, channel_ids[select], recording_ids[select]); + printf("%s: channel %" PRIx64 " event id %d not found\n", __func__, channel_ids[select], recording_ids[select]); mutex.unlock(); return false; } @@ -1558,7 +1558,7 @@ bool CRecordManager::CutBackNeutrino(const t_channel_id channel_id, CFrontend * int mode = channel->getServiceType() != ST_DIGITAL_RADIO_SOUND_SERVICE ? NeutrinoMessages::mode_tv : NeutrinoMessages::mode_radio; - printf("%s channel_id %llx mode %d\n", __FUNCTION__, channel_id, mode); + printf("%s channel_id %" PRIx64 " mode %d\n", __func__, channel_id, mode); last_mode = CNeutrinoApp::getInstance()->getMode(); if(last_mode == NeutrinoMessages::mode_standby && recmap.empty()) { @@ -1591,7 +1591,7 @@ bool CRecordManager::CutBackNeutrino(const t_channel_id channel_id, CFrontend * bool found = (live_fe != frontend) || SAME_TRANSPONDER(live_channel_id, channel_id); if(found) { ret = g_Zapit->zapTo_record(channel_id) > 0; - printf("%s found same tp, zapTo_record channel_id %llx result %d\n", __FUNCTION__, channel_id, ret); + printf("%s found same tp, zapTo_record channel_id %" PRIx64 " result %d\n", __func__, channel_id, ret); } else { printf("%s mode %d last_mode %d getLastMode %d\n", __FUNCTION__, mode, last_mode, CNeutrinoApp::getInstance()->getLastMode()); @@ -1602,7 +1602,7 @@ bool CRecordManager::CutBackNeutrino(const t_channel_id channel_id, CFrontend * } ret = g_Zapit->zapTo_serviceID(channel_id) > 0; - printf("%s zapTo_serviceID channel_id %llx result %d\n", __FUNCTION__, channel_id, ret); + printf("%s zapTo_serviceID channel_id %" PRIx64 " result %d\n", __func__, channel_id, ret); } if (unlock) CFEManager::getInstance()->unlockFrontend(live_fe); @@ -1626,7 +1626,7 @@ bool CRecordManager::CutBackNeutrino(const t_channel_id channel_id, CFrontend * } else if(!ret && mode_changed /*mode != last_mode*/) CNeutrinoApp::getInstance()->handleMsg( NeutrinoMessages::CHANGEMODE , last_mode); - printf("%s channel_id %llx mode %d : result %s\n", __FUNCTION__, channel_id, mode, ret ? "OK" : "BAD"); + printf("%s channel_id %" PRIx64 " mode %d : result %s\n", __func__, channel_id, mode, ret ? "OK" : "BAD"); return ret; } diff --git a/src/eitd/Makefile.am b/src/eitd/Makefile.am index 069f70709..a46c10156 100644 --- a/src/eitd/Makefile.am +++ b/src/eitd/Makefile.am @@ -21,7 +21,7 @@ endif endif #AM_CPPFLAGS = -AM_CPPFLAGS = -fno-rtti -fno-exceptions +AM_CPPFLAGS = -fno-rtti -fno-exceptions -D__STDC_FORMAT_MACROS noinst_LIBRARIES = libsectionsd.a libsectionsd_a_SOURCES = \ diff --git a/src/eitd/SIevents.cpp b/src/eitd/SIevents.cpp index 78e60f5b6..ec788b0e7 100644 --- a/src/eitd/SIevents.cpp +++ b/src/eitd/SIevents.cpp @@ -5,6 +5,7 @@ * Homepage: http://dbox2.elxsi.de * * Copyright (C) 2011-2012 CoolStream International Ltd + * Copyright (C) 2008, 2012 Stefan Seyfried * * License: GPLv2 * @@ -521,7 +522,7 @@ int SIevent::saveXML2(FILE *file) const void SIevent::dump(void) const { - printf("Unique key: %llx\n", uniqueKey()); + printf("Unique key: %" PRIx64 "\n", uniqueKey()); if(original_network_id) printf("Original-Network-ID: %hu\n", original_network_id); if (service_id) diff --git a/src/eitd/dmx.cpp b/src/eitd/dmx.cpp index 6097b0691..ee75a6e05 100644 --- a/src/eitd/dmx.cpp +++ b/src/eitd/dmx.cpp @@ -5,6 +5,7 @@ * 2003 by thegoodguy * * Copyright (C) 2011-2012 CoolStream International Ltd + * Copyright (C) 2007-2009, 2011-2012 Stefan Seyfried * * License: GPLv2 * @@ -239,7 +240,7 @@ printf(" [%s cache] old section for table 0x%02x sid 0x%04x section 0x%02x last #endif if(seenSections == calcedSections) { #ifdef DEBUG_COMPLETE - xcprintf(" %s cache %02x complete: %d", name.c_str(), filters[filter_index].filter, seenSections.size()); + xcprintf(" %s cache %02x complete: %d", name.c_str(), filters[filter_index].filter, (int)seenSections.size()); #endif /* FIXME this algo fail sometimes: * [cnThread cache] new section for table 0x4e sid 0x0a39 section 0x00 last 0x00 slast 0x00 seen 1 calc 1 diff --git a/src/eitd/sectionsd.cpp b/src/eitd/sectionsd.cpp index 787c3cd88..1464f16b0 100644 --- a/src/eitd/sectionsd.cpp +++ b/src/eitd/sectionsd.cpp @@ -272,12 +272,12 @@ static bool deleteEvent(const event_id_t uniqueKey) } if (cn) { // current-next => fill current or next event... -//xprintf("addEvent: current %016llx event %016llx messaging_got_CN %d\n", messaging_current_servicekey, evt.get_channel_id(), messaging_got_CN); +//xprintf("addEvent: current %016" PRIx64 " event %016" PRIx64 " messaging_got_CN %d\n", messaging_current_servicekey, evt.get_channel_id(), messaging_got_CN); readLockMessaging(); // only if it is the current channel... and if we don't have them already. if (evt.get_channel_id() == messaging_current_servicekey && (messaging_got_CN != 0x03)) { -xprintf("addEvent: current %016llx event %016llx running %d messaging_got_CN %d\n", messaging_current_servicekey, evt.get_channel_id(), evt.runningStatus(), messaging_got_CN); +xprintf("addEvent: current %016" PRIx64 " event %016" PRIx64 " running %d messaging_got_CN %d\n", messaging_current_servicekey, evt.get_channel_id(), evt.runningStatus(), messaging_got_CN); unlockMessaging(); writeLockEvents(); @@ -335,7 +335,7 @@ xprintf("addEvent: current %016llx event %016llx running %d messaging_got_CN %d\ { /* if the new event has a lower (== more recent) table ID, replace the old one */ already_exists = false; - dprintf("replacing event %016llx:%02x with %04x:%02x '%.40s'\n", si->second->uniqueKey(), + dprintf("replacing event %016" PRIx64 ":%02x with %04x:%02x '%.40s'\n", si->second->uniqueKey(), si->second->table_id, evt.eventID, evt.table_id, evt.getName().c_str()); } else if (already_exists && ( (evt.table_id == 0x51 || evt.table_id == 0x50 || evt.table_id == 0x4e) && evt.table_id == si->second->table_id && evt.version != si->second->version )) @@ -436,7 +436,7 @@ xprintf("addEvent: current %016llx event %016llx running %d messaging_got_CN %d\ if ((*x)->times.begin()->startzeit + (long)(*x)->times.begin()->dauer <= start_time) break; /* here we have an overlapping event */ - dprintf("%s: delete 0x%016llx.%02x time = 0x%016llx.%02x\n", __func__, + dprintf("%s: delete 0x%016" PRIx64 ".%02x time = 0x%016" PRIx64 ".%02x\n", __func__, x_key, (*x)->table_id, e_key, e->table_id); to_delete.push_back(x_key); } @@ -1302,7 +1302,7 @@ void CTimeThread::setSystemTime(time_t tim) gettimeofday(&tv, NULL); timediff = (int64_t)tim * (int64_t)1000000 - (tv.tv_usec + tv.tv_sec * (int64_t)1000000); - xprintf("%s: timediff %lld, current: %02d.%02d.%04d %02d:%02d:%02d, dvb: %s", name.c_str(), timediff, + xprintf("%s: timediff %" PRId64 ", current: %02d.%02d.%04d %02d:%02d:%02d, dvb: %s", name.c_str(), timediff, tmTime->tm_mday, tmTime->tm_mon+1, tmTime->tm_year+1900, tmTime->tm_hour, tmTime->tm_min, tmTime->tm_sec, ctime(&tim)); @@ -1344,7 +1344,7 @@ void CTimeThread::run() real_pause(); int rs = Sleep(); #ifdef DEBUG_TIME_THREAD - xprintf("%s: wakeup, running %d scanning %d channel %llx reason %d\n", + xprintf("%s: wakeup, running %d scanning %d channel %" PRIx64 " reason %d\n", name.c_str(), running, scanning, current_service, rs); #endif } while (running && !scanning); @@ -1491,7 +1491,7 @@ void CSectionThread::run() if (timeoutsDMX < 0 || timeoutsDMX >= skipTimeouts) { #ifdef DEBUG_SECTION_THREADS xprintf("%s: skipping to next filter %d from %d (timeouts %d)\n", - name.c_str(), filter_index+1, filters.size(), timeoutsDMX); + name.c_str(), filter_index+1, (int)filters.size(), timeoutsDMX); #endif timeoutsDMX = 0; need_change = true; @@ -1499,7 +1499,7 @@ void CSectionThread::run() if (zeit > lastChanged + skipTime) { #ifdef DEBUG_SECTION_THREADS xprintf("%s: skipping to next filter %d from %d (seconds %d)\n", - name.c_str(), filter_index+1, filters.size(), (int) (zeit - lastChanged)); + name.c_str(), filter_index+1, (int)filters.size(), (int)(zeit - lastChanged)); #endif need_change = true; } @@ -1525,7 +1525,7 @@ bool CEventsThread::addEvents() if (!eit.is_parsed()) return false; - dprintf("[%s] adding %d events (begin)\n", name.c_str(), eit.events().size()); + dprintf("[%s] adding %d events (begin)\n", name.c_str(), (int)eit.events().size()); time_t zeit = time(NULL); for (SIevents::const_iterator e = eit.events().begin(); e != eit.events().end(); ++e) { @@ -1645,7 +1645,7 @@ void CCNThread::addFilters() void CCNThread::beforeWait() { - xprintf("%s: set eit update filter, service = 0x%016llx, current version 0x%x got events %d (%s)\n", + xprintf("%s: set eit update filter, service = 0x%016" PRIx64 ", current version 0x%x got events %d (%s)\n", name.c_str(), messaging_current_servicekey, eit_version, messaging_have_CN, updating ? "active" : "not active"); @@ -1945,11 +1945,11 @@ static void *houseKeepingThread(void *) removeOldEvents(oldEventsAre); // alte Events dprintf("after removeoldevents\n"); readLockEvents(); - printf("[sectionsd] Removed %d old events (%d left).\n", anzEventsAlt - mySIeventsOrderUniqueKey.size(), mySIeventsOrderUniqueKey.size()); + printf("[sectionsd] Removed %d old events (%d left).\n", (int)(anzEventsAlt - mySIeventsOrderUniqueKey.size()), (int)mySIeventsOrderUniqueKey.size()); if (mySIeventsOrderUniqueKey.size() != anzEventsAlt) { print_meminfo(); - dprintf("Removed %d old events.\n", anzEventsAlt - mySIeventsOrderUniqueKey.size()); + dprintf("Removed %d old events.\n", (int)(anzEventsAlt - mySIeventsOrderUniqueKey.size())); } anzEventsAlt = mySIeventsOrderUniqueKey.size(); unlockEvents(); @@ -1958,14 +1958,14 @@ static void *houseKeepingThread(void *) if (mySIeventsOrderUniqueKey.size() != anzEventsAlt) { print_meminfo(); - dprintf("Removed %d waste events.\n", anzEventsAlt - mySIeventsOrderUniqueKey.size()); + dprintf("Removed %d waste events.\n", (int)(anzEventsAlt - mySIeventsOrderUniqueKey.size())); } - dprintf("Number of sptr events (event-ID): %u\n", mySIeventsOrderUniqueKey.size()); - dprintf("Number of sptr events (service-id, start time, event-id): %u\n", mySIeventsOrderServiceUniqueKeyFirstStartTimeEventUniqueKey.size()); - dprintf("Number of sptr events (end time, service-id, event-id): %u\n", mySIeventsOrderFirstEndTimeServiceIDEventUniqueKey.size()); - dprintf("Number of sptr nvod events (event-ID): %u\n", mySIeventsNVODorderUniqueKey.size()); - dprintf("Number of cached meta-services: %u\n", mySIeventUniqueKeysMetaOrderServiceUniqueKey.size()); + dprintf("Number of sptr events (event-ID): %u\n", (unsigned)mySIeventsOrderUniqueKey.size()); + dprintf("Number of sptr events (service-id, start time, event-id): %u\n", (unsigned)mySIeventsOrderServiceUniqueKeyFirstStartTimeEventUniqueKey.size()); + dprintf("Number of sptr events (end time, service-id, event-id): %u\n", (unsigned)mySIeventsOrderFirstEndTimeServiceIDEventUniqueKey.size()); + dprintf("Number of sptr nvod events (event-ID): %u\n", (unsigned)mySIeventsNVODorderUniqueKey.size()); + dprintf("Number of cached meta-services: %u\n", (unsigned)mySIeventUniqueKeysMetaOrderServiceUniqueKey.size()); unlockEvents(); @@ -2046,7 +2046,7 @@ void CEitManager::run() int rc; xprintf("[sectionsd] starting\n"); -printf("SIevent size: %d\n", sizeof(SIevent)); +printf("SIevent size: %d\n", (int)sizeof(SIevent)); /* "export NO_SLOW_ADDEVENT=true" to disable this */ slow_addevent = (getenv("NO_SLOW_ADDEVENT") == NULL); @@ -2430,7 +2430,7 @@ void CEitManager::getCurrentNextServiceKey(t_channel_id uniqueServiceKey, CSecti bool CEitManager::getEPGidShort(event_id_t epgID, CShortEPGData * epgdata) { bool ret = false; - dprintf("Request of current EPG for 0x%llx\n", epgID); + dprintf("Request of current EPG for 0x%" PRIx64 "\n", epgID); readLockEvents(); @@ -2455,7 +2455,7 @@ bool CEitManager::getEPGidShort(event_id_t epgID, CShortEPGData * epgdata) bool CEitManager::getEPGid(const event_id_t epgID, const time_t startzeit, CEPGData * epgdata) { bool ret = false; - dprintf("Request of actual EPG for 0x%llx 0x%lx\n", epgID, startzeit); + dprintf("Request of actual EPG for 0x%" PRIx64 " 0x%lx\n", epgID, startzeit); const SIevent& evt = findSIeventForEventUniqueKey(epgID); @@ -2626,7 +2626,7 @@ showProfiling("sectionsd_getChannelEvents end"); bool CEitManager::getComponentTagsUniqueKey(const event_id_t uniqueKey, CSectionsdClient::ComponentTagList& tags) { bool ret = false; - dprintf("Request of ComponentTags for 0x%llx\n", uniqueKey); + dprintf("Request of ComponentTags for 0x%" PRIx64 "\n", uniqueKey); tags.clear(); @@ -2656,7 +2656,7 @@ bool CEitManager::getComponentTagsUniqueKey(const event_id_t uniqueKey, CSection bool CEitManager::getLinkageDescriptorsUniqueKey(const event_id_t uniqueKey, CSectionsdClient::LinkageDescriptorList& descriptors) { bool ret = false; - dprintf("Request of LinkageDescriptors for 0x%llx\n", uniqueKey); + dprintf("Request of LinkageDescriptors for 0x%" PRIx64 "\n", uniqueKey); descriptors.clear(); readLockEvents(); @@ -2698,7 +2698,7 @@ bool CEitManager::getNVODTimesServiceKey(const t_channel_id channel_id, CSection MySIservicesNVODorderUniqueKey::iterator si = mySIservicesNVODorderUniqueKey.find(uniqueServiceKey); if (si != mySIservicesNVODorderUniqueKey.end()) { - dprintf("NVODServices: %u\n", si->second->nvods.size()); + dprintf("NVODServices: %u\n", (unsigned)si->second->nvods.size()); if (!si->second->nvods.empty()) { for (SInvodReferences::iterator ni = si->second->nvods.begin(); ni != si->second->nvods.end(); ++ni) { diff --git a/src/eitd/xmlutil.cpp b/src/eitd/xmlutil.cpp index a89043cb0..40c43d9b4 100644 --- a/src/eitd/xmlutil.cpp +++ b/src/eitd/xmlutil.cpp @@ -1,6 +1,6 @@ /* * (C) 2001 by fnbrd, - * Copyright (C) 2008, 2009 Stefan Seyfried + * Copyright (C) 2008-2009, 2012 Stefan Seyfried * * Copyright (C) 2011-2012 CoolStream International Ltd * @@ -149,7 +149,7 @@ static void addBlacklist(t_original_network_id onid, t_transport_stream_id tsid, ); if (!checkBlacklist(channel_id)) { - xprintf("Add Channel Blacklist for channel 0x%012llx, mask 0x%012llx\n", channel_id, mask); + xprintf("Add Channel Blacklist for channel 0x%012" PRIx64 ", mask 0x%012" PRIx64 "\n", channel_id, mask); ChannelBlacklist *node = new ChannelBlacklist; node->chan = channel_id; node->mask = mask; @@ -168,7 +168,7 @@ static void addNoDVBTimelist(t_original_network_id onid, t_transport_stream_id t ); if (!checkNoDVBTimelist(channel_id)) { - xprintf("Add channel 0x%012llx, mask 0x%012llx to NoDVBTimelist\n", channel_id, mask); + xprintf("Add channel 0x%012" PRIx64 ", mask 0x%012" PRIx64 " to NoDVBTimelist\n", channel_id, mask); ChannelNoDVBTimelist *node = new ChannelNoDVBTimelist; node->chan = channel_id; node->mask = mask; diff --git a/src/gui/Makefile.am b/src/gui/Makefile.am index 1f871997b..9af6ca696 100644 --- a/src/gui/Makefile.am +++ b/src/gui/Makefile.am @@ -1,4 +1,4 @@ -AM_CPPFLAGS = -fno-rtti -fno-exceptions +AM_CPPFLAGS = -fno-rtti -fno-exceptions -D__STDC_FORMAT_MACROS #AM_CPPFLAGS = -fno-rtti BUILT_SOURCES = git_version.h git_version.h: makeversion diff --git a/src/gui/cam_menu.cpp b/src/gui/cam_menu.cpp index 34071faec..2ace53420 100644 --- a/src/gui/cam_menu.cpp +++ b/src/gui/cam_menu.cpp @@ -1,6 +1,7 @@ /* Neutrino-GUI - DBoxII-Project + Copyright (C) 2010, 2012 Stefan Seyfried Copyright (C) 2011 CoolStream International Ltd License: GPLv2 @@ -452,7 +453,7 @@ int CCAMMenuHandler::doMenu(int slot, CA_SLOT_TYPE slotType) g_Locale->getText(slotType == CA_SLOT_TYPE_CI ? LOCALE_CI_WAITING : LOCALE_SC_WAITING)); g_RCInput->getMsgAbsoluteTimeout (&msg, &data, &timeoutEnd); - printf("CCAMMenuHandler::doMenu: msg %x data %x\n", msg, data); + printf("CCAMMenuHandler::doMenu: msg %lx data %lx\n", msg, data); if (msg == CRCInput::RC_timeout) { printf("CCAMMenuHandler::doMenu: menu timeout\n"); hideHintBox(); diff --git a/src/gui/channellist.cpp b/src/gui/channellist.cpp index 77ee5a991..ec2ca96c6 100644 --- a/src/gui/channellist.cpp +++ b/src/gui/channellist.cpp @@ -986,7 +986,7 @@ bool CChannelList::adjustToChannelID(const t_channel_id channel_id, bool bToo) unsigned int i; selected_chid = channel_id; - printf("CChannelList::adjustToChannelID me %p [%s] list size %d channel_id %llx\n", this, getName(), chanlist.size(), channel_id); + printf("CChannelList::adjustToChannelID me %p [%s] list size %d channel_id %" PRIx64 "\n", this, getName(), (int)chanlist.size(), channel_id); fflush(stdout); for (i = 0; i < chanlist.size(); i++) { if(chanlist[i] == NULL) { @@ -1080,7 +1080,7 @@ void CChannelList::setSelected( int nChannelNr) // -- Zap to channel with channel_id bool CChannelList::zapTo_ChannelID(const t_channel_id channel_id) { - printf("**************************** CChannelList::zapTo_ChannelID %llx\n", channel_id); + printf("**************************** CChannelList::zapTo_ChannelID %" PRIx64 "\n", channel_id); for (unsigned int i = 0; i < chanlist.size(); i++) { if (chanlist[i]->channel_id == channel_id) { zapTo(i); @@ -1134,7 +1134,7 @@ void CChannelList::zapToChannel(CZapitChannel *channel) if (tuned < chanlist.size() && chanlist[tuned]->last_unlocked_time != 0) chanlist[tuned]->last_unlocked_time = time_monotonic(); - printf("**************************** CChannelList::zapToChannel me %p %s tuned %d new %s -> %llx\n", this, name.c_str(), tuned, channel->getName().c_str(), channel->channel_id); + printf("**************************** CChannelList::zapToChannel me %p %s tuned %d new %s -> %" PRIx64 "\n", this, name.c_str(), tuned, channel->getName().c_str(), channel->channel_id); if(tuned < chanlist.size()) selected_chid = chanlist[tuned]->getChannelID(); @@ -1338,7 +1338,7 @@ CZapitChannel* CChannelList::getPrevNextChannel(int key, unsigned int &sl) if(!g_settings.zap_cycle && bsize > 1) { size_t cactive = sl; - printf("CChannelList::getPrevNextChannel: selected %d total %d active bouquet %d total %d\n", cactive, chanlist.size(), bactive, bsize); + printf("CChannelList::getPrevNextChannel: selected %d total %d active bouquet %d total %d\n", (int)cactive, (int)chanlist.size(), bactive, bsize); if ((key == g_settings.key_quickzap_down) || (key == CRCInput::RC_left)) { if(cactive == 0) { if(bactive == 0) @@ -1361,7 +1361,7 @@ CZapitChannel* CChannelList::getPrevNextChannel(int key, unsigned int &sl) sl = cactive; channel = bouquetList->Bouquets[bactive]->channelList->getChannelFromIndex(cactive); printf("CChannelList::getPrevNextChannel: selected %d total %d active bouquet %d total %d channel %p (%s)\n", - cactive, chanlist.size(), bactive, bsize, channel, channel ? channel->getName().c_str(): ""); + (int)cactive, (int)chanlist.size(), bactive, bsize, channel, channel ? channel->getName().c_str(): ""); } else { if ((key == g_settings.key_quickzap_down) || (key == CRCInput::RC_left)) { if(sl == 0) diff --git a/src/gui/epgview.cpp b/src/gui/epgview.cpp index 249990de9..c7758bb53 100644 --- a/src/gui/epgview.cpp +++ b/src/gui/epgview.cpp @@ -2,15 +2,7 @@ Neutrino-GUI - DBoxII-Project Copyright (C) 2001 Steffen Hehn 'McClean' - Homepage: http://dbox.cyberphoria.org/ - - Kommentar: - - Diese GUI wurde von Grund auf neu programmiert und sollte nun vom - Aufbau und auch den Ausbaumoeglichkeiten gut aussehen. Neutrino basiert - auf der Client-Server Idee, diese GUI ist also von der direkten DBox- - Steuerung getrennt. Diese wird dann von Daemons uebernommen. - + Copyright (C) 2007-2012 Stefan Seyfried License: GPL @@ -597,7 +589,7 @@ int CEpgData::show(const t_channel_id channel_id, uint64_t a_id, time_t* a_start /* neat for debugging duplicate event issues etc. */ char *epgid; - if (asprintf(&epgid, "EPG ID:%04llX.%02X", (epgData.eventID)&0x0FFFF, epgData.table_id) >= 0) + if (asprintf(&epgid, "EPG ID:%04X.%02X", (int)((epgData.eventID)&0x0FFFF), epgData.table_id) >= 0) { processTextToArray(""); // UTF-8 processTextToArray(epgid); diff --git a/src/gui/filebrowser.cpp b/src/gui/filebrowser.cpp index aa88e4da2..ea2f09d79 100644 --- a/src/gui/filebrowser.cpp +++ b/src/gui/filebrowser.cpp @@ -2,15 +2,7 @@ Neutrino-GUI - DBoxII-Project Copyright (C) 2001 Steffen Hehn 'McClean' - Homepage: http://dbox.cyberphoria.org/ - - Kommentar: - - Diese GUI wurde von Grund auf neu programmiert und sollte nun vom - Aufbau und auch den Ausbaumoeglichkeiten gut aussehen. Neutrino basiert - auf der Client-Server Idee, diese GUI ist also von der direkten DBox- - Steuerung getrennt. Diese wird dann von Daemons uebernommen. - + Copyright (C) 2007-2009, 2011-2012 Stefan Seyfried License: GPL @@ -686,7 +678,7 @@ and add to neutrino playlist if (!answer.empty() && httpres == 0) { -printf("CFileBrowser::readDir_sc: read done, size %d\n", answer.size()); +printf("CFileBrowser::readDir_sc: read done, size %d\n", (int)answer.size()); xmlDocPtr answer_parser = parseXml(answer.c_str()); if (answer_parser != NULL) { diff --git a/src/gui/hdd_menu.cpp b/src/gui/hdd_menu.cpp index f7d73f65e..d60d12f0a 100644 --- a/src/gui/hdd_menu.cpp +++ b/src/gui/hdd_menu.cpp @@ -2,15 +2,7 @@ Neutrino-GUI - DBoxII-Project Copyright (C) 2001 Steffen Hehn 'McClean' - Homepage: http://dbox.cyberphoria.org/ - - Kommentar: - - Diese GUI wurde von Grund auf neu programmiert und sollte nun vom - Aufbau und auch den Ausbaumoeglichkeiten gut aussehen. Neutrino basiert - auf der Client-Server Idee, diese GUI ist also von der direkten DBox- - Steuerung getrennt. Diese wird dann von Daemons uebernommen. - + Copyright (C) 2010-2012 Stefan Seyfried License: GPL @@ -234,7 +226,7 @@ int CHDDMenuHandler::doMenu () bool enabled = !CNeutrinoApp::getInstance()->recordingstatus && !isroot; - snprintf(str, sizeof(str), "%s %s %lld %s", vendor, model, megabytes < 10000 ? megabytes : megabytes/1000, megabytes < 10000 ? "MB" : "GB"); + snprintf(str, sizeof(str), "%s %s %ld %s", vendor, model, (long)(megabytes < 10000 ? megabytes : megabytes/1000), megabytes < 10000 ? "MB" : "GB"); printf("HDD: %s\n", str); tmp_str[i]=str; tempMenu[i] = new CMenuWidget(str, NEUTRINO_ICON_SETTINGS); diff --git a/src/gui/moviebrowser.cpp b/src/gui/moviebrowser.cpp index dece8d5e1..994a3d155 100644 --- a/src/gui/moviebrowser.cpp +++ b/src/gui/moviebrowser.cpp @@ -1,18 +1,6 @@ /*************************************************************************** Neutrino-GUI - DBoxII-Project - Homepage: http://dbox.cyberphoria.org/ - - $Id: moviebrowser.cpp,v 1.10 2006/09/11 21:11:35 guenther Exp $ - - Kommentar: - - Diese GUI wurde von Grund auf neu programmiert und sollte nun vom - Aufbau und auch den Ausbaumoeglichkeiten gut aussehen. Neutrino basiert - auf der Client-Server Idee, diese GUI ist also von der direkten DBox- - Steuerung getrennt. Diese wird dann von Daemons uebernommen. - - License: GPL This program is free software; you can redistribute it and/or modify @@ -41,6 +29,9 @@ Author: Günther@tuxbox.berlios.org based on code of Steffen Hehn 'McClean' + + (C) 2009-2012 Stefan Seyfried + ****************************************************************************/ #ifdef HAVE_CONFIG_H @@ -2092,7 +2083,7 @@ void CMovieBrowser::onDeleteFile(MI_MOVIE_INFO& movieSelectionHandler) } m_vMovieInfo.erase( (std::vector::iterator)&movieSelectionHandler); - TRACE("List size: %d\n", m_vMovieInfo.size()); + TRACE("List size: %d\n", (int)m_vMovieInfo.size()); //if(m_vMovieInfo.empty()) fileInfoStale(); //if(m_vMovieInfo.empty()) onSetGUIWindow(m_settings.gui); updateSerienames(); @@ -2404,7 +2395,7 @@ void CMovieBrowser::loadAllTsFileNamesFromStorage(void) loadTsFileNamesFromDir(m_dir[i].name); } - TRACE("[mb] Dir%d, Files:%d \r\n",m_dirNames.size(),m_vMovieInfo.size()); + TRACE("[mb] Dir%d, Files:%d\n", (int)m_dirNames.size(), (int)m_vMovieInfo.size()); /* if(m_vMovieInfo.empty()) { @@ -2891,7 +2882,7 @@ int CMovieBrowser::showMovieInfoMenu(MI_MOVIE_INFO* movie_info) if(movie_info != NULL) { strncpy(dirItNr, m_dirNames[movie_info->dirItNr].c_str(),BUFFER_SIZE-1); - snprintf(size,BUFFER_SIZE,"%5llu",movie_info->file.Size>>20); + snprintf(size,BUFFER_SIZE,"%5" PRIu64 "",movie_info->file.Size>>20); } CStringInput titelUserInput(LOCALE_MOVIEBROWSER_INFO_TITLE, &movie_info->epgTitle, MAX_STRING, NONEXISTANT_LOCALE, NONEXISTANT_LOCALE, "abcdefghijklmnopqrstuvwxyz0123456789-.: "); @@ -3295,7 +3286,7 @@ bool CMovieBrowser::getMovieInfoItem(MI_MOVIE_INFO& movie_info, MB_INFO_ITEM ite #if 1 // MB_INFO_AUDIO test // we just return the number of audiopids char ltext[10]; - snprintf(ltext, 8,"%d",movie_info.audioPids.size()); + snprintf(ltext, 8,"%d", (int)movie_info.audioPids.size()); ltext[9] = 0; // just to make sure string is terminated *item_string = ltext; #else // MB_INFO_AUDIO test @@ -3372,7 +3363,7 @@ bool CMovieBrowser::getMovieInfoItem(MI_MOVIE_INFO& movie_info, MB_INFO_ITEM ite *item_string = str_tmp; break; case MB_INFO_SIZE: // = 19, - snprintf(str_tmp,MAX_STR_TMP,"%4llu",movie_info.file.Size>>20); + snprintf(str_tmp,MAX_STR_TMP,"%4" PRIu64 "",movie_info.file.Size>>20); *item_string = str_tmp; break; case MB_INFO_MAX_NUMBER: // = 20 @@ -3406,7 +3397,7 @@ void CMovieBrowser::updateSerienames(void) m_vHandleSerienames.push_back(&m_vMovieInfo[i]); } } - TRACE("[mb]->updateSerienames: %d\r\n",m_vHandleSerienames.size()); + TRACE("[mb]->updateSerienames: %d\n", (int)m_vHandleSerienames.size()); // TODO sort(m_serienames.begin(), m_serienames.end(), my_alphasort); m_seriename_stale = false; } @@ -3794,7 +3785,7 @@ static off64_t truncate_movie(MI_MOVIE_INFO * minfo) snprintf(spart, sizeof(spart), "%s.%03d", name, tpart); else snprintf(spart, sizeof(spart), "%s", name); -printf("truncate: part %s to size %lld\n", spart, secoffset); +printf("truncate: part %s to size %" PRId64 "\n", spart, secoffset); truncate(spart, secoffset); minfo->file.Size = newsize; minfo->length = minfo->bookmarks.end/60; @@ -3998,7 +3989,7 @@ static off64_t cut_movie(MI_MOVIE_INFO * minfo, CMovieInfo * cmovie) if(books[bcount].len > SAFE_GOP) books[bcount].len -= SAFE_GOP; books[bcount].ok = 1; -printf("cut: start bookmark %d at %lld len %lld\n", bcount, books[bcount].pos, books[bcount].len); +printf("cut: start bookmark %d at %" PRId64 " len %" PRId64 "\n", bcount, books[bcount].pos, books[bcount].len); bcount++; } for(int book_nr = 0; book_nr < MI_MOVIE_BOOK_USER_MAX; book_nr++) { @@ -4008,7 +3999,7 @@ printf("cut: start bookmark %d at %lld len %lld\n", bcount, books[bcount].pos, b if(books[bcount].len > SAFE_GOP) books[bcount].len -= SAFE_GOP; books[bcount].ok = 1; -printf("cut: jump bookmark %d at %lld len %lld -> skip to %lld\n", bcount, books[bcount].pos, books[bcount].len, books[bcount].pos+books[bcount].len); +printf("cut: jump bookmark %d at %" PRId64 " len %" PRId64 " -> skip to %" PRId64 "\n", bcount, books[bcount].pos, books[bcount].len, books[bcount].pos+books[bcount].len); bcount++; } } @@ -4018,7 +4009,7 @@ printf("cut: jump bookmark %d at %lld len %lld -> skip to %lld\n", bcount, books //if(books[bcount].pos > SAFE_GOP) // books[bcount].pos -= SAFE_GOP; books[bcount].ok = 1; -printf("cut: end bookmark %d at %lld\n", bcount, books[bcount].pos); +printf("cut: end bookmark %d at %" PRId64 "\n", bcount, books[bcount].pos); bcount++; } printf("\n"); @@ -4029,18 +4020,18 @@ printf("\n"); qsort(books, bcount, sizeof(struct mybook), compare_book); for(i = 0; i < bcount; i++) { if(books[i].ok) { - printf("cut: bookmark %d at %lld len %lld -> skip to %lld\n", i, books[i].pos, books[i].len, books[i].pos+books[i].len); + printf("cut: bookmark %d at %" PRId64 " len %" PRId64 " -> skip to %" PRId64 "\n", i, books[i].pos, books[i].len, books[i].pos+books[i].len); newsize -= books[i].len; off64_t curend = books[i].pos + books[i].len; for(int j = i + 1; j < bcount; j++) { if((books[j].pos > books[i].pos) && (books[j].pos < curend)) { off64_t newend = books[j].pos + books[j].len; if(newend > curend) { - printf("cut: bad bookmark %d, position %lld len %lld, ajusting..\n", j, books[j].pos, books[j].len); + printf("cut: bad bookmark %d, position %" PRId64 " len %" PRId64 ", ajusting..\n", j, books[j].pos, books[j].len); books[j].pos = curend; books[j].len = newend - curend; } else { - printf("cut: bad bookmark %d, position %lld len %lld, skipping..\n", j, books[j].pos, books[j].len); + printf("cut: bad bookmark %d, position %" PRId64 " len %" PRId64 ", skipping..\n", j, books[j].pos, books[j].len); books[j].ok = 0; } } @@ -4053,7 +4044,7 @@ printf("\n"); *ptr = 0; find_new_part(npart, dpart, sizeof(dpart) ); tt = time(0); -printf("\n********* new file %s expected size %lld, start time %s", dpart, newsize, ctime (&tt)); +printf("\n********* new file %s expected size %" PRId64 ", start time %s", dpart, newsize, ctime (&tt)); dstfd = open (dpart, O_CREAT|O_WRONLY|O_TRUNC| O_LARGEFILE, 0644); if(dstfd < 0) { perror(dpart); @@ -4073,7 +4064,7 @@ printf("\n********* new file %s expected size %lld, start time %s", dpart, newsi bpos = books[i].pos; bskip = books[i].len; while (!stat64(spart, &s)) { -printf("cut: open part %d file %s size %lld offset %lld book pos %lld\n", part, spart, s.st_size, offset, bpos); +printf("cut: open part %d file %s size %" PRId64 " offset %" PRId64 " book pos %" PRId64 "\n", part, spart, s.st_size, offset, bpos); srcfd = open (spart, O_RDONLY | O_LARGEFILE); if(srcfd < 0) { perror(spart); @@ -4088,7 +4079,7 @@ printf("cut: open part %d file %s size %lld offset %lld book pos %lld\n", part, sdone = offset; while(true) { off64_t until = bpos; -printf("\ncut: reading from %lld to %lld (%lld) want gop %d\n", sdone, until, until - sdone, need_gop); +printf("\ncut: reading from %" PRId64 " to %" PRId64 " (%" PRId64 ") want gop %d\n", sdone, until, until - sdone, need_gop); while(sdone < until) { bool stop; int msg = get_input(&stop); @@ -4113,11 +4104,11 @@ printf("\ncut: reading from %lld to %lld (%lld) want gop %d\n", sdone, until, un int wptr = 0; // FIXME: TEST if(r != BUF_SIZE) printf("****** short read ? %d\n", r); -if(buf[0] != 0x47) printf("cut: buffer not aligned at %lld\n", sdone); +if(buf[0] != 0x47) printf("cut: buffer not aligned at %" PRId64 "\n", sdone); if(need_gop) { int gop = find_gop(buf, r); if(gop >= 0) { - printf("cut: GOP found at %lld offset %d\n", (off64_t)(sdone+gop), gop); + printf("cut: GOP found at %" PRId64 " offset %d\n", (off64_t)(sdone+gop), gop); newsize -= gop; wptr = gop; } else @@ -4142,13 +4133,13 @@ if(buf[0] != 0x47) printf("cut: buffer not aligned at %lld\n", sdone); perror(spart); goto ret_err; } else { -printf("cut: next file -> sdone %lld spos %lld bpos %lld\n", sdone, spos, bpos); +printf("cut: next file -> sdone %" PRId64 " spos %" PRId64 " bpos %" PRId64 "\n", sdone, spos, bpos); offset = 0; bpos -= sdone; goto next_file; } } -printf("cut: current file pos %lld write pos %lld book pos %lld still to read %lld\n", sdone, spos, bpos, sdone - bpos); +printf("cut: current file pos %" PRId64 " write pos %" PRId64 " book pos %" PRId64 " still to read %" PRId64 "\n", sdone, spos, bpos, sdone - bpos); need_gop = 1; offset = bpos + bskip; i++; @@ -4163,7 +4154,7 @@ printf("cut: current file pos %lld write pos %lld book pos %lld still to read %l bskip = books[i].len; } else bpos = size; -printf("cut: next bookmark pos: %lld abs %lld relative next file pos %lld cur file size %lld\n", bpos, bpos - tdone, offset, s.st_size); +printf("cut: next bookmark pos: %" PRId64 " abs %" PRId64 " relative next file pos %" PRId64 " cur file size %" PRId64 "\n", bpos, bpos - tdone, offset, s.st_size); bpos -= tdone; /* all books from 0, converting to 0 + total size skipped */ if(offset >= s.st_size) { offset -= s.st_size; @@ -4179,7 +4170,7 @@ next_file: snprintf(spart, sizeof(spart), "%s.%03d", name, ++part); } tt1 = time(0); -printf("********* total written %lld tooks %ld secs end time %s", spos, tt1-tt, ctime (&tt1)); +printf("********* total written %" PRId64 " tooks %ld secs end time %s", spos, tt1-tt, ctime (&tt1)); save_info(cmovie, minfo, dpart, spos, secsize); retval = 1; @@ -4229,7 +4220,7 @@ static off64_t copy_movie(MI_MOVIE_INFO * minfo, CMovieInfo * cmovie, bool onefi minuteoffset = MINUTEOFFSET; off64_t secsize = minuteoffset/60; //off64_t secsize = len ? size/len/60 : 511040; -printf("copy: len %d minute %lld second %lld\n", len, len ? size/len : 511040*60, secsize); +printf("copy: len %d minute %" PRId64 " second %" PRId64 "\n", len, len ? size/len : 511040*60, secsize); CFrameBuffer * frameBuffer = CFrameBuffer::getInstance(); if (! timescale) @@ -4248,7 +4239,7 @@ printf("copy: len %d minute %lld second %lld\n", len, len ? size/len : 511040*60 books[bcount].pos -= SAFE_GOP; books[bcount].len = (minfo->bookmarks.user[book_nr].length * secsize)/188 * 188; books[bcount].ok = 1; -printf("copy: jump bookmark %d at %lld len %lld\n", bcount, books[bcount].pos, books[bcount].len); +printf("copy: jump bookmark %d at %" PRId64 " len %" PRId64 "\n", bcount, books[bcount].pos, books[bcount].len); newsize += books[bcount].len; bcount++; } @@ -4258,7 +4249,7 @@ printf("copy: jump bookmark %d at %lld len %lld\n", bcount, books[bcount].pos, b return 0; } tt = time(0); -printf("********* %d boormarks, to %s file(s), expected size to copy %lld, start time %s", bcount, onefile ? "one" : "many", newsize, ctime (&tt)); +printf("********* %d boormarks, to %s file(s), expected size to copy %" PRId64 ", start time %s", bcount, onefile ? "one" : "many", newsize, ctime (&tt)); snprintf(npart, sizeof(npart), "%s", name); char * ptr = strstr(npart, ".ts"); if(ptr) @@ -4270,7 +4261,7 @@ printf("********* %d boormarks, to %s file(s), expected size to copy %lld, start goto ret_err; } for(i = 0; i < bcount; i++) { -printf("\ncopy: processing bookmark %d at %lld len %lld\n", i, books[i].pos, books[i].len); +printf("\ncopy: processing bookmark %d at %" PRId64 " len %" PRId64 "\n", i, books[i].pos, books[i].len); off64_t bpos = books[i].pos; off64_t bskip = books[i].len; part = 0; @@ -4286,7 +4277,7 @@ printf("\ncopy: processing bookmark %d at %lld len %lld\n", i, books[i].pos, boo break; } if(sres != 0) { - printf("file for bookmark %d with offset %lld not found\n", i, books[i].pos); + printf("file for bookmark %d with offset %" PRId64 " not found\n", i, books[i].pos); continue; } if(!dst_done || !onefile) { @@ -4304,7 +4295,7 @@ printf("copy: new file %s fd %d\n", dpart, dstfd); need_gop = 1; next_file: stat64(spart, &s); -printf("copy: open part %d file %s size %lld offset %lld\n", part, spart, s.st_size, bpos); +printf("copy: open part %d file %s size %" PRId64 " offset %" PRId64 "\n", part, spart, s.st_size, bpos); srcfd = open (spart, O_RDONLY | O_LARGEFILE); if(srcfd < 0) { printf("failed to open %s\n", spart); @@ -4314,7 +4305,7 @@ printf("copy: open part %d file %s size %lld offset %lld\n", part, spart, s.st_s lseek64 (srcfd, bpos, SEEK_SET); sdone = bpos; off64_t until = bpos + bskip; -printf("copy: read from %lld to %lld read size %d want gop %d\n", bpos, until, BUF_SIZE, need_gop); +printf("copy: read from %" PRId64 " to %" PRId64 " read size %d want gop %d\n", bpos, until, BUF_SIZE, need_gop); while(sdone < until) { size_t toread = (until-sdone) > BUF_SIZE ? BUF_SIZE : until - sdone; bool stop; @@ -4340,11 +4331,11 @@ printf("copy: read from %lld to %lld read size %d want gop %d\n", bpos, until, B int wptr = 0; // FIXME: TEST if(r != BUF_SIZE) printf("****** short read ? %d\n", r); -if(buf[0] != 0x47) printf("copy: buffer not aligned at %lld\n", sdone); +if(buf[0] != 0x47) printf("copy: buffer not aligned at %" PRId64 "\n", sdone); if(need_gop) { int gop = find_gop(buf, r); if(gop >= 0) { - printf("cut: GOP found at %lld offset %d\n", (off64_t)(sdone+gop), gop); + printf("cut: GOP found at %" PRId64 " offset %d\n", (off64_t)(sdone+gop), gop); newsize -= gop; wptr = gop; } else @@ -4373,7 +4364,7 @@ if(buf[0] != 0x47) printf("copy: buffer not aligned at %lld\n", sdone); close(dstfd); goto ret_err; } else { -printf("copy: -> next file, file pos %lld written %lld left %lld\n", sdone, spos, bskip); +printf("copy: -> next file, file pos %" PRId64 " written %" PRId64 " left %" PRId64 "\n", sdone, spos, bskip); bpos = 0; close(srcfd); snprintf(spart, sizeof(spart), "%s.%03d", name, ++part); @@ -4386,14 +4377,14 @@ printf("copy: -> next file, file pos %lld written %lld left %lld\n", sdone, spos close(dstfd); save_info(cmovie, minfo, dpart, spos, secsize); time_t tt1 = time(0); -printf("copy: ********* %s: total written %lld took %ld secs\n", dpart, spos, tt1-tt); +printf("copy: ********* %s: total written %" PRId64 " took %ld secs\n", dpart, spos, tt1-tt); } } /* for all books */ if(onefile) { close(dstfd); save_info(cmovie, minfo, dpart, spos, secsize); time_t tt1 = time(0); -printf("copy: ********* %s: total written %lld took %ld secs\n", dpart, spos, tt1-tt); +printf("copy: ********* %s: total written %" PRId64 " took %ld secs\n", dpart, spos, tt1-tt); } retval = 1; ret_err: diff --git a/src/gui/movieinfo.cpp b/src/gui/movieinfo.cpp index c6ec5188a..d91b3e72e 100644 --- a/src/gui/movieinfo.cpp +++ b/src/gui/movieinfo.cpp @@ -37,9 +37,7 @@ Author: Günther@tuxbox.berlios.org - Revision History: - Date Author Change Description - Nov 2005 Günther initial start + Copyright(C) 2009, 2012 Stefan Seyfried ****************************************************************************/ #ifdef HAVE_CONFIG_H @@ -135,7 +133,7 @@ bool CMovieInfo::convertTs2XmlName(std::string * filename) #define XML_ADD_TAG_LONG(_xml_text_,_tag_name_,_tag_content_){\ _xml_text_ += "\t\t<"_tag_name_">";\ char _tmp_[50];\ - sprintf(_tmp_, "%llu", _tag_content_);\ + sprintf(_tmp_, "%" PRIu64 "", (uint64_t)_tag_content_);\ _xml_text_ += _tmp_;\ _xml_text_ += "\n";} @@ -501,7 +499,7 @@ void CMovieInfo::showMovieInfo(MI_MOVIE_INFO & movie_info) print_buffer += g_Locale->getText(LOCALE_MOVIEBROWSER_INFO_SIZE); print_buffer += ": "; //snprintf(date_char, 12,"%4llu",movie_info.file.Size>>20); - sprintf(date_char, "%llu", movie_info.file.Size >> 20); + sprintf(date_char, "%" PRIu64 "", movie_info.file.Size >> 20); print_buffer += date_char; //print_buffer += "\n"; } @@ -619,9 +617,9 @@ int find_next_char(char to_find, char *text, int start_pos, int end_pos) void strReplace(std::string & orig, const char *fstr, const std::string rstr) { // replace all occurrence of fstr with rstr and, and returns a reference to itself - unsigned int index = 0; - unsigned int fstrlen = strlen(fstr); - int rstrlen = rstr.size(); + size_t index = 0; + size_t fstrlen = strlen(fstr); + size_t rstrlen = rstr.size(); while ((index = orig.find(fstr, index)) != std::string::npos) { orig.replace(index, fstrlen, rstr); diff --git a/src/gui/scan.cpp b/src/gui/scan.cpp index a794db4f2..46743f164 100644 --- a/src/gui/scan.cpp +++ b/src/gui/scan.cpp @@ -387,7 +387,7 @@ neutrino_msg_t CScanTs::handleMsg(neutrino_msg_t msg, neutrino_msg_data_t data) break; case NeutrinoMessages::EVT_SCAN_NUM_TRANSPONDERS: - sprintf(buffer, "%d", data); + sprintf(buffer, "%ld", data); paintLine(xpos2, ypos_transponder, w - (8*fw), buffer); total = data; snprintf(str, sizeof(buffer), "scan: %d/%d", done, total); @@ -405,7 +405,7 @@ neutrino_msg_t CScanTs::handleMsg(neutrino_msg_t msg, neutrino_msg_data_t data) case NeutrinoMessages::EVT_SCAN_REPORT_FREQUENCY: freqready = 1; - sprintf(buffer, "%u", data); + sprintf(buffer, "%lu", data); xpos_frequency = g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->getRenderWidth(buffer, true); paintLine(xpos2, ypos_frequency, xpos_frequency, buffer); //paintRadar(); @@ -433,22 +433,22 @@ neutrino_msg_t CScanTs::handleMsg(neutrino_msg_t msg, neutrino_msg_data_t data) break; case NeutrinoMessages::EVT_SCAN_NUM_CHANNELS: - sprintf(buffer, " = %d", data); + sprintf(buffer, " = %ld", data); paintLine(xpos1 + 3 * (6*fw), ypos_service_numbers + mheight, width - 3 * (6*fw) - 10, buffer); break; case NeutrinoMessages::EVT_SCAN_FOUND_TV_CHAN: - sprintf(buffer, "%d", data); + sprintf(buffer, "%ld", data); paintLine(xpos1, ypos_service_numbers + mheight, (6*fw), buffer); break; case NeutrinoMessages::EVT_SCAN_FOUND_RADIO_CHAN: - sprintf(buffer, "%d", data); + sprintf(buffer, "%ld", data); paintLine(xpos1 + (6*fw), ypos_service_numbers + mheight, (6*fw), buffer); break; case NeutrinoMessages::EVT_SCAN_FOUND_DATA_CHAN: - sprintf(buffer, "%d", data); + sprintf(buffer, "%ld", data); paintLine(xpos1 + 2 * (6*fw), ypos_service_numbers + mheight, (6*fw), buffer); break; diff --git a/src/gui/scan_setup.cpp b/src/gui/scan_setup.cpp index 0a91b1094..412c63c12 100644 --- a/src/gui/scan_setup.cpp +++ b/src/gui/scan_setup.cpp @@ -634,7 +634,7 @@ int CScanSetup::showScanMenuLnbSetup() sat_setup->addIntroItems(); satellite_map_t & satmap = fe->getSatellites(); - INFO("satmap size = %d", satmap.size()); + INFO("satmap size = %d", (int)satmap.size()); CMenuWidget *tmp[satmap.size()]; for (sat_iterator_t sit = satmap.begin(); sit != satmap.end(); ++sit) diff --git a/src/gui/zapit_setup.cpp b/src/gui/zapit_setup.cpp index f8e18168c..8d8430024 100644 --- a/src/gui/zapit_setup.cpp +++ b/src/gui/zapit_setup.cpp @@ -6,6 +6,8 @@ Homepage: http://dbox.cyberphoria.org/ License: GPL + Copyright (C) 2011-2012 Stefan Seyfried + This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or @@ -131,7 +133,7 @@ int CSelectChannelWidget::exec(CMenuTarget* parent, const std::string& actionKey { unsigned int cnr = 0; t_channel_id channel_id = 0; - sscanf(&(actionKey[4]),"%u|%llx", &cnr,&channel_id); + sscanf(&(actionKey[4]),"%u|%" SCNx64 "", &cnr, &channel_id); if (strncmp(actionKey.c_str(), "ZCT:", 4) == 0)//...tv { @@ -167,7 +169,7 @@ void CSelectChannelWidget::InitZapitChannelHelper(CZapitClient::channelsMode mod for(int j = 0; j < (int) channels.size(); j++) { CZapitChannel * channel = channels[j]; char cChannelId[60] = {0}; - snprintf(cChannelId,sizeof(cChannelId),"ZC%c:%d|%llx#",(mode==CZapitClient::MODE_TV)?'T':'R',channel->number,channel->channel_id); + snprintf(cChannelId, sizeof(cChannelId), "ZC%c:%d|%" PRIx64 "#", (mode==CZapitClient::MODE_TV)?'T':'R', channel->number, channel->channel_id); CMenuForwarderNonLocalized * chan_item = new CMenuForwarderNonLocalized(channel->getName().c_str(), true, NULL, this, (std::string(cChannelId) + channel->getName()).c_str(), CRCInput::RC_nokey, NULL, channel->scrambled ?NEUTRINO_ICON_SCRAMBLED:NULL); chan_item->setItemButton(NEUTRINO_ICON_BUTTON_OKAY, true); diff --git a/src/neutrino.cpp b/src/neutrino.cpp index da29f0a8c..45285b157 100644 --- a/src/neutrino.cpp +++ b/src/neutrino.cpp @@ -1297,14 +1297,14 @@ void CNeutrinoApp::channelsInit(bool bOnly) CBouquet* newBouquet = new CBouquet(0, g_Locale->getText(LOCALE_BOUQUETNAME_NEW), false, true); newBouquet->channelList->SetChannelList(&zapitList); TVallList->Bouquets.push_back(newBouquet); - printf("[neutrino] got %d new TV channels\n", zapitList.size()); fflush(stdout); + printf("[neutrino] got %d new TV channels\n", (int)zapitList.size()); fflush(stdout); } CServiceManager::getInstance()->GetAllRadioChannels(zapitList, CZapitChannel::NEW); if (!zapitList.empty()) { CBouquet* newBouquet = new CBouquet(0, g_Locale->getText(LOCALE_BOUQUETNAME_NEW), false, true); newBouquet->channelList->SetChannelList(&zapitList); RADIOallList->Bouquets.push_back(newBouquet); - printf("[neutrino] got %d new RADIO channels\n", zapitList.size()); fflush(stdout); + printf("[neutrino] got %d new RADIO channels\n", (int)zapitList.size()); fflush(stdout); } } if (g_settings.make_removed_list) { @@ -1313,14 +1313,14 @@ void CNeutrinoApp::channelsInit(bool bOnly) CBouquet* newBouquet = new CBouquet(0, g_Locale->getText(LOCALE_BOUQUETNAME_REMOVED), false, true); newBouquet->channelList->SetChannelList(&zapitList); TVallList->Bouquets.push_back(newBouquet); - printf("[neutrino] got %d removed TV channels\n", zapitList.size()); fflush(stdout); + printf("[neutrino] got %d removed TV channels\n", (int)zapitList.size()); fflush(stdout); } CServiceManager::getInstance()->GetAllRadioChannels(zapitList, CZapitChannel::REMOVED); if (!zapitList.empty()) { CBouquet* newBouquet = new CBouquet(0, g_Locale->getText(LOCALE_BOUQUETNAME_REMOVED), false, true); newBouquet->channelList->SetChannelList(&zapitList); RADIOallList->Bouquets.push_back(newBouquet); - printf("[neutrino] got %d removed RADIO channels\n", zapitList.size()); fflush(stdout); + printf("[neutrino] got %d removed RADIO channels\n", (int)zapitList.size()); fflush(stdout); } } TIMER_STOP("[neutrino] sats took"); @@ -1351,7 +1351,7 @@ void CNeutrinoApp::channelsInit(bool bOnly) hdBouquet->channelList->SetChannelList(&zapitList); hdBouquet->channelList->SortSat(); TVfavList->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); } } TIMER_STOP("[neutrino] tv took"); @@ -1436,7 +1436,7 @@ void CNeutrinoApp::SetChannelMode(int newmode) INFO("newmode %d sort old %d new %d", newmode, sortmode[newmode], g_settings.channellist_sort_mode); if(newmode != LIST_MODE_FAV && sortmode[newmode] != g_settings.channellist_sort_mode && g_settings.channellist_sort_mode < 3) { sortmode[newmode] = g_settings.channellist_sort_mode; - INFO("sorting, mode %d, %d bouquets\n", g_settings.channellist_sort_mode, bouquetList->Bouquets.size()); + INFO("sorting, mode %d, %d bouquets\n", g_settings.channellist_sort_mode, (int)bouquetList->Bouquets.size()); for (uint32_t i = 0; i < bouquetList->Bouquets.size(); i++) { if(g_settings.channellist_sort_mode == 0) bouquetList->Bouquets[i]->channelList->SortAlpha(); @@ -2340,7 +2340,7 @@ _show: int old_b = bouquetList->getActiveBouquetNumber(); //int old_mode = g_settings.channel_mode; int old_mode = GetChannelMode(); - printf("************************* ZAP START: bouquetList %p size %d old_b %d\n", bouquetList, bouquetList->Bouquets.size(), old_b);fflush(stdout); + printf("************************* ZAP START: bouquetList %p size %d old_b %d\n", bouquetList, (int)bouquetList->Bouquets.size(), old_b);fflush(stdout); if(!bouquetList->Bouquets.empty()) { old_num = bouquetList->Bouquets[old_b]->channelList->getSelected(); @@ -2376,7 +2376,7 @@ _repeat: StartSubtitles(mode == mode_tv); } else if(nNewChannel == -3) { // list mode changed - printf("************************* ZAP NEW MODE: bouquetList %p size %d\n", bouquetList, bouquetList->Bouquets.size());fflush(stdout); + printf("************************* ZAP NEW MODE: bouquetList %p size %d\n", bouquetList, (int)bouquetList->Bouquets.size());fflush(stdout); nNewChannel = bouquetList->exec(true); goto _repeat; } @@ -2627,7 +2627,7 @@ _repeat: } else if( msg == NeutrinoMessages::RECORD_STOP) { CTimerd::RecordingStopInfo* recinfo = (CTimerd::RecordingStopInfo*)data; - printf("NeutrinoMessages::RECORD_STOP: eventID %d channel_id %llx\n", recinfo->eventID, recinfo->channel_id); + printf("NeutrinoMessages::RECORD_STOP: eventID %d channel_id %" PRIx64 "\n", recinfo->eventID, recinfo->channel_id); CRecordManager::getInstance()->Stop(recinfo); autoshift = CRecordManager::getInstance()->TimeshiftOnly(); diff --git a/src/nhttpd/tuxboxapi/coolstream/Makefile.am b/src/nhttpd/tuxboxapi/coolstream/Makefile.am index 5777d61ed..4744106cd 100644 --- a/src/nhttpd/tuxboxapi/coolstream/Makefile.am +++ b/src/nhttpd/tuxboxapi/coolstream/Makefile.am @@ -1,4 +1,4 @@ -AM_CPPFLAGS = -fno-rtti -fno-exceptions +AM_CPPFLAGS = -fno-rtti -fno-exceptions -D__STDC_FORMAT_MACROS INCLUDES = \ -I$(top_builddir) \ diff --git a/src/nhttpd/tuxboxapi/coolstream/controlapi.cpp b/src/nhttpd/tuxboxapi/coolstream/controlapi.cpp index c761144ce..0740b73cf 100644 --- a/src/nhttpd/tuxboxapi/coolstream/controlapi.cpp +++ b/src/nhttpd/tuxboxapi/coolstream/controlapi.cpp @@ -1395,7 +1395,7 @@ void CControlAPI::EpgCGI(CyhookHandler *hh) { else if (hh->ParamList["eventid"] != "") { //special epg query uint64_t epgid; - sscanf(hh->ParamList["eventid"].c_str(), "%llu", &epgid); + sscanf(hh->ParamList["eventid"].c_str(), "%" SCNu64 "", &epgid); CShortEPGData epg; if (CEitManager::getInstance()->getEPGidShort(epgid, &epg)) { hh->WriteLn(epg.title); @@ -1407,7 +1407,7 @@ void CControlAPI::EpgCGI(CyhookHandler *hh) { if (hh->ParamList["starttime"] != "") { uint64_t epgid; time_t starttime; - sscanf(hh->ParamList["fskid"].c_str(), "%llu", &epgid); + sscanf(hh->ParamList["fskid"].c_str(), "%" SCNu64 "", &epgid); sscanf(hh->ParamList["starttime"].c_str(), "%lu", &starttime); CEPGData longepg; if (CEitManager::getInstance()->getEPGid(epgid, starttime, &longepg)) { diff --git a/src/system/helpers.cpp b/src/system/helpers.cpp index c993bbf41..332c60fff 100644 --- a/src/system/helpers.cpp +++ b/src/system/helpers.cpp @@ -185,7 +185,7 @@ int check_dir(const char * dir) ret = 0; break; //ok default: - fprintf(stderr, "%s Unknow File system type: %i\n" ,dir ,s.f_type); + fprintf(stderr, "%s Unknown filesystem type: 0x%x\n", dir, (int)s.f_type); break; // error } } diff --git a/src/timerd/Makefile.am b/src/timerd/Makefile.am index 76c1954c4..716ce2a95 100644 --- a/src/timerd/Makefile.am +++ b/src/timerd/Makefile.am @@ -1,4 +1,4 @@ -AM_CPPFLAGS = -fno-rtti -fno-exceptions +AM_CPPFLAGS = -fno-rtti -fno-exceptions -D__STDC_FORMAT_MACROS INCLUDES = \ -I$(top_builddir) \ diff --git a/src/timerd/timermanager.cpp b/src/timerd/timermanager.cpp index 9f1386050..5e184e8eb 100644 --- a/src/timerd/timermanager.cpp +++ b/src/timerd/timermanager.cpp @@ -4,6 +4,8 @@ Copyright (C) 2001 Steffen Hehn 'McClean' Homepage: http://dbox.cyberphoria.org/ + Copyright (C) 2011-2012 Stefan Seyfried + $Id: timermanager.cpp,v 1.86 2006/03/04 09:51:47 zwen Exp $ License: GPL @@ -419,7 +421,7 @@ void CTimerManager::loadEventsFromConfig() { std::vector savedIDs; savedIDs = config.getInt32Vector ("IDS"); - dprintf("%d timer(s) in config\n",savedIDs.size()); + dprintf("%d timer(s) in config\n", (int)savedIDs.size()); for(unsigned int i=0; i < savedIDs.size(); i++) { std::stringstream ostr; @@ -640,7 +642,7 @@ void CTimerManager::saveEventsToConfig() // Sperren !!! CConfigFile config(','); config.clear(); - dprintf("save %d events to config ...\n", events.size()); + dprintf("save %d events to config ...\n", (int)events.size()); CTimerEventMap::iterator pos = events.begin(); for(;pos != events.end();++pos) { @@ -950,7 +952,7 @@ void CTimerEvent::printEvent(void) case CTimerd::TIMER_ZAPTO : dprintf(" Zapto: " PRINTF_CHANNEL_ID_TYPE_NO_LEADING_ZEROS - " epg: %s (%llx)\n", + " epg: %s (%" PRIx64 ")\n", static_cast(this)->eventInfo.channel_id, static_cast(this)->epgTitle.c_str(), static_cast(this)->eventInfo.epgID); @@ -959,7 +961,7 @@ void CTimerEvent::printEvent(void) case CTimerd::TIMER_RECORD : dprintf(" Record: " PRINTF_CHANNEL_ID_TYPE_NO_LEADING_ZEROS - " epg: %s(%llx) apids: 0x%X\n dir: %s\n", + " epg: %s(%" PRIx64 ") apids: 0x%X\n dir: %s\n", static_cast(this)->eventInfo.channel_id, static_cast(this)->epgTitle.c_str(), static_cast(this)->eventInfo.epgID, diff --git a/src/zapit/include/zapit/types.h b/src/zapit/include/zapit/types.h index 118ea8a2d..10fe5a60a 100644 --- a/src/zapit/include/zapit/types.h +++ b/src/zapit/include/zapit/types.h @@ -47,9 +47,9 @@ typedef uint64_t t_channel_id; #define CREATE_CHANNEL_ID(service_id,original_network_id,transport_stream_id) ((((t_channel_id)transport_stream_id) << 32) | (((t_channel_id)original_network_id) << 16) | (t_channel_id)service_id) #define CREATE_CHANNEL_ID64 (((uint64_t)(satellitePosition+freq*4) << 48) | ((uint64_t) transport_stream_id << 32) | ((uint64_t)original_network_id << 16) | (uint64_t)service_id) -#define PRINTF_CHANNEL_ID_TYPE "%16llx" -#define PRINTF_CHANNEL_ID_TYPE_NO_LEADING_ZEROS "%llx" -#define SCANF_CHANNEL_ID_TYPE "%llx" +#define PRINTF_CHANNEL_ID_TYPE "%16" PRIx64 +#define PRINTF_CHANNEL_ID_TYPE_NO_LEADING_ZEROS "%" PRIx64 +#define SCANF_CHANNEL_ID_TYPE "%" SCNx64 typedef uint64_t transponder_id_t; #if 0 @@ -65,7 +65,7 @@ typedef uint64_t transponder_id_t; #define SAME_TRANSPONDER(id1, id2) ((id1 >> 16) == (id2 >> 16)) -#define PRINTF_TRANSPONDER_ID_TYPE "%12llx" +#define PRINTF_TRANSPONDER_ID_TYPE "%12" PRIx64 #define TRANSPONDER_ID_NOT_TUNED 0 #define GET_ORIGINAL_NETWORK_ID_FROM_TRANSPONDER_ID(transponder_id) ((t_original_network_id)(transponder_id )) #define GET_TRANSPORT_STREAM_ID_FROM_TRANSPONDER_ID(transponder_id) ((t_transport_stream_id)(transponder_id >> 16)) diff --git a/src/zapit/src/Makefile.am b/src/zapit/src/Makefile.am index 80b9286cd..f3a415f67 100644 --- a/src/zapit/src/Makefile.am +++ b/src/zapit/src/Makefile.am @@ -1,4 +1,4 @@ -AM_CPPFLAGS = -fno-rtti -fno-exceptions +AM_CPPFLAGS = -fno-rtti -fno-exceptions -D__STDC_FORMAT_MACROS INCLUDES = \ -I$(top_builddir) \ diff --git a/src/zapit/src/bouquets.cpp b/src/zapit/src/bouquets.cpp index 8a74c0a8f..7cee4766c 100644 --- a/src/zapit/src/bouquets.cpp +++ b/src/zapit/src/bouquets.cpp @@ -7,6 +7,8 @@ * rasc , * thegoodguy * + * (C) 2009, 2011-2012 Stefan Seyfried + * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or @@ -386,7 +388,7 @@ void CBouquetManager::parseBouquetsXml(const char *fname, bool bUser) newBouquet->sortBouquet(); search = search->xmlNextNode; } - INFO("total: %d bouquets", Bouquets.size()); + INFO("total: %d bouquets", (int)Bouquets.size()); } xmlFreeDoc(parser); } diff --git a/src/zapit/src/capmt.cpp b/src/zapit/src/capmt.cpp index ab2ce6e9a..86a8ab8d6 100644 --- a/src/zapit/src/capmt.cpp +++ b/src/zapit/src/capmt.cpp @@ -3,6 +3,7 @@ * thegoodguy * * Copyright (C) 2011-2012 CoolStream International Ltd + * Copyright (C) 2012 Stefan Seyfried * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -187,7 +188,7 @@ bool CCamManager::SetMode(t_channel_id channel_id, enum runmode mode, bool start CZapitChannel * channel = CServiceManager::getInstance()->FindChannel(channel_id); if(channel == NULL) { - printf("CCamManager: channel %llx not found\n", channel_id); + printf("CCamManager: channel %" PRIx64 " not found\n", channel_id); return false; } //INFO("channel %llx [%s] mode %d %s update %d", channel_id, channel->getName().c_str(), mode, start ? "START" : "STOP", force_update); @@ -228,7 +229,7 @@ bool CCamManager::SetMode(t_channel_id channel_id, enum runmode mode, bool start if(cam->getSource() > 0) source = cam->getSource(); - INFO("channel %llx [%s] mode %d %s src %d mask %d -> %d update %d", channel_id, channel->getName().c_str(), + INFO("channel %" PRIx64 " [%s] mode %d %s src %d mask %d -> %d update %d", channel_id, channel->getName().c_str(), mode, start ? "START" : "STOP", source, oldmask, newmask, force_update); //INFO("source %d old mask %d new mask %d force update %s", source, oldmask, newmask, force_update ? "yes" : "no"); if((oldmask != newmask) || force_update) { diff --git a/src/zapit/src/femanager.cpp b/src/zapit/src/femanager.cpp index d001a47e9..15d07ad56 100644 --- a/src/zapit/src/femanager.cpp +++ b/src/zapit/src/femanager.cpp @@ -2,6 +2,7 @@ Neutrino-GUI - DBoxII-Project Copyright (C) 2011 CoolStream International Ltd + Copyright (C) 2012 Stefan Seyfried License: GPLv2 @@ -77,7 +78,7 @@ bool CFEManager::Init() delete fe; } } - INFO("found %d frontends\n", femap.size()); + INFO("found %d frontends\n", (int)femap.size()); if( femap.empty() ) return false; #if 0 @@ -357,7 +358,7 @@ CFrontend * CFEManager::findFrontend(CZapitChannel * channel) for(fe_map_iterator_t it = femap.begin(); it != femap.end(); it++) { CFrontend * fe = it->second; - INFO("Check fe%d: locked %d TP %llx - channel TP %llx", fe->fenumber, fe->Locked(), fe->getTsidOnid(), channel_tid); + INFO("Check fe%d: locked %d TP %" PRIx64 " - channel TP %" PRIx64 "", fe->fenumber, fe->Locked(), fe->getTsidOnid(), channel_tid); if(fe->tuned && fe->sameTsidOnid(channel->getTransponderId())) { same_tid_fe = fe; break; @@ -407,7 +408,7 @@ CFrontend * CFEManager::getLoopFE(CZapitChannel * channel) /* check is there any locked fe, remember fe with same transponder */ for(fe_map_iterator_t it = femap.begin(); it != femap.end(); it++) { CFrontend * fe = it->second; - INFO("Check fe%d: locked %d freq %d TP %llx - channel freq %d TP %llx", fe->fenumber, fe->Locked(), fe->getFrequency(), fe->getTsidOnid(), channel->getFreqId(), channel->getTransponderId()); + INFO("Check fe%d: locked %d freq %d TP %" PRIx64 " - channel freq %d TP %" PRIx64 "", fe->fenumber, fe->Locked(), fe->getFrequency(), fe->getTsidOnid(), channel->getFreqId(), channel->getTransponderId()); #if 0 if(fe->tuned && fe->sameTsidOnid(channel->getTransponderId())) { same_tid_fe = fe; // first with same tp id @@ -443,7 +444,7 @@ CFrontend * CFEManager::getIndependentFE(CZapitChannel * channel) satellite_map_t & satmap = fe->getSatellites(); sat_iterator_t sit = satmap.find(satellitePosition); bool configured = ((sit != satmap.end()) && sit->second.configured); - INFO("Check fe%d: locked %d freq %d TP %llx - channel freq %d TP %llx has sat %d: %s", + INFO("Check fe%d: locked %d freq %d TP %" PRIx64 " - channel freq %d TP %" PRIx64 " has sat %d: %s", fe->fenumber, fe->Locked(), fe->getFrequency(), fe->getTsidOnid(), channel->getFreqId(), channel->getTransponderId(), satellitePosition, configured ? "yes" : "no"); if(!configured) diff --git a/src/zapit/src/frontend.cpp b/src/zapit/src/frontend.cpp index 5e061b75a..904e71cb9 100644 --- a/src/zapit/src/frontend.cpp +++ b/src/zapit/src/frontend.cpp @@ -289,14 +289,14 @@ void CFrontend::reset(void) void CFrontend::Lock() { usecount++; - INFO("[fe%d] usecount %d tp %llx\n", fenumber, usecount, getTsidOnid()); + INFO("[fe%d] usecount %d tp %" PRIx64 "\n", fenumber, usecount, getTsidOnid()); } void CFrontend::Unlock() { if(usecount > 0) usecount--; - INFO("[fe%d] usecount %d tp %llx\n", fenumber, usecount, getTsidOnid()); + INFO("[fe%d] usecount %d tp %" PRIx64 "\n", fenumber, usecount, getTsidOnid()); } fe_code_rate_t CFrontend::getCFEC() @@ -1044,7 +1044,7 @@ bool CFrontend::setInput(CZapitChannel * channel, bool nvod) tpI = transponders.find(channel->getTransponderId()); if (tpI == transponders.end()) { - printf("Transponder %llx for channel %llx not found\n", ct, channel->getChannelID()); + printf("Transponder %" PRIx64 " for channel %" PRIx64 " not found\n", ct, channel->getChannelID()); return false; } diff --git a/src/zapit/src/getservices.cpp b/src/zapit/src/getservices.cpp index 035c7a9e4..2917291ba 100644 --- a/src/zapit/src/getservices.cpp +++ b/src/zapit/src/getservices.cpp @@ -406,7 +406,7 @@ void CServiceManager::ParseChannels(xmlNodePtr node, const t_transport_stream_id have_numbers = true; service_number_map_t::iterator it = channel_numbers->find(number); if(it != channel_numbers->end()) { - printf("[zapit] duplicate channel number %d: %s id %llx freq %d\n", number, + printf("[zapit] duplicate channel number %d: %s id %" PRIx64 " freq %d\n", number, name.c_str(), chid, freq); number = 0; dup_numbers = true; // force save after loading @@ -417,7 +417,7 @@ void CServiceManager::ParseChannels(xmlNodePtr node, const t_transport_stream_id bool ret = AddChannel(channel); //printf("INS CHANNEL %s %x\n", name.c_str(), (int) &ret.first->second); if(ret == false) { - printf("[zapit] duplicate channel %s id %llx freq %d (old %s at %d)\n", + printf("[zapit] duplicate channel %s id %" PRIx64 " freq %d (old %s at %d)\n", name.c_str(), chid, freq, channel->getName().c_str(), channel->getFreqId()); } else { service_count++; @@ -637,7 +637,7 @@ bool CServiceManager::LoadServices(bool only_current) xmlDocPtr parser; static bool satcleared = 0;//clear only once, because menu is static service_count = 0; - printf("[zapit] Loading services, channel size %d ..\n", sizeof(CZapitChannel)); + printf("[zapit] Loading services, channel size %d ..\n", (int)sizeof(CZapitChannel)); frontendType = CFEManager::getInstance()->getLiveFE()->getInfo()->type; if(only_current) @@ -699,13 +699,13 @@ bool CServiceManager::LoadServices(bool only_current) } LoadProviderMap(); - printf("[zapit] %d services loaded (%d)...\n", service_count, allchans.size()); + printf("[zapit] %d services loaded (%d)...\n", service_count, (int)allchans.size()); TIMER_STOP("[zapit] service loading took"); if(0) { //zapit_debug) {//FIXME sat_iterator_t sit; for(sit = satellitePositions.begin(); sit != satellitePositions.end(); ++sit) - printf("satelliteName = %s (%d), satellitePosition = %d motor position = %d usals %d\n", sit->second.name.c_str(), sit->second.name.size(), sit->first, sit->second.motor_position, sit->second.use_usals); + printf("satelliteName = %s (%d), satellitePosition = %d motor position = %d usals %d\n", sit->second.name.c_str(), (int)sit->second.name.size(), sit->first, sit->second.motor_position, sit->second.use_usals); } /* reset flag after loading services.xml */ services_changed = false; @@ -776,7 +776,7 @@ void CServiceManager::SaveServices(bool tocopy, bool if_changed) #ifdef SAVE_DEBUG set chans_processed; #endif - printf("CServiceManager::SaveServices: total channels: %d\n", allchans.size()); + printf("CServiceManager::SaveServices: total channels: %d\n", (int)allchans.size()); FILE * fd = fopen(SERVICES_TMP, "w"); if(!fd) { perror(SERVICES_TMP); diff --git a/src/zapit/src/pzapit.cpp b/src/zapit/src/pzapit.cpp index 73e06d5d9..269283171 100644 --- a/src/zapit/src/pzapit.cpp +++ b/src/zapit/src/pzapit.cpp @@ -273,7 +273,7 @@ int main (int argc, char** argv) { if (i < argc - 2) { - sscanf(argv[++i], "%lld", &satmask); + sscanf(argv[++i], "%" SCNd64 "", &satmask); sscanf(argv[++i], "%d", &diseqc[0]); /* diseqc[0] = strlen(argv[i+1]); @@ -347,7 +347,7 @@ int main (int argc, char** argv) { if (i < argc - 1) { - sscanf(argv[++i], "%llx", &zapsid); + sscanf(argv[++i], "%" SCNx64 "", &zapsid); continue; } } @@ -509,7 +509,7 @@ int main (int argc, char** argv) std::vector::const_iterator rI; for ( ii = 0, rI = satelliteList.begin(); rI != satelliteList.end(); ii++, rI++) - printf("%lld : %s %d\n", ii, rI->satName, rI->satPosition); + printf("%" PRId64 " : %s %d\n", ii, rI->satName, rI->satPosition); //std::cout << (1 << ii) << ": " << rI->satName << std::endl; return 0; @@ -577,7 +577,7 @@ int main (int argc, char** argv) if (getchannel) { t_channel_id channelid = zapit.getCurrentServiceID(); - printf("%llx (%s)\n", channelid, (zapit.getChannelName(channelid)).c_str()); + printf("%" PRIx64 " (%s)\n", channelid, (zapit.getChannelName(channelid)).c_str()); return 0; } @@ -587,7 +587,7 @@ int main (int argc, char** argv) if (zapsid > 0) { - printf("Zapping to: %llx (%s) ", zapsid, (zapit.getChannelName(zapsid)).c_str()); + printf("Zapping to: %" PRIx64 " (%s) ", zapsid, (zapit.getChannelName(zapsid)).c_str()); tmp = zapit.zapTo_serviceID(zapsid); if (!tmp) printf("failed"); diff --git a/src/zapit/src/scan.cpp b/src/zapit/src/scan.cpp index cea966769..6f1c35bc7 100644 --- a/src/zapit/src/scan.cpp +++ b/src/zapit/src/scan.cpp @@ -3,6 +3,8 @@ * * (C) 2002-2003 Andreas Oberritter * + * (C) 2009, 2001-2012 Stefan Seyfried + * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or @@ -220,7 +222,7 @@ bool CServiceScan::AddFromNit() } } nittransponders.clear(); - printf("\n\n[scan] found %d additional transponders from nit\n", scantransponders.size()); + printf("\n\n[scan] found %d additional transponders from nit\n", (int)scantransponders.size()); return !scantransponders.empty(); } @@ -311,7 +313,7 @@ _repeat: bouquet_map_t & tmp = bat.getBouquets(); for(bouquet_map_t::iterator it = tmp.begin(); it != tmp.end(); ++it) { bouquet_map[it->first].insert(it->second.begin(), it->second.end()); - printf("########### CServiceScan::ReadNitSdt: bouquet_map [%s] size %d ###########\n", it->first.c_str(), bouquet_map[it->first].size()); + printf("########### CServiceScan::ReadNitSdt: bouquet_map [%s] size %d ###########\n", it->first.c_str(), (int)bouquet_map[it->first].size()); } channel_number_map_t &lcn = bat.getLogicalMap(); logical_map.insert(lcn.begin(), lcn.end()); @@ -330,14 +332,14 @@ _repeat: transponder t2(frontendType, TsidOnid, tI->second.feparams, tI->second.polarization); transponders.insert(transponder_pair_t(TsidOnid, t2)); } - printf("[scan] tpid ready: %llx\n", TsidOnid); + printf("[scan] tpid ready: %" PRIx64 "\n", TsidOnid); } if((flags & SCAN_NIT) && AddFromNit()) goto _repeat; if ((flags & SCAN_LOGICAL_NUMBERS /*(SCAN_NIT|SCAN_LOGICAL_NUMBERS)*/) && !nit_logical_map.empty()) { std::string pname = networkName; - INFO("network [%s] %d logical channels (%d hd)\n", pname.c_str(), nit_logical_map.size(), nit_hd_logical_map.size()); + INFO("network [%s] %d logical channels (%d hd)\n", pname.c_str(), (int)nit_logical_map.size(), (int)nit_hd_logical_map.size()); g_bouquetManager->loadBouquets(true); CServiceManager::getInstance()->ResetChannelNumbers(true, true); CZapitBouquet* bouquet; @@ -389,7 +391,7 @@ _repeat: CZapitBouquet* bouquet; std::string pname = it->first; int bouquetId = g_bouquetManager->existsUBouquet(pname.c_str()); - printf("########### CServiceScan::ReadNitSdt: bouquet [%s] size %d id %d ###########\n", it->first.c_str(), bouquet_map[it->first].size(), bouquetId); + printf("########### CServiceScan::ReadNitSdt: bouquet [%s] size %d id %d ###########\n", it->first.c_str(), (int)bouquet_map[it->first].size(), bouquetId); if (bouquetId == -1) bouquet = g_bouquetManager->addBouquet(pname, true); else diff --git a/src/zapit/src/scanbat.cpp b/src/zapit/src/scanbat.cpp index c02fa0951..bf5b2a26e 100644 --- a/src/zapit/src/scanbat.cpp +++ b/src/zapit/src/scanbat.cpp @@ -162,7 +162,7 @@ bool CBat::Parse() const DescriptorList * dlist = bat->getDescriptors(); DescriptorConstIterator dit; #ifdef DEBUG_BAT - printf("BAT: section %d, %d descriptors\n", bat->getSectionNumber(), dlist->size()); + printf("BAT: section %d, %d descriptors\n", bat->getSectionNumber(), (int)dlist->size()); #endif unsigned int pdsd = 0; for (dit = dlist->begin(); dit != dlist->end(); ++dit) { @@ -220,7 +220,7 @@ bool CBat::Parse() dlist = b->getDescriptors(); #if 1 printf("BAT: bouquet_id %04x tsid %04x onid %04x %d descriptors\n", bouquet_id, b->getTransportStreamId(), - b->getOriginalNetworkId(), dlist->size()); + b->getOriginalNetworkId(), (int)dlist->size()); #endif for (dit = dlist->begin(); dit != dlist->end(); ++dit) { Descriptor * d = *dit; @@ -322,7 +322,7 @@ bool CBat::ParseLogicalChannels(LogicalChannelDescriptor * ld, BouquetAssociatio CZapitChannel * chan = CServiceManager::getInstance()->FindChannel48(channel_id); if(chan) name = chan->getName(); - printf("BAT: logical channel %05d: tsid %04x onid %04x %016llx [%s] visible %d\n", lcn, transport_stream_id, original_network_id, channel_id, name.c_str(), (*it)->getVisibleServiceFlag()); + printf("BAT: logical channel %05d: tsid %04x onid %04x %016" PRIx64 " [%s] visible %d\n", lcn, transport_stream_id, original_network_id, channel_id, name.c_str(), (*it)->getVisibleServiceFlag()); #endif } return true; diff --git a/src/zapit/src/transponder.cpp b/src/zapit/src/transponder.cpp index 1eebbcfcf..a5531982f 100644 --- a/src/zapit/src/transponder.cpp +++ b/src/zapit/src/transponder.cpp @@ -1,5 +1,6 @@ /* * Copyright (C) 2012 CoolStream International Ltd + * Copyright (C) 2012 Stefan Seyfried * * License: GPLv2 * @@ -137,15 +138,15 @@ void transponder::dump(std::string label) struct dvb_frontend_parameters *dvb_feparams = &feparams.dvb_feparams; if (type == FE_QAM) - printf("%s tp-id %016llx freq %d rate %d fec %d mod %d\n", label.c_str(), + printf("%s tp-id %016" PRIx64 " freq %d rate %d fec %d mod %d\n", label.c_str(), transponder_id, dvb_feparams->frequency, dvb_feparams->u.qam.symbol_rate, dvb_feparams->u.qam.fec_inner, dvb_feparams->u.qam.modulation); else if (type == FE_QPSK) - printf("%s tp-id %016llx freq %d rate %d fec %d pol %d\n", label.c_str(), + printf("%s tp-id %016" PRIx64 " freq %d rate %d fec %d pol %d\n", label.c_str(), transponder_id, dvb_feparams->frequency, dvb_feparams->u.qpsk.symbol_rate, dvb_feparams->u.qpsk.fec_inner, polarization); else if (type == FE_OFDM) - printf("%s tp-id %016llx freq %d bw %d coderate %d\n", label.c_str(), + printf("%s tp-id %016" PRIx64 " freq %d bw %d coderate %d\n", label.c_str(), transponder_id, dvb_feparams->frequency, dvb_feparams->u.ofdm.bandwidth, dvb_feparams->u.ofdm.code_rate_HP); } diff --git a/src/zapit/src/zapit.cpp b/src/zapit/src/zapit.cpp index f779c5ade..3618660dc 100644 --- a/src/zapit/src/zapit.cpp +++ b/src/zapit/src/zapit.cpp @@ -219,7 +219,7 @@ void CZapit::LoadAudioMap() int volume = 0; char s[1000]; while (fgets(s, 1000, audio_config_file)) { - sscanf(s, "%llx %d %d %d %d %d %d", &chan, &apid, &mode, &volume, &subpid, &ttxpid, &ttxpage); + sscanf(s, "%" SCNx64 " %d %d %d %d %d %d", &chan, &apid, &mode, &volume, &subpid, &ttxpid, &ttxpage); audio_map[chan].apid = apid; audio_map[chan].subpid = subpid; audio_map[chan].mode = mode; @@ -238,7 +238,7 @@ void CZapit::SaveAudioMap() return; } for (audio_map_iterator_t audio_map_it = audio_map.begin(); audio_map_it != audio_map.end(); audio_map_it++) { - fprintf(audio_config_file, "%llx %d %d %d %d %d %d\n", (uint64_t) audio_map_it->first, + fprintf(audio_config_file, "%" PRIx64 " %d %d %d %d %d %d\n", (uint64_t) audio_map_it->first, (int) audio_map_it->second.apid, (int) audio_map_it->second.mode, (int) audio_map_it->second.volume, (int) audio_map_it->second.subpid, (int) audio_map_it->second.ttxpid, (int) audio_map_it->second.ttxpage); } @@ -259,7 +259,7 @@ void CZapit::LoadVolumeMap() int volume = 0; char s[1000]; while (fgets(s, 1000, volume_config_file)) { - if (sscanf(s, "%llx %d %d", &chan, &apid, &volume) == 3) + if (sscanf(s, "%" SCNx64 " %d %d", &chan, &apid, &volume) == 3) vol_map.insert(volume_pair_t(chan, pid_pair_t(apid, volume))); } fclose(volume_config_file); @@ -273,7 +273,7 @@ void CZapit::SaveVolumeMap() return; } for (volume_map_iterator_t it = vol_map.begin(); it != vol_map.end(); ++it) - fprintf(volume_config_file, "%llx %d %d\n", (uint64_t) it->first, it->second.first, it->second.second); + fprintf(volume_config_file, "%" PRIx64 " %d %d\n", (uint64_t) it->first, it->second.first, it->second.second); fdatasync(fileno(volume_config_file)); fclose(volume_config_file); @@ -473,7 +473,7 @@ bool CZapit::ZapIt(const t_channel_id channel_id, bool forupdate, bool startplay return false; } - INFO("[zapit] zap to %s (%llx tp %llx)", newchannel->getName().c_str(), newchannel->getChannelID(), newchannel->getTransponderId()); + INFO("[zapit] zap to %s (%" PRIx64 " tp %" PRIx64 ")", newchannel->getName().c_str(), newchannel->getChannelID(), newchannel->getTransponderId()); CFrontend * fe = CFEManager::getInstance()->allocateFE(newchannel); if(fe == NULL) { @@ -576,7 +576,7 @@ bool CZapit::ZapForRecord(const t_channel_id channel_id) printf("zapit_to_record: channel_id " PRINTF_CHANNEL_ID_TYPE " not found", channel_id); return false; } - printf("%s: %s (%llx)\n", __FUNCTION__, newchannel->getName().c_str(), channel_id); + printf("%s: %s (%" PRIx64 ")\n", __FUNCTION__, newchannel->getName().c_str(), channel_id); CFrontend * frontend = CFEManager::getInstance()->allocateFE(newchannel); if(frontend == NULL) { @@ -616,7 +616,7 @@ void CZapit::SetPidVolume(t_channel_id channel_id, int pid, int percent) if (!pid && (channel_id == live_channel_id) && current_channel) pid = current_channel->getAudioPid(); -INFO("############################### channel %llx pid %x map size %d percent %d", channel_id, pid, vol_map.size(), percent); +INFO("############################### channel %" PRIx64 " pid %x map size %d percent %d", channel_id, pid, (int)vol_map.size(), percent); volume_map_range_t pids = vol_map.equal_range(channel_id); for (volume_map_iterator_t it = pids.first; it != pids.second; ++it) { if (it->second.first == pid) { @@ -657,7 +657,7 @@ int CZapit::GetPidVolume(t_channel_id channel_id, int pid, bool ac3) } } } - DBG("channel %llx pid %x map size %d percent %d", channel_id, pid, vol_map.size(), percent); + DBG("channel %" PRIx64 " pid %x map size %d percent %d", channel_id, pid, (int)vol_map.size(), percent); return percent; } @@ -2092,20 +2092,20 @@ unsigned int CZapit::ZapTo(t_channel_id channel_id, bool isSubService) unsigned int result = 0; if (!ZapIt(channel_id)) { - DBG("[zapit] zapit failed, chid %llx\n", channel_id); + DBG("[zapit] zapit failed, chid %" PRIx64 "\n", channel_id); SendEvent((isSubService ? CZapitClient::EVT_ZAP_SUB_FAILED : CZapitClient::EVT_ZAP_FAILED), &channel_id, sizeof(channel_id)); return result; } result |= CZapitClient::ZAP_OK; - DBG("[zapit] zapit OK, chid %llx\n", channel_id); + DBG("[zapit] zapit OK, chid %" PRIx64 "\n", channel_id); if (isSubService) { - DBG("[zapit] isSubService chid %llx\n", channel_id); + DBG("[zapit] isSubService chid %" PRIx64 "\n", channel_id); SendEvent(CZapitClient::EVT_ZAP_SUB_COMPLETE, &channel_id, sizeof(channel_id)); } else if (current_is_nvod) { - DBG("[zapit] NVOD chid %llx\n", channel_id); + DBG("[zapit] NVOD chid %" PRIx64 "\n", channel_id); SendEvent(CZapitClient::EVT_ZAP_COMPLETE_IS_NVOD, &channel_id, sizeof(channel_id)); result |= CZapitClient::ZAP_IS_NVOD; }