Minor cleanups

Remove useless checks: coverity 1038130, 1038131, 1038132
Small other fixes: coverity 1164817

diff --git a/src/app-layer-dcerpc-udp.c b/src/app-layer-dcerpc-udp.c
index 97858d6351cc08275d93d8e514484b35bcb30ce2..d94e6ca4abe164d3d438db760ac9259a2c167be9 100644 (file)
--- a/src/app-layer-dcerpc-udp.c
+++ b/src/app-layer-dcerpc-udp.c
@@ -796,10 +796,7 @@ static void DCERPCUDPStateFree(void *s) {
         sstate->dcerpc.dcerpcresponse.stub_data_buffer = NULL;
         sstate->dcerpc.dcerpcresponse.stub_data_buffer_len = 0;
     }
-       if (s) {
-               SCFree(s);
-               s = NULL;
-       }
+    SCFree(s);
 }
 
 static int DCERPCUDPRegisterPatternsForProtocolDetection(void)

diff --git a/src/app-layer-dcerpc.c b/src/app-layer-dcerpc.c
index e928fd568d664f7c699390e03a6706f8c71f6ed1..8f8af1ac2210bf86e78b69a0e064d41757526cfe 100644 (file)
--- a/src/app-layer-dcerpc.c
+++ b/src/app-layer-dcerpc.c
@@ -1976,10 +1976,7 @@ static void DCERPCStateFree(void *s) {
         sstate->dcerpc.dcerpcresponse.stub_data_buffer_len = 0;
     }
 
-    if (s) {
-        SCFree(s);
-        s = NULL;
-    }
+    SCFree(s);
 }
 
 static int DCERPCRegisterPatternsForProtocolDetection(void)

diff --git a/src/app-layer-dns-common.c b/src/app-layer-dns-common.c
index 8c12ebe2d8830300e5a078f1ede509d2d0c66a46..c1555b54b6308cd321403ad903cb5fbbe24338b9 100644 (file)
--- a/src/app-layer-dns-common.c
+++ b/src/app-layer-dns-common.c
@@ -76,7 +76,7 @@ void DNSDecrMemcap(uint32_t size, DNSState *state) {
     }
 
     BUG_ON(size > SC_ATOMIC_GET(dns_memuse)); /**< TODO remove later */
-    SC_ATOMIC_SUB(dns_memuse, size);
+    (void)SC_ATOMIC_SUB(dns_memuse, size);
 }
 
 int DNSCheckMemcap(uint32_t want, DNSState *state) {

diff --git a/src/app-layer-smb.c b/src/app-layer-smb.c
index 5c1249c8d0609224ed1d82dc9b40a6e8f2394617..c5818ae544d0ce4e954567f3f5e1a5c3c049d2bc 100644 (file)
--- a/src/app-layer-smb.c
+++ b/src/app-layer-smb.c
@@ -1455,11 +1455,7 @@ static void SMBStateFree(void *s) {
         sstate->dcerpc.dcerpcresponse.stub_data_buffer_len = 0;
     }
 
-    if (s) {
-        SCFree(s);
-        s = NULL;
-    }
-
+    SCFree(s);
     SCReturn;
 }