From: Ed Borgoyn <eborgoyn@cisco.com>
Date: Thu, 21 Apr 2016 19:05:02 +0000 (-0400)
Subject: Code review fixes.
X-Git-Tag: 3.0.0-233~433^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fecc66f7b590216920351d0ea697267687bc68f9;p=thirdparty%2Fsnort3.git

Code review fixes.
---

diff --git a/src/connectors/file_connector/test/file_connector_test.cc b/src/connectors/file_connector/test/file_connector_test.cc
index 20ec905c1..4db9059d1 100644
--- a/src/connectors/file_connector/test/file_connector_test.cc
+++ b/src/connectors/file_connector/test/file_connector_test.cc
@@ -22,10 +22,10 @@
 #include <CppUTest/CommandLineTestRunner.h>
 #include <CppUTest/TestHarness.h>
 
-#include "../file_connector.h"
-#include "../file_connector_module.h"
+#include "connectors/file_connector/file_connector.h"
+#include "connectors/file_connector/file_connector_module.h"
 
-#include "../../../main/snort_debug.h"
+#include "main/snort_debug.h"
 
 void show_stats(PegCount*, const PegInfo*, unsigned, const char*) { }
 
@@ -36,8 +36,7 @@ void show_stats(PegCount*, const PegInfo*, IndexVec&, const char*, FILE*) { }
 const char* get_instance_file(std::string& file, const char* name)
 { UNUSED(file); UNUSED(name); return "filename"; }
 
-void Debug::print(const char* file, int line, uint64_t dbg, const char* fmt, ...)
-{ UNUSED(file);  UNUSED(line); UNUSED(dbg); UNUSED(fmt); }
+void Debug::print(const char*, int, uint64_t, const char*, ...) { }
 
 TEST_GROUP(file_connector_msg_handle)
 {
diff --git a/src/flow/ha.cc b/src/flow/ha.cc
index 6fec3aef9..a0f874559 100644
--- a/src/flow/ha.cc
+++ b/src/flow/ha.cc
@@ -39,7 +39,7 @@ static const uint8_t key_size_ip6 = sizeof(FlowKey);
 // ip4 key is smaller by 2*(ip6-addr-size - ip4-addr-size) or 2*(16 - 4) = 24
 static const uint8_t key_size_ip4 = sizeof(FlowKey)-24;
 
-static const int ONE_MILLION = 1000000;
+static const suseconds_t USEC_PER_SEC = 1000000;
 
 enum
 {
@@ -144,9 +144,9 @@ bool FlowHAState::old_enough()
 void FlowHAState::set_next_update()
 {
     next_update.tv_usec += min_session_lifetime.tv_usec;
-    if (next_update.tv_usec > ONE_MILLION)
+    if (next_update.tv_usec > USEC_PER_SEC)
     {
-        next_update.tv_usec -= ONE_MILLION;
+        next_update.tv_usec -= USEC_PER_SEC;
         next_update.tv_sec++;
     }
     next_update.tv_sec += min_session_lifetime.tv_sec;
diff --git a/src/flow/test/ha_test.cc b/src/flow/test/ha_test.cc
index f6f80a72c..1e15384d2 100644
--- a/src/flow/test/ha_test.cc
+++ b/src/flow/test/ha_test.cc
@@ -22,10 +22,10 @@
 #include <CppUTest/CommandLineTestRunner.h>
 #include <CppUTest/TestHarness.h>
 
-#include "../ha.h"
+#include "flow/ha.h"
 
-#include "../flow.h"
-#include "../../main/snort_debug.h"
+#include "flow/flow.h"
+#include "main/snort_debug.h"
 
 #define MSG_SIZE 100
 
@@ -36,8 +36,11 @@ public:
     ~StreamHAClient() { }
     void consume(Flow*, HAMessage*) { }
     void produce(Flow*, HAMessage* msg)
-    { for ( uint8_t i=0; i<10; i++,*(msg->cursor)++=i); }
-    size_t get_message_size() { return sizeof(10); }
+    {
+        for ( uint8_t i=0; i<10; i++ )
+            *(msg->cursor)++ = i;
+    }
+    size_t get_message_size() { return 10; }
 
 private:
 };
@@ -49,11 +52,9 @@ static SCMessage s_sc_message;
 static Flow s_flow;
 static DAQ_PktHdr_t s_pkthdr;
 
-void LogMessage(const char* format,...)
-{ UNUSED(format); }
+void LogMessage(const char*,...) { }
 
-void Debug::print(const char* file, int line, uint64_t dbg, const char* fmt, ...)
-{ UNUSED(file);  UNUSED(line); UNUSED(dbg); UNUSED(fmt); }
+void Debug::print(const char*, int, uint64_t, const char*, ...) { }
 
 void packet_gettimeofday(struct timeval* tv)
 { *tv = s_time; }
diff --git a/src/side_channel/test/side_channel_test.cc b/src/side_channel/test/side_channel_test.cc
index 6ee10f90a..69d4d03e6 100644
--- a/src/side_channel/test/side_channel_test.cc
+++ b/src/side_channel/test/side_channel_test.cc
@@ -22,12 +22,12 @@
 #include <CppUTest/CommandLineTestRunner.h>
 #include <CppUTest/TestHarness.h>
 
-#include "../side_channel.h"
+#include "side_channel/side_channel.h"
+#include "side_channel/side_channel_module.h"
 
-#include "../../log/messages.h"
-#include "../main/snort_debug.h"
-#include "../managers/connector_manager.h"
-#include "../side_channel_module.h"
+#include "log/messages.h"
+#include "main/snort_debug.h"
+#include "managers/connector_manager.h"
 
 class TestConnector : public Connector
 {
@@ -50,11 +50,9 @@ void show_stats(PegCount*, const PegInfo*, unsigned, const char*) { }
 
 void show_stats(PegCount*, const PegInfo*, IndexVec&, const char*) { }
 
-void ParseWarning(WarningGroup wg, const char* format, ...)
-{ UNUSED(wg); UNUSED(format); }
+void ParseWarning(WarningGroup, const char*, ...) { }
 
-void Debug::print(const char* file, int line, uint64_t dbg, const char* fmt, ...)
-{ UNUSED(file);  UNUSED(line); UNUSED(dbg); UNUSED(fmt); }
+void Debug::print(const char*, int, uint64_t, const char*, ...) { }
 
 TEST_GROUP(side_channel)
 {