minor coverity fixes

diff --git a/src/config.c b/src/config.c
index 1cee017c763b5e721b1ca2e049ff3e795dcf98ba..703b390cab88a802ee2f05f7ab1894a74d7c7f7e 100644 (file)
--- a/src/config.c
+++ b/src/config.c
@@ -519,7 +519,9 @@ config_migrate_v3 ( void )
   if (!access(dst, R_OK | W_OK))
     return;
 
-  hts_settings_makedirs(dst);
+  if (hts_settings_makedirs(dst))
+    return;
+
   hts_settings_buildpath(src, sizeof(src), "input/linuxdvb/networks");
   rename(src, dst);
 }

diff --git a/src/descrambler/descrambler.c b/src/descrambler/descrambler.c
index 9b7bda8af1b1103af7c4a753280a898724987df1..4e0a8836198bd1e2e325b1d92dcbaf294f28abe6 100644 (file)
--- a/src/descrambler/descrambler.c
+++ b/src/descrambler/descrambler.c
@@ -422,9 +422,12 @@ descrambler_external ( service_t *t, int state )
 {
   th_descrambler_runtime_t *dr;
 
+  if (t == NULL)
+    return;
+
   lock_assert(&t->s_stream_mutex);
 
-  if (t == NULL || (dr = t->s_descramble) == NULL)
+  if ((dr = t->s_descramble) == NULL)
     return;
   dr->dr_external = state ? 1 : 0;
   service_reset_streaming_status_flags(t, TSS_NO_DESCRAMBLER);

diff --git a/src/input/mpegts/linuxdvb/linuxdvb_ca.c b/src/input/mpegts/linuxdvb/linuxdvb_ca.c
index 5f16fd082fc9cb4a730d16da01edbede5ae9b3e5..519dfb3060cded2e4f6e6c4b17c837c75b225693 100644 (file)
--- a/src/input/mpegts/linuxdvb/linuxdvb_ca.c
+++ b/src/input/mpegts/linuxdvb/linuxdvb_ca.c
@@ -141,7 +141,9 @@ linuxdvb_ca_class_enabled_notify ( void *p, const char *lang )
       pthread_join(lca->lca_en50221_thread, NULL);
     }
 
-    ioctl(lca->lca_ca_fd, CA_RESET, NULL);
+    if (ioctl(lca->lca_ca_fd, CA_RESET, NULL))
+      tvherror(LS_LINUXDVB, "unable to reset ca%u %s",
+               lca->lca_number, lca->lca_ca_path);
 
     close(lca->lca_ca_fd);
     lca->lca_ca_fd = -1;

diff --git a/src/input/mpegts/linuxdvb/linuxdvb_en50494.c b/src/input/mpegts/linuxdvb/linuxdvb_en50494.c
index 2dbd0bb68f0b712d6b2b20554166dde28a288665..9c815959e5016c1142b5053b7a468dd465b2feb4 100644 (file)
--- a/src/input/mpegts/linuxdvb/linuxdvb_en50494.c
+++ b/src/input/mpegts/linuxdvb/linuxdvb_en50494.c
@@ -236,7 +236,7 @@ linuxdvb_en50607_freq0
   ( linuxdvb_en50494_t *le, int freq, int *rfreq, uint16_t *t )
 {
   /* transponder value - t */
-  *t = round(freq / 1000) - 100;
+  *t = round((double)freq / 1000) - 100;
   if (*t > 2047) {
     tvherror(LS_EN50494, "transponder value bigger then 2047 for freq %d (%d)", freq, le->le_frequency);
     return -1;