From e82c6efacac73ff3ad5b8eb620a89322d8a4e0ca Mon Sep 17 00:00:00 2001
From: Victor Julien <victor@inliniac.net>
Date: Wed, 26 Feb 2014 06:49:45 +0100
Subject: [PATCH] Minor cleanups

Remove useless checks: coverity 1038130, 1038131, 1038132
Small other fixes: coverity 1164817
---
 src/app-layer-dcerpc-udp.c | 5 +----
 src/app-layer-dcerpc.c     | 5 +----
 src/app-layer-dns-common.c | 2 +-
 src/app-layer-smb.c        | 6 +-----
 4 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/src/app-layer-dcerpc-udp.c b/src/app-layer-dcerpc-udp.c
index 97858d6351..d94e6ca4ab 100644
--- 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 e928fd568d..8f8af1ac22 100644
--- 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 8c12ebe2d8..c1555b54b6 100644
--- 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 5c1249c8d0..c5818ae544 100644
--- 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;
 }