Merge pull request #1547 in SNORT/snort3 from ~SHRARANG/snort3:cppcheck_unified2_warn...

Squashed commit of the following:

commit 5dd20b0132607f4e6d597a3ac467de25671c32b7
Author: Shravan Rangaraju <shrarang@cisco.com>
Date:   Wed Mar 13 13:27:29 2019 -0400

    loggers: workaround for cppcheck's false warning

diff --git a/src/loggers/unified2.cc b/src/loggers/unified2.cc
index bbc78de7161482264d41700716c9b4809545bed8..0ba6026866e4f479d87d90d77222dd2e5b7674a6 100644 (file)
--- a/src/loggers/unified2.cc
+++ b/src/loggers/unified2.cc
@@ -319,8 +319,9 @@ static void AlertExtraData(
         uint32_t len = 0;
         uint32_t type = 0;
         uint8_t* write_buffer;
+        LogFunction log_func = log_funcs[xid-1];
 
-        if ( log_funcs[xid-1](flow, &write_buffer, &len, &type) && (len > 0) )
+        if ( log_func(flow, &write_buffer, &len, &type) && (len > 0) )
         {
             _WriteExtraData(config, event_id, event_second, write_buffer, len, type);
         }