From: Jaroslav Kysela <perex@perex.cz>
Date: Tue, 6 Dec 2016 09:04:10 +0000 (+0100)
Subject: minor coverity fixes
X-Git-Tag: v4.2.1~187
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=dc73bf507fd9018f86914b90685a13ab4214b784;p=thirdparty%2Ftvheadend.git

minor coverity fixes
---

diff --git a/src/config.c b/src/config.c
index 1cee017c7..703b390ca 100644
--- 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 9b7bda8af..4e0a88361 100644
--- 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 5f16fd082..519dfb306 100644
--- 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 2dbd0bb68..9c815959e 100644
--- 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;