Fix some coverity issues (#1308)

Co-authored-by: Catalin Toda <[email protected]>

Author: catalinii

src/adapter.cpp

@@ -107,10 +107,8 @@ adapter *adapter_alloc() {
 
     ad->drop_encrypted = opts.drop_encrypted;
 
-    if (!ad->buf) {
-        ad->lbuf = opts.adapter_buffer;
-        ad->buf = (unsigned char *)malloc(ad->lbuf + 10);
-    }
+    ad->lbuf = opts.adapter_buffer;
+    ad->buf = (unsigned char *)malloc(ad->lbuf + 10);
 
 #ifndef DISABLE_PMT
     // filter for pid 0
@@ -338,11 +336,10 @@ int init_hw(int i) {
 
 int init_all_hw() {
     int i, rv;
-
+    std::lock_guard<SMutex> lock(a_mutex);
     LOG("starting init_all_hw %d", init_complete);
     if (init_complete)
         return num_adapters;
-    std::lock_guard<SMutex> lock(a_mutex);
     find_adapters();
     num_adapters = 0;
     init_complete = 1;

src/ddci.cpp

@@ -164,7 +164,7 @@ void dump_mapping_table() {
                 for (const auto &elem : m.pmt)
                     out += std::to_string(elem) + " ";
 
-                LOGM("DD %d, ddpid %d, adapter %d pid %d, rewrite %d: %d PMTS "
+                LOGM("DD %d, ddpid %d, adapter %d pid %d, rewrite %d: %zu PMTS "
                      "%s",
                      m.ddci, m.ddci_pid, m.ad, m.pid, m.rewrite, m.pmt.size(),
                      out.c_str());

src/dvb.cpp

@@ -1443,7 +1443,7 @@ int dvb_demux_set_pid(adapter *a, int i_pid) {
         }
         LOG("AD %d [dvr %d %d], setting filter on PID %d for fd %d, active "
             "pids %d",
-            a->id, i_pid, fd, a->active_pids);
+            a->id, a->pa, a->fn, i_pid, fd, a->active_pids);
         return fd;
     }
 

src/socketworks.cpp

@@ -552,15 +552,16 @@ int sockets_add(int sock, USockAddr *sa, int sid, int type, socket_action a,
 int sockets_del(int sock) {
     int i, so;
     sockets *ss;
+    std::unique_lock<SMutex> lock(s_mutex);
 
     if (sock < 0 || sock >= MAX_SOCKS || !s[sock] || !s[sock]->enabled ||
-        !s[sock]->is_enabled)
+        !s[sock]->is_enabled) {
         return 0;
+    }
 
     ss = s[sock];
-    mutex_lock(&ss->mutex);
+    std::unique_lock<SMutex> lock2(ss->mutex);
     if (!ss->enabled) {
-        mutex_unlock(&ss->mutex);
         return 0;
     }
     if (ss->close)
@@ -602,10 +603,9 @@ int sockets_del(int sock) {
         "%d",
         sock, i, so);
 
-    mutex_lock(&s_mutex);
     ss->enabled = 0;
-    mutex_unlock(&s_mutex);
-    mutex_unlock(&ss->mutex);
+    lock2.unlock();
+    lock.unlock();
 
     for (i = 0; i < MAX_SOCKS; i++)
         if (s[i] && s[i]->enabled && s[i]->master == sock) {

src/utils.cpp

@@ -519,9 +519,6 @@ int find_new_id(void **arr, int count) {
     struct struct_array **sa = (struct struct_array **)arr;
     for (i = 0; i < count; i++)
         if (!sa[i] || !sa[i]->enabled) {
-            if (!sa[i]) {
-                return i;
-            }
             return i;
         }
     return -1;