From: Russ Combs <rucombs@cisco.com>
Date: Tue, 7 Oct 2014 16:04:49 +0000 (-0400)
Subject: fixed some xcode analyzer issues
X-Git-Tag: 3.0.0-233~1383^2~34
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fbce494b608a6a641522b6cd1ac4aedaa9b0ac89;p=thirdparty%2Fsnort3.git

fixed some xcode analyzer issues
---

diff --git a/ChangeLog b/ChangeLog
index bf8eef6ac..05f7d8c0c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -21,6 +21,7 @@
 -- commented out mpse start up foo - needs reformatting
 -- added snort.detach() and fixed -j parsing
 -- various parsing changes for improved error handling
+-- fixed some Xcode analyzer issues
 
 122
 -- pulled thread pinning from Josh
diff --git a/src/detection/detect.cc b/src/detection/detect.cc
index d4a38595f..9f548740f 100644
--- a/src/detection/detect.cc
+++ b/src/detection/detect.cc
@@ -90,12 +90,11 @@ void snort_ignore(Packet*) { }
 
 void snort_inspect(Packet* p)
 {
-#ifdef PPM_MGR
-    uint64_t pktcnt=0;
-#endif
     PROFILE_VARS;
 
 #ifdef PPM_MGR
+    uint64_t pktcnt=0;
+
     /* Begin Packet Performance Monitoring  */
     if( PPM_PKTS_ENABLED() )
     {
diff --git a/src/time/profiler.h b/src/time/profiler.h
index cd63017d3..55ea3aa9c 100644
--- a/src/time/profiler.h
+++ b/src/time/profiler.h
@@ -55,6 +55,11 @@ struct ProfileStats
 #define PROFILE_VARS_NAMED(name) uint64_t name##_ticks_start, name##_ticks_end
 #define PROFILE_VARS PROFILE_VARS_NAMED(snort)
 
+// we could use PROFILE_START_NAMED(node) instead
+// but that confuses static analysis
+#define PROFILE_START_NODE \
+    get_clockticks(node_ticks_start)
+
 #define PROFILE_START_NAMED(name) \
     get_clockticks(name##_ticks_start)
 
@@ -75,7 +80,7 @@ struct ProfileStats
     if (PROFILING_RULES) { \
         unsigned id = get_instance_id(); \
         node->state[id].checks++; \
-        PROFILE_START_NAMED(node); \
+        PROFILE_START_NODE; \
     }
 
 #define NODE_PROFILE_END_MATCH(node) \
@@ -96,7 +101,7 @@ struct ProfileStats
 
 #define NODE_PROFILE_TMPSTART(node) \
     if (PROFILING_RULES) { \
-        PROFILE_START_NAMED(node); \
+        PROFILE_START_NODE; \
     }
 
 #define NODE_PROFILE_TMPEND(node) \