Merge pull request #2007 in SNORT/snort3 from ~OKHOMIAK/snort3:not_load_daq_in_test_m...

Squashed commit of the following:

commit 3988e995744d8ab7d87c47824086cbd80706d7b0
Author: Oleksii Khomiakovskyi <okhomiak@cisco.com>
Date:   Thu Feb 13 21:55:30 2020 +0200

    sfdaq: converted parsing related error messages in DAQ init to ParseErrors

diff --git a/src/packet_io/sfdaq.cc b/src/packet_io/sfdaq.cc
index 1e1d0cd2acc32c88be47ce322bd7b4ab0d419701..3814bf98c0875629539c04c572b3efc436ce2ae2 100644 (file)
--- a/src/packet_io/sfdaq.cc
+++ b/src/packet_io/sfdaq.cc
@@ -161,7 +161,7 @@ static bool AddDaqModuleConfig(const SFDAQModuleConfig *dmc)
     DAQ_Module_h module = daq_find_module(module_name);
     if (!module)
     {
-        ErrorMessage("Could not find requested DAQ module: %s\n", module_name);
+        ParseError("Could not find requested DAQ module: %s\n", module_name);
         return false;
     }
 
@@ -190,7 +190,7 @@ static bool AddDaqModuleConfig(const SFDAQModuleConfig *dmc)
         const char* value = kvp.second.length() ? kvp.second.c_str() : nullptr;
         if (daq_module_config_set_variable(modcfg, key, value) != DAQ_SUCCESS)
         {
-            ErrorMessage("Error setting DAQ configuration variable with key '%s' and value '%s'! (%d)",
+            ParseError("Error setting DAQ configuration variable with key '%s' and value '%s'! (%d)",
                     key, value, rval);
             daq_module_config_destroy(modcfg);
             return false;
@@ -199,7 +199,7 @@ static bool AddDaqModuleConfig(const SFDAQModuleConfig *dmc)
 
     if ((rval = daq_config_push_module_config(daqcfg, modcfg)) != DAQ_SUCCESS)
     {
-        ErrorMessage("Error pushing DAQ module configuration for '%s' onto the DAQ config! (%d)\n",
+        ParseError("Error pushing DAQ module configuration for '%s' onto the DAQ config! (%d)\n",
                 daq_module_get_name(module), rval);
         daq_module_config_destroy(modcfg);
         return false;