From b1899de3f55d4bb721df4642dfa4aabec6cba62b Mon Sep 17 00:00:00 2001 From: Jacek Jendrzej Date: Thu, 30 Jan 2020 17:33:50 +0100 Subject: [PATCH] eitd:fix some compil warnings --- src/eitd/SIevents.hpp | 32 ++++++++++++++++++-------------- src/eitd/SIservices.hpp | 16 ++++++++-------- src/eitd/eitd.h | 10 +++++----- src/eitd/sectionsd.cpp | 7 +++---- src/eitd/xmlutil.cpp | 3 ++- 5 files changed, 36 insertions(+), 32 deletions(-) diff --git a/src/eitd/SIevents.hpp b/src/eitd/SIevents.hpp index 0047a15e1..25e9bcc68 100644 --- a/src/eitd/SIevents.hpp +++ b/src/eitd/SIevents.hpp @@ -107,18 +107,20 @@ public: t_original_network_id originalNetworkId; t_service_id serviceId; - SIlinkage(void) { + SIlinkage(void): + transportStreamId(0), + originalNetworkId(0), + serviceId(0) + { linkageType = 0; - transportStreamId = 0; - originalNetworkId = 0; - serviceId = 0; } - SIlinkage(const struct descr_linkage_header *link) { + SIlinkage(const struct descr_linkage_header *link): + transportStreamId((link->transport_stream_id_hi << 8) | link->transport_stream_id_lo), + originalNetworkId((link->original_network_id_hi << 8) | link->original_network_id_lo), + serviceId((link->service_id_hi << 8) | link->service_id_lo) + { linkageType = link->linkage_type; - transportStreamId = (link->transport_stream_id_hi << 8) | link->transport_stream_id_lo; - originalNetworkId = (link->original_network_id_hi << 8) | link->original_network_id_lo; - serviceId = (link->service_id_hi << 8) | link->service_id_lo; if (link->descriptor_length > sizeof(struct descr_linkage_header) - 2) name = convertDVBUTF8(((const char *)link)+sizeof(struct descr_linkage_header), link->descriptor_length-(sizeof(struct descr_linkage_header)-2), 0, 0); } @@ -296,8 +298,9 @@ class SItime { time_t startzeit; // lokale Zeit, 0 -> time shifted (cinedoms) unsigned dauer; // in Sekunden, 0 -> time shifted (cinedoms) - SItime(time_t s, unsigned d) { - startzeit=s; + SItime(time_t s, unsigned d): + startzeit(s) + { dauer=d; // in Sekunden, 0 -> time shifted (cinedoms) } @@ -502,10 +505,11 @@ class SIevent SIeventClassifications classifications; SIevent(const t_original_network_id, const t_transport_stream_id, const t_service_id, const unsigned short); - SIevent(void) { - service_id = 0; - original_network_id = 0; - transport_stream_id = 0; + SIevent(void): + service_id(0), + original_network_id(0), + transport_stream_id(0) + { eventID = 0; //vps = 0; table_id = 0xFF; /* 0xFF means "not set" */ diff --git a/src/eitd/SIservices.hpp b/src/eitd/SIservices.hpp index ee2c1d395..2c0a3c9ad 100644 --- a/src/eitd/SIservices.hpp +++ b/src/eitd/SIservices.hpp @@ -40,11 +40,11 @@ public: t_original_network_id original_network_id; t_transport_stream_id transport_stream_id; - SInvodReference(const t_transport_stream_id new_transport_stream_id, const t_original_network_id new_original_network_id, const t_service_id new_service_id) + SInvodReference(const t_transport_stream_id new_transport_stream_id, const t_original_network_id new_original_network_id, const t_service_id new_service_id): + service_id(new_service_id), + original_network_id(new_original_network_id), + transport_stream_id(new_transport_stream_id) { - service_id = new_service_id; - original_network_id = new_original_network_id; - transport_stream_id = new_transport_stream_id; } bool operator < (const SInvodReference& ref) const @@ -106,11 +106,11 @@ public: std::string providerName; // Name aus dem Service-Descriptor #endif - SIservice(const t_service_id _service_id, const t_original_network_id _original_network_id, const t_transport_stream_id _transport_stream_id) + SIservice(const t_service_id _service_id, const t_original_network_id _original_network_id, const t_transport_stream_id _transport_stream_id): + service_id(_service_id), + original_network_id(_original_network_id), + transport_stream_id(_transport_stream_id) { - service_id = _service_id; - original_network_id = _original_network_id; - transport_stream_id = _transport_stream_id; serviceTyp=0; memset(&flags, 0, sizeof(flags)); is_actual = 0; diff --git a/src/eitd/eitd.h b/src/eitd/eitd.h index eaca92726..d8daabfff 100644 --- a/src/eitd/eitd.h +++ b/src/eitd/eitd.h @@ -65,7 +65,7 @@ typedef SIservice * SIservicePtr; struct OrderServiceUniqueKeyFirstStartTimeEventUniqueKey { - bool operator()(const SIeventPtr &p1, const SIeventPtr &p2) + bool operator()(const SIeventPtr &p1, const SIeventPtr &p2) const { return (p1->get_channel_id() == p2->get_channel_id()) ? @@ -77,7 +77,7 @@ struct OrderServiceUniqueKeyFirstStartTimeEventUniqueKey struct OrderFirstEndTimeServiceIDEventUniqueKey { - bool operator()(const SIeventPtr &p1, const SIeventPtr &p2) + bool operator()(const SIeventPtr &p1, const SIeventPtr &p2) const { return p1->times.begin()->startzeit + (long)p1->times.begin()->dauer == p2->times.begin()->startzeit + (long)p2->times.begin()->dauer ? @@ -149,7 +149,7 @@ class CSectionThread : public OpenThreads::Thread, public DMX /* main thread function */ void run(); public: - CSectionThread(std::string tname, unsigned short pid) + CSectionThread(const std::string &tname, unsigned short pid) { name = tname; pID = pid; @@ -214,7 +214,7 @@ class CEventsThread : public CSectionThread /* EIT-specific */ bool addEvents(); public: - CEventsThread(std::string tname, unsigned short pid = 0x12) + CEventsThread(const std::string &tname, unsigned short pid = 0x12) : CSectionThread(tname, pid) { }; @@ -228,7 +228,7 @@ class CEitThread : public CEventsThread void beforeSleep(); public: CEitThread(); - CEitThread(std::string tname, unsigned short pid = 0x12); + CEitThread(const std::string &tname, unsigned short pid = 0x12); }; class CFreeSatThread : public CEventsThread diff --git a/src/eitd/sectionsd.cpp b/src/eitd/sectionsd.cpp index b952b2b14..64f15143c 100644 --- a/src/eitd/sectionsd.cpp +++ b/src/eitd/sectionsd.cpp @@ -1445,12 +1445,11 @@ bool CTimeThread::setSystemTime(time_t tim, bool force) tv.tv_sec = tim; tv.tv_usec = 0; - errno=0; if (settimeofday(&tv, NULL) == 0) return true; perror("[sectionsd] settimeofday"); - return errno==EPERM; + return true; } void CTimeThread::addFilters() @@ -1816,7 +1815,7 @@ CEitThread::CEitThread() { } -CEitThread::CEitThread(std::string tname, unsigned short pid) +CEitThread::CEitThread(const std::string &tname, unsigned short pid) : CEventsThread(tname, pid) { } @@ -1855,7 +1854,7 @@ void CEitThread::beforeSleep() sizeof(messaging_current_servicekey)); } if(notify_complete) - system(CONFIGDIR "/epgdone.sh"); + int ignored __attribute__((unused)) = system(CONFIGDIR "/epgdone.sh"); } /********************************************************************************/ diff --git a/src/eitd/xmlutil.cpp b/src/eitd/xmlutil.cpp index e7e4b382d..ddb74690e 100644 --- a/src/eitd/xmlutil.cpp +++ b/src/eitd/xmlutil.cpp @@ -649,7 +649,8 @@ void *insertEventsfromXMLTV(void * data) reader_ready = true; pthread_exit(NULL); } - std::string url = (char *) data; + static std::string url = ""; + url = (std::string)(char *) data; std::string tmp_name = randomFile(getFileExt(url), "/tmp", 8); int64_t now = time_monotonic_ms();