From 2179ac2595a6b75aa9cd67455e6e148b14fbad8a Mon Sep 17 00:00:00 2001
From: Victor Julien <victor@inliniac.net>
Date: Tue, 3 Jul 2012 14:23:56 +0200
Subject: [PATCH] Minor fixes for coverity issues.

---
 src/runmode-af-packet.c     | 12 ++++++------
 src/runmode-pcap.c          |  8 ++++----
 src/util-magic.c            |  2 +-
 src/util-reference-config.c |  6 ++++--
 4 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/src/runmode-af-packet.c b/src/runmode-af-packet.c
index 871269fd8f..d599033c1a 100644
--- a/src/runmode-af-packet.c
+++ b/src/runmode-af-packet.c
@@ -223,13 +223,13 @@ void *ParseAFPConfig(const char *iface)
         aconf->buffer_size = 0;
     }
 
-    ConfGetChildValueBool(if_root, "disable-promisc", (int *)&boolval);
+    (void)ConfGetChildValueBool(if_root, "disable-promisc", (int *)&boolval);
     if (boolval) {
         SCLogInfo("Disabling promiscuous mode on iface %s",
                 aconf->iface);
         aconf->promisc = 0;
     }
-    ConfGetChildValueBool(if_root, "use-mmap", (int *)&boolval);
+    (void)ConfGetChildValueBool(if_root, "use-mmap", (int *)&boolval);
     if (boolval) {
         SCLogInfo("Enabling mmaped capture on iface %s",
                 aconf->iface);
@@ -290,7 +290,7 @@ int RunModeIdsAFPAuto(DetectEngineCtx *de_ctx)
 
     TimeModeSetLive();
 
-    ConfGet("af-packet.live-interface", &live_dev);
+    (void)ConfGet("af-packet.live-interface", &live_dev);
 
     ret = RunModeSetLiveCaptureAuto(de_ctx,
                                     ParseAFPConfig,
@@ -321,7 +321,7 @@ int RunModeIdsAFPAutoFp(DetectEngineCtx *de_ctx)
 
     TimeModeSetLive();
 
-    ConfGet("af-packet.live-interface", &live_dev);
+    (void)ConfGet("af-packet.live-interface", &live_dev);
 
     SCLogDebug("live_dev %s", live_dev);
 
@@ -358,7 +358,7 @@ int RunModeIdsAFPSingle(DetectEngineCtx *de_ctx)
     RunModeInitialize();
     TimeModeSetLive();
 
-    ConfGet("af-packet.live-interface", &live_dev);
+    (void)ConfGet("af-packet.live-interface", &live_dev);
 
     ret = RunModeSetLiveCaptureSingle(de_ctx,
                                     ParseAFPConfig,
@@ -395,7 +395,7 @@ int RunModeIdsAFPWorkers(DetectEngineCtx *de_ctx)
     RunModeInitialize();
     TimeModeSetLive();
 
-    ConfGet("af-packet.live-interface", &live_dev);
+    (void)ConfGet("af-packet.live-interface", &live_dev);
 
     ret = RunModeSetLiveCaptureWorkers(de_ctx,
                                     ParseAFPConfig,
diff --git a/src/runmode-pcap.c b/src/runmode-pcap.c
index 29c8e74df6..3281fdeee1 100644
--- a/src/runmode-pcap.c
+++ b/src/runmode-pcap.c
@@ -218,7 +218,7 @@ int RunModeIdsPcapSingle(DetectEngineCtx *de_ctx)
     RunModeInitialize();
     TimeModeSetLive();
 
-    ConfGet("pcap.single-pcap-dev", &live_dev);
+    (void)ConfGet("pcap.single-pcap-dev", &live_dev);
 
     ret = RunModeSetLiveCaptureSingle(de_ctx,
                                     ParsePcapConfig,
@@ -266,7 +266,7 @@ int RunModeIdsPcapAuto(DetectEngineCtx *de_ctx)
     RunModeInitialize();
     TimeModeSetLive();
 
-    ConfGet("pcap.single-pcap-dev", &live_dev);
+    (void) ConfGet("pcap.single-pcap-dev", &live_dev);
 
     ret = RunModeSetLiveCaptureAuto(de_ctx,
                                     ParsePcapConfig,
@@ -310,7 +310,7 @@ int RunModeIdsPcapAutoFp(DetectEngineCtx *de_ctx)
     RunModeInitialize();
     TimeModeSetLive();
 
-    ConfGet("pcap.single-pcap-dev", &live_dev);
+    (void) ConfGet("pcap.single-pcap-dev", &live_dev);
 
     ret = RunModeSetLiveCaptureAutoFp(de_ctx,
                               ParsePcapConfig,
@@ -343,7 +343,7 @@ int RunModeIdsPcapWorkers(DetectEngineCtx *de_ctx)
     RunModeInitialize();
     TimeModeSetLive();
 
-    ConfGet("pcap.single-pcap-dev", &live_dev);
+    (void) ConfGet("pcap.single-pcap-dev", &live_dev);
 
     ret = RunModeSetLiveCaptureWorkers(de_ctx,
                                     ParsePcapConfig,
diff --git a/src/util-magic.c b/src/util-magic.c
index dfdaa5b59b..f018882166 100644
--- a/src/util-magic.c
+++ b/src/util-magic.c
@@ -57,7 +57,7 @@ int MagicInit(void) {
         goto error;
     }
 
-    ConfGet("magic-file", &filename);
+    (void)ConfGet("magic-file", &filename);
     if (filename != NULL) {
         SCLogInfo("using magic-file %s", filename);
 
diff --git a/src/util-reference-config.c b/src/util-reference-config.c
index 94a8db8c99..8212c3b522 100644
--- a/src/util-reference-config.c
+++ b/src/util-reference-config.c
@@ -148,8 +148,10 @@ static int SCRConfInitContextAndLocalResources(DetectEngineCtx *de_ctx)
  */
 static char *SCRConfGetConfFilename(void)
 {
-    char *path = (char *)file_path;
-    ConfGet("reference-config-file", &path);
+    char *path = NULL;
+    if (ConfGet("reference-config-file", &path) != 1) {
+        return (char *)file_path;
+    }
     return path;
 }