From 5155982ba597105d7b5fb14f4894064500601c1f Mon Sep 17 00:00:00 2001 From: Victor Julien Date: Fri, 4 Sep 2020 10:52:04 +0200 Subject: [PATCH] pcap: fix minor scan-build warnings --- src/source-pcap-file.c | 2 ++ src/source-pcap.c | 3 +-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/source-pcap-file.c b/src/source-pcap-file.c index 6d2c0b564a..4b2c28550d 100644 --- a/src/source-pcap-file.c +++ b/src/source-pcap-file.c @@ -307,6 +307,8 @@ TmEcode ReceivePcapFileThreadInit(ThreadVars *tv, const void *initdata, void **d if (pv->should_recurse == true && pv->should_loop == true) { SCLogError(SC_ERR_INVALID_ARGUMENT, "Error, --pcap-file-continuous and --pcap-file-recursive " "cannot be used together."); + CleanupPcapFileDirectoryVars(pv); + CleanupPcapFileThreadVars(ptv); SCReturnInt(TM_ECODE_FAILED); } diff --git a/src/source-pcap.c b/src/source-pcap.c index 63cc425d17..9e49b40e17 100644 --- a/src/source-pcap.c +++ b/src/source-pcap.c @@ -653,14 +653,13 @@ void PcapTranslateIPToDevice(char *pcap_dev, size_t len) struct addrinfo ai_hints; struct addrinfo *ai_list = NULL; - int ret = 0; memset(&ai_hints, 0, sizeof(ai_hints)); ai_hints.ai_family = AF_UNSPEC; ai_hints.ai_flags = AI_NUMERICHOST; /* try to translate IP */ - if ((ret = getaddrinfo(pcap_dev, NULL, &ai_hints, &ai_list)) != 0) { + if (getaddrinfo(pcap_dev, NULL, &ai_hints, &ai_list) != 0) { return; } -- 2.47.2