fix some findings from static code analysis

Author: Zabrimus

ffmpeghandler.cpp

@@ -81,7 +81,7 @@ std::vector<std::string> FFmpegHandler::prepareStreamCmdVideo(const m3u_stream &
 
     // add optional audio input
     std::vector<std::string> audioMetadata;
-    for (auto a : stream.audio) {
+    for (const auto& a : stream.audio) {
         callStr.emplace_back("-thread_queue_size");
         callStr.emplace_back(std::to_string(IptvConfig.GetThreadQueueSize()));
         callStr.emplace_back("-i");
@@ -188,7 +188,7 @@ std::vector<std::string> FFmpegHandler::prepareStreamCmdAudio(const m3u_stream &
 
     // add optional audio input
     std::vector<std::string> audioMetadata;
-    for (auto a : stream.audio) {
+    for (const auto& a : stream.audio) {
         callStr.emplace_back("-i");
         callStr.emplace_back(a.uri);
     }

iptv.cpp

@@ -224,7 +224,7 @@ cString cPluginIptv::SVDRPCommand(const char *commandP, const char *optionP, int
             return device->GetInformation(page);
         } else {
             replyCodeP = 550; // Requested action not taken
-            return cString("IPTV information not available!");
+            return {"IPTV information not available!"};
         }
     } else if (strcasecmp(commandP, "MODE")==0) {
         unsigned int mode = !IptvConfig.GetUseBytes();

iptvservice.h

@@ -5,9 +5,7 @@
  *
  */
 
-#ifndef __IPTVSERVICE_H
-#define __IPTVSERVICE_H
-
+#pragma once
 #include <vdr/tools.h>
 
 #define stIptv ('I' << 24)
@@ -18,5 +16,3 @@ struct IptvService_v1_0 {
     cString bitrate;
 };
 
-#endif //__IPTVSERVICE_H
-

m3u8handler.cpp

@@ -3,13 +3,13 @@
 #include "config.h"
 #include "process.hpp"
 
-std::pair<std::string, std::string> splitUri(std::string uri) {
+std::pair<std::string, std::string> splitUri(const std::string& uri) {
     auto yturi = uri::parse_uri(uri);
     std::string host = yturi.scheme + "://" + yturi.authority.host
         + (yturi.authority.port > 0 ? std::to_string(yturi.authority.port) : "");
 
     std::string query;
-    for (auto a : yturi.query) {
+    for (const auto& a : yturi.query) {
         query.append(a.first).append("=").append(a.second).append("&");
     }
 
@@ -222,12 +222,12 @@ m3u_stream M3u8Handler::parseM3u(const std::string &webUri, int useYtdlp) {
     return result;
 }
 
-void M3u8Handler::printStream(m3u_stream stream) {
+void M3u8Handler::printStream(const m3u_stream& stream) {
     debug2("Url: %s\n", stream.url.c_str());
     debug2("   Width: %d, Height: %d\n", stream.width, stream.height);
     if (! stream.audio.empty()) {
         debug2("   Audio:\n");
-        for (auto s : stream.audio) {
+        for (const auto& s : stream.audio) {
             debug2("      Type: %s\n", s.type.c_str());
             debug2("      Lang: %s\n", s.language.c_str());
             debug2("      Name: %s\n", s.name.c_str());

m3u8handler.h

@@ -37,7 +37,7 @@ class M3u8Handler {
     explicit M3u8Handler();
     static m3u_stream parseM3u(const std::string &uri, int useYtdlp);
 
-    static void printStream(m3u_stream stream);
+    static void printStream(const m3u_stream& stream);
 
 private:
     static bool startsWith(const std::string &str, const std::string &prefix);

protocolcurl.cpp

@@ -161,7 +161,7 @@ size_t cIptvProtocolCurl::DescribeCallback(void *ptrP, size_t sizeP, size_t nmem
             found = true;
         }
 
-        // ... and find out its' attribute
+        // ... and find out its attribute
         if (found && strstr(r, "a=control")) {
             char *s = nullptr;
             if (sscanf(r, "a=control:%255ms", &s)==1)

protocolext.cpp

@@ -6,14 +6,10 @@
  */
 
 #include <sys/wait.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netdb.h>
 #include <fcntl.h>
 #include <unistd.h>
 
 #include <vdr/device.h>
-#include <vdr/plugin.h>
 
 #include "common.h"
 #include "config.h"
@@ -187,7 +183,7 @@ cIptvProtocolExt::SetSource(const char *locationP,
         // Update script file and parameter
         scriptFileM = cString::sprintf("%s/%s", IptvConfig.GetResourceDirectory(), locationP);
 
-        if ((stat(*scriptFileM, &stbuf) != 0) || (strstr(*scriptFileM, "..") != 0)) {
+        if ((stat(*scriptFileM, &stbuf) != 0) || (strstr(*scriptFileM, "..") != nullptr)) {
             error("Non-existent or relative path script '%s'", *scriptFileM);
 
             return false;

protocolfile.cpp

@@ -5,9 +5,6 @@
  *
  */
 
-#include <fcntl.h>
-#include <unistd.h>
-
 #include <vdr/device.h>
 
 #include "common.h"

protocolhttp.cpp

@@ -5,12 +5,7 @@
  *
  */
 
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netdb.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <string.h>
+#include <cstring>
 
 #include <vdr/device.h>
 

protocolm3u.cpp

@@ -86,7 +86,7 @@ cIptvProtocolM3U::SetSource(const char *locationP,
 
     struct stat stbuf;
     cString configFileM = cString::sprintf("%s/%s", IptvConfig.GetResourceDirectory(), locationP);
-    if ((stat(*configFileM, &stbuf)!=0) || (strstr(*configFileM, "..")!=0)) {
+    if ((stat(*configFileM, &stbuf)!=0) || (strstr(*configFileM, "..") != nullptr)) {
         error("Non-existent or relative configuration file '%s'", *configFileM);
 
         return false;

protocolradio.cpp

@@ -1,5 +1,3 @@
-#include <fstream>
-
 #include "protocolradio.h"
 #include "common.h"
 #include "config.h"

protocolstream.cpp

@@ -1,5 +1,3 @@
-#include <fstream>
-
 #include "protocolstream.h"
 #include "common.h"
 #include "config.h"

protocoludp.cpp

@@ -5,15 +5,8 @@
  *
  */
 
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netdb.h>
-#include <fcntl.h>
-#include <unistd.h>
-
 #include <vdr/device.h>
 
-#include "common.h"
 #include "config.h"
 #include "log.h"
 #include "socket.h"

sectionfilter.cpp

@@ -13,14 +13,15 @@ cIptvSectionFilter::cIptvSectionFilter(int deviceIndexP, uint16_t pidP, uint8_t
     : pusiSeenM(0),
       feedCcM(0),
       doneqM(0),
-      secBufM(NULL),
+      secBufM(nullptr),
       secBufpM(0),
       secLenM(0),
       tsFeedpM(0),
       pidM(pidP),
       ringBufferM(new cRingBufferFrame(eDmxMaxSectionCount*eDmxMaxSectionSize)),
       deviceIndexM(deviceIndexP) {
     debug16("%s (%d, %d)", __PRETTY_FUNCTION__, deviceIndexM, pidM);
+
     int i;
 
     memset(secBufBaseM, 0, sizeof(secBufBaseM));
@@ -74,20 +75,20 @@ cIptvSectionFilter::~cIptvSectionFilter() {
     socketM[0] = -1;
     if (tmp >= 0)
         close(tmp);
-    secBufM = NULL;
+    secBufM = nullptr;
     DELETENULL(ringBufferM);
 }
 
 inline uint16_t cIptvSectionFilter::GetLength(const uint8_t *dataP) {
     return (uint16_t) (3 + ((dataP[1] & 0x0f) << 8) + dataP[2]);
 }
 
-void cIptvSectionFilter::New(void) {
+void cIptvSectionFilter::New() {
     tsFeedpM = secBufpM = secLenM = 0;
     secBufM = secBufBaseM;
 }
 
-int cIptvSectionFilter::Filter(void) {
+int cIptvSectionFilter::Filter() {
     if (secBufM) {
         int i;
         uint8_t neq = 0;
@@ -108,7 +109,7 @@ int cIptvSectionFilter::Filter(void) {
     return 0;
 }
 
-inline int cIptvSectionFilter::Feed(void) {
+inline int cIptvSectionFilter::Feed() {
     if (Filter() < 0)
         return -1;
     secLenM = 0;
@@ -205,7 +206,7 @@ void cIptvSectionFilter::Process(const uint8_t *dataP) {
     }
 }
 
-bool cIptvSectionFilter::Send(void) {
+bool cIptvSectionFilter::Send() {
     bool result = false;
     cFrame *section = ringBufferM->Get();
     if (section) {
@@ -261,7 +262,7 @@ cIptvSectionFilterHandler::~cIptvSectionFilterHandler() {
         Delete(i);
 }
 
-void cIptvSectionFilterHandler::Action(void) {
+void cIptvSectionFilterHandler::Action() {
     debug1("%s Entering [device %d]", __PRETTY_FUNCTION__, deviceIndexM);
     bool processed = false;
     // Do the thread loop
@@ -315,7 +316,7 @@ void cIptvSectionFilterHandler::Action(void) {
     debug1("%s Exiting [device %d]", __PRETTY_FUNCTION__, deviceIndexM);
 }
 
-cString cIptvSectionFilterHandler::GetInformation(void) {
+cString cIptvSectionFilterHandler::GetInformation() {
     debug16("%s [device %d]", __PRETTY_FUNCTION__, deviceIndexM);
     // loop through active section filters
     cMutexLock MutexLock(&mutexM);
@@ -338,7 +339,7 @@ bool cIptvSectionFilterHandler::Delete(unsigned int indexP) {
     if ((indexP < eMaxSecFilterCount) && filtersM[indexP]) {
         debug16("%s (%d) Found [device %d]", __PRETTY_FUNCTION__, indexP, deviceIndexM);
         cIptvSectionFilter *tmp = filtersM[indexP];
-        filtersM[indexP] = NULL;
+        filtersM[indexP] = nullptr;
         delete tmp;
         return true;
     }

socket.cpp

@@ -5,9 +5,7 @@
  *
  */
 
-#include <sys/types.h>
 #include <sys/socket.h>
-#include <net/if.h>
 #include <netdb.h>
 #include <fcntl.h>
 #include <unistd.h>
@@ -41,7 +39,7 @@ cIptvSocket::~cIptvSocket() {
 bool cIptvSocket::OpenSocket(const int portP, const bool isUdpP) {
     debug1("%s (%d, %d)", __PRETTY_FUNCTION__, portP, isUdpP);
 
-    // If socket is there already and it is bound to a different port, it must
+    // If socket is there already, and it is bound to a different port, it must
     // be closed first
     if (portP != socketPortM) {
         debug1("%s (%d, %d) Socket tear-down", __PRETTY_FUNCTION__, portP, isUdpP);
@@ -102,7 +100,7 @@ void cIptvSocket::CloseSocket() {
     if (packetErrorsM) {
         info("Detected %d RTP packet errors", packetErrorsM);
         packetErrorsM = 0;
-        lastErrorReportM = time(NULL);
+        lastErrorReportM = time(nullptr);
     }
 }
 
@@ -286,10 +284,10 @@ int cIptvUdpSocket::Read(unsigned char *bufferAddrP, unsigned int bufferLenP) {
         if (len > 0) {
 #ifndef __FreeBSD__
             // Process auxiliary received data and validate source address
-            for (struct cmsghdr *cmsg = CMSG_FIRSTHDR(&msgh); cmsg!=NULL; cmsg = CMSG_NXTHDR(&msgh, cmsg)) {
-                if ((cmsg->cmsg_level==SOL_IP) && (cmsg->cmsg_type==IP_PKTINFO)) {
+            for (struct cmsghdr *cmsg = CMSG_FIRSTHDR(&msgh); cmsg !=nullptr; cmsg = CMSG_NXTHDR(&msgh, cmsg)) {
+                if ((cmsg->cmsg_level == SOL_IP) && (cmsg->cmsg_type == IP_PKTINFO)) {
                     struct in_pktinfo *i = (struct in_pktinfo *) CMSG_DATA(cmsg);
-                    if ((i->ipi_addr.s_addr==streamAddrM) || (htonl(INADDR_ANY)==streamAddrM)) {
+                    if ((i->ipi_addr.s_addr == streamAddrM) || (htonl(INADDR_ANY) == streamAddrM)) {
 #endif // __FreeBSD__
                         if (bufferAddrP[0] == TS_SYNC_BYTE) {
                             return len;
@@ -310,7 +308,7 @@ int cIptvUdpSocket::Read(unsigned char *bufferAddrP, unsigned int bufferLenP) {
                                 sequenceNumberM = -1;
                             } else if ((sequenceNumberM >= 0) && (((sequenceNumberM + 1)%0xFFFF)!=seq)) {
                                 packetErrorsM++;
-                                if (time(NULL) - lastErrorReportM > eReportIntervalS) {
+                                if (time(nullptr) - lastErrorReportM > eReportIntervalS) {
                                     info("Detected %d RTP packet errors", packetErrorsM);
                                     packetErrorsM = 0;
                                     lastErrorReportM = time(nullptr);

tool/convm3u.cpp

@@ -1,7 +1,5 @@
 #include <regex>
 #include <sstream>
-#include <iostream>
-#include <set>
 #include "m3upipe.h"
 #include "convm3u.h"
 

tool/m3upipe.h

@@ -2,6 +2,7 @@
 // Created by paul on 12/27/23.
 //
 
+#include <string>
 #include <stdlib.h>
 #include <stdio.h>
 #include <fcntl.h>