Minor fixes for coverity issues.

remotes/origin/HEAD
Victor Julien 14 years ago
parent c4e5e1482e
commit 2179ac2595

@ -223,13 +223,13 @@ void *ParseAFPConfig(const char *iface)
aconf->buffer_size = 0; aconf->buffer_size = 0;
} }
ConfGetChildValueBool(if_root, "disable-promisc", (int *)&boolval); (void)ConfGetChildValueBool(if_root, "disable-promisc", (int *)&boolval);
if (boolval) { if (boolval) {
SCLogInfo("Disabling promiscuous mode on iface %s", SCLogInfo("Disabling promiscuous mode on iface %s",
aconf->iface); aconf->iface);
aconf->promisc = 0; aconf->promisc = 0;
} }
ConfGetChildValueBool(if_root, "use-mmap", (int *)&boolval); (void)ConfGetChildValueBool(if_root, "use-mmap", (int *)&boolval);
if (boolval) { if (boolval) {
SCLogInfo("Enabling mmaped capture on iface %s", SCLogInfo("Enabling mmaped capture on iface %s",
aconf->iface); aconf->iface);
@ -290,7 +290,7 @@ int RunModeIdsAFPAuto(DetectEngineCtx *de_ctx)
TimeModeSetLive(); TimeModeSetLive();
ConfGet("af-packet.live-interface", &live_dev); (void)ConfGet("af-packet.live-interface", &live_dev);
ret = RunModeSetLiveCaptureAuto(de_ctx, ret = RunModeSetLiveCaptureAuto(de_ctx,
ParseAFPConfig, ParseAFPConfig,
@ -321,7 +321,7 @@ int RunModeIdsAFPAutoFp(DetectEngineCtx *de_ctx)
TimeModeSetLive(); TimeModeSetLive();
ConfGet("af-packet.live-interface", &live_dev); (void)ConfGet("af-packet.live-interface", &live_dev);
SCLogDebug("live_dev %s", live_dev); SCLogDebug("live_dev %s", live_dev);
@ -358,7 +358,7 @@ int RunModeIdsAFPSingle(DetectEngineCtx *de_ctx)
RunModeInitialize(); RunModeInitialize();
TimeModeSetLive(); TimeModeSetLive();
ConfGet("af-packet.live-interface", &live_dev); (void)ConfGet("af-packet.live-interface", &live_dev);
ret = RunModeSetLiveCaptureSingle(de_ctx, ret = RunModeSetLiveCaptureSingle(de_ctx,
ParseAFPConfig, ParseAFPConfig,
@ -395,7 +395,7 @@ int RunModeIdsAFPWorkers(DetectEngineCtx *de_ctx)
RunModeInitialize(); RunModeInitialize();
TimeModeSetLive(); TimeModeSetLive();
ConfGet("af-packet.live-interface", &live_dev); (void)ConfGet("af-packet.live-interface", &live_dev);
ret = RunModeSetLiveCaptureWorkers(de_ctx, ret = RunModeSetLiveCaptureWorkers(de_ctx,
ParseAFPConfig, ParseAFPConfig,

@ -218,7 +218,7 @@ int RunModeIdsPcapSingle(DetectEngineCtx *de_ctx)
RunModeInitialize(); RunModeInitialize();
TimeModeSetLive(); TimeModeSetLive();
ConfGet("pcap.single-pcap-dev", &live_dev); (void)ConfGet("pcap.single-pcap-dev", &live_dev);
ret = RunModeSetLiveCaptureSingle(de_ctx, ret = RunModeSetLiveCaptureSingle(de_ctx,
ParsePcapConfig, ParsePcapConfig,
@ -266,7 +266,7 @@ int RunModeIdsPcapAuto(DetectEngineCtx *de_ctx)
RunModeInitialize(); RunModeInitialize();
TimeModeSetLive(); TimeModeSetLive();
ConfGet("pcap.single-pcap-dev", &live_dev); (void) ConfGet("pcap.single-pcap-dev", &live_dev);
ret = RunModeSetLiveCaptureAuto(de_ctx, ret = RunModeSetLiveCaptureAuto(de_ctx,
ParsePcapConfig, ParsePcapConfig,
@ -310,7 +310,7 @@ int RunModeIdsPcapAutoFp(DetectEngineCtx *de_ctx)
RunModeInitialize(); RunModeInitialize();
TimeModeSetLive(); TimeModeSetLive();
ConfGet("pcap.single-pcap-dev", &live_dev); (void) ConfGet("pcap.single-pcap-dev", &live_dev);
ret = RunModeSetLiveCaptureAutoFp(de_ctx, ret = RunModeSetLiveCaptureAutoFp(de_ctx,
ParsePcapConfig, ParsePcapConfig,
@ -343,7 +343,7 @@ int RunModeIdsPcapWorkers(DetectEngineCtx *de_ctx)
RunModeInitialize(); RunModeInitialize();
TimeModeSetLive(); TimeModeSetLive();
ConfGet("pcap.single-pcap-dev", &live_dev); (void) ConfGet("pcap.single-pcap-dev", &live_dev);
ret = RunModeSetLiveCaptureWorkers(de_ctx, ret = RunModeSetLiveCaptureWorkers(de_ctx,
ParsePcapConfig, ParsePcapConfig,

@ -57,7 +57,7 @@ int MagicInit(void) {
goto error; goto error;
} }
ConfGet("magic-file", &filename); (void)ConfGet("magic-file", &filename);
if (filename != NULL) { if (filename != NULL) {
SCLogInfo("using magic-file %s", filename); SCLogInfo("using magic-file %s", filename);

@ -148,8 +148,10 @@ static int SCRConfInitContextAndLocalResources(DetectEngineCtx *de_ctx)
*/ */
static char *SCRConfGetConfFilename(void) static char *SCRConfGetConfFilename(void)
{ {
char *path = (char *)file_path; char *path = NULL;
ConfGet("reference-config-file", &path); if (ConfGet("reference-config-file", &path) != 1) {
return (char *)file_path;
}
return path; return path;
} }

Loading…
Cancel
Save