Merge pull request #75 in SNORT/snort3 from crc/fixups to master

Squashed commit of the following:

commit 0a8976eb1dd494ef2f2f722c1cbddba8faef2791
Author: russ <russ@localhost.localdomain>
Date:   Fri Oct 9 17:31:07 2015 -0400

    fix gcc linkage, empty format warnings

diff --git a/src/Makefile.am b/src/Makefile.am
index 1d3b2d3a051ed5de272b0ac32d05a3b05109c823..f395fc3a3b8bbbc00959f755d8048892b3ba863a 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -44,9 +44,7 @@ snort_LDFLAGS = -export-dynamic
 # from gnu linker
 snort_LDADD = \
 $(test_list) \
-target_based/libtarget_based.a \
 managers/libmanagers.a \
-main/libmain.a \
 loggers/libloggers.a \
 codecs/libcodecs.a \
 codecs/ip/libip_codecs.a \
@@ -75,8 +73,10 @@ mime/libmime.a \
 service_inspectors/http_inspect/libhttp_inspect.a \
 $(pig_list) \
 ips_options/libips_options.a \
-parser/libparser.a \
 search_engines/libsearch_engines.a \
+target_based/libtarget_based.a \
+main/libmain.a \
+parser/libparser.a \
 flow/libflow.a \
 control/libcontrol.a \
 filters/libfilter.a \

diff --git a/src/log/messages.cc b/src/log/messages.cc
index 82797c8a57916a106de4827ac9b5d44b132a3242..ee0476cc25cc1b7b29c1fee5c7b944412dd9d439 100644 (file)
--- a/src/log/messages.cc
+++ b/src/log/messages.cc
@@ -431,7 +431,7 @@ TEST_CASE( "throttled error logger", "[ThrottledErrorLogger]" )
     SECTION( "2nd message within 1 second" )
     {
         const char msg[] = "second message";
-        logger.log("");
+        logger.log(" ");
 
         REQUIRE_FALSE( logger.log("%s\n", msg) );
     }
@@ -441,7 +441,7 @@ TEST_CASE( "throttled error logger", "[ThrottledErrorLogger]" )
         logger.throttle_duration = 0;
         const char msg[] = "zero duration";
 
-        logger.log(""); // trigger throttling
+        logger.log(" "); // trigger throttling
         REQUIRE( logger.log("%s\n", msg) );
 
         CHECK( check_message(logger.last_message(), msg) );
@@ -450,7 +450,7 @@ TEST_CASE( "throttled error logger", "[ThrottledErrorLogger]" )
     SECTION( "message @ duration" )
     {
         const char msg[] = "at duration";
-        logger.log(""); // trigger throttling
+        logger.log(" "); // trigger throttling
 
         set_packet_time(dur - 1);
         CHECK_FALSE( logger.log("%s\n", msg) );
@@ -459,7 +459,7 @@ TEST_CASE( "throttled error logger", "[ThrottledErrorLogger]" )
     SECTION( "message after duration" )
     {
         const char msg[] = "after duration";
-        logger.log(""); // trigger throttling
+        logger.log(" "); // trigger throttling
 
         set_packet_time(dur);
         REQUIRE( logger.log("%s\n", msg) );
@@ -472,7 +472,7 @@ TEST_CASE( "throttled error logger", "[ThrottledErrorLogger]" )
         const char msg[] = "reversed packet time";
 
         set_packet_time(10);
-        logger.log("");
+        logger.log(" ");
 
         set_packet_time(4);
         REQUIRE( logger.log("%s\n", msg) );