From: Russ Combs (rucombs) <rucombs@cisco.com>
Date: Fri, 17 Jun 2016 19:44:41 +0000 (-0400)
Subject: Merge pull request #529 in SNORT/snort3 from file_dynamic to master
X-Git-Tag: 3.0.0-233~363^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bd5d03a;p=thirdparty%2Fsnort3.git

Merge pull request #529 in SNORT/snort3 from file_dynamic to master

Squashed commit of the following:

commit 129312ffe89459131eea4e6293a762dbcc6dad7c
Author: huica <huica@cisco.com>
Date:   Fri Jun 17 10:30:50 2016 -0400

    fix dynamic build
---

diff --git a/src/file_api/file_flows.cc b/src/file_api/file_flows.cc
index 99e95de47..7fcd20850 100644
--- a/src/file_api/file_flows.cc
+++ b/src/file_api/file_flows.cc
@@ -171,9 +171,8 @@ bool FileFlows::file_process(FileContext* context, const uint8_t* file_data,
 
     context->set_file_config(&(snort_conf->file_config));
 
-    FileEnforcer* file_enforcer = FileService::get_file_enforcer();
-    if (file_enforcer &&
-        (file_enforcer->cached_verdict_lookup(flow, context) != FILE_VERDICT_UNKNOWN))
+    if((FileService::get_file_enforcer()->cached_verdict_lookup(flow, context)
+        != FILE_VERDICT_UNKNOWN))
         return true;
 
     /*file type id*/
diff --git a/src/file_api/file_lib.h b/src/file_api/file_lib.h
index 37056e8da..4c7b3fefd 100644
--- a/src/file_api/file_lib.h
+++ b/src/file_api/file_lib.h
@@ -37,7 +37,7 @@
 class FileCapture;
 class FileConfig;
 
-class FileInfo
+class SO_PUBLIC FileInfo
 {
 public:
     virtual ~FileInfo();
@@ -65,7 +65,7 @@ protected:
     size_t file_id = 0;
 };
 
-class FileContext: public FileInfo
+class SO_PUBLIC FileContext: public FileInfo
 {
 public:
     FileContext();
diff --git a/src/file_api/file_log.cc b/src/file_api/file_log.cc
index 413697064..5aff718cd 100644
--- a/src/file_api/file_log.cc
+++ b/src/file_api/file_log.cc
@@ -96,11 +96,11 @@ public:
     LogHandler(FileLogConfig& conf)
     { config = conf; }
 
-    void handle(DataEvent& e, Flow*);
+    void handle(DataEvent&, Flow*);
 
 private:
     FileLogConfig config;
-    void log_file_name(TextLog* log, FileContext* file);
+    void log_file_name(TextLog*, FileContext*);
 };
 
 void LogHandler::log_file_name(TextLog* log, FileContext* file)