From: huica <huica@cisco.com>
Date: Fri, 26 Jun 2015 19:14:22 +0000 (-0400)
Subject: code clean up
X-Git-Tag: 3.0.0-233~828^2~73
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=96b6335389ef4e44f722e8fe77f06a40f097d8eb;p=thirdparty%2Fsnort3.git

code clean up
---

diff --git a/src/file_api/file_service.cc b/src/file_api/file_service.cc
index bdef623cc..76c4dd89a 100644
--- a/src/file_api/file_service.cc
+++ b/src/file_api/file_service.cc
@@ -49,9 +49,6 @@
 #include "framework/inspector.h"
 #include "detection_util.h"
 
-// FIXIT-M bad dependency; use inspector::get_buf()
-#include "service_inspectors/http_inspect/hi_main.h"
-
 int64_t FileConfig::show_data_depth = DEFAULT_FILE_SHOW_DATA_DEPTH;
 bool FileConfig::trace_type = false;
 bool FileConfig::trace_signature = false;
diff --git a/src/file_api/file_stats.h b/src/file_api/file_stats.h
index a4d7ff61d..d6fbab517 100644
--- a/src/file_api/file_stats.h
+++ b/src/file_api/file_stats.h
@@ -56,10 +56,5 @@ extern FileStats file_stats;
 
 void print_file_stats();
 
-/*
- * Print out file statistics
- */
-void print_file_stats(int exiting);
-
 #endif
 
diff --git a/src/file_api/libs/file_lib.cc b/src/file_api/libs/file_lib.cc
index a6a322156..9ee4cd055 100644
--- a/src/file_api/libs/file_lib.cc
+++ b/src/file_api/libs/file_lib.cc
@@ -58,8 +58,6 @@ FileContext::FileContext ()
     file_config = NULL;
     expires  = 0;
     file_capture = NULL;
-    verdict = FILE_VERDICT_UNKNOWN;
-    suspend_block_verdict = false;
     file_state = {FILE_CAPTURE_SUCCESS, FILE_SIG_PROCESSING};
     file_id = 0;
     file_config_version = 0;
diff --git a/src/file_api/libs/file_lib.h b/src/file_api/libs/file_lib.h
index 6b766a3f9..7448e792c 100644
--- a/src/file_api/libs/file_lib.h
+++ b/src/file_api/libs/file_lib.h
@@ -46,13 +46,14 @@ public:
      FileContext();
      ~FileContext();
 
-    /* main processing functions */
+    // main processing functions
     void process_file_type(const uint8_t* file_data, int data_size, FilePosition position);
     void process_file_signature_sha256(const uint8_t* file_data, int data_size, FilePosition pos);
     void update_file_size(int data_size, FilePosition position);
     void stop_file_capture();
     FileCaptureState process_file_capture(const uint8_t* file_data, int data_size, FilePosition pos);
 
+    // Configuration functions
     void config_file_type(bool enabled);
     bool is_file_type_enabled();
     void config_file_signature(bool enabled);
@@ -60,7 +61,7 @@ public:
     void config_file_capture(bool enabled);
     bool is_file_capture_enabled();
 
-    /*File properties*/
+    //File properties
     uint32_t get_file_type();
     void set_file_name(const uint8_t* file_name, uint32_t name_size);
     bool get_file_name( uint8_t** file_name, uint32_t* name_size);
@@ -78,6 +79,7 @@ public:
 
     void print_file_sha256();
     void print();
+
 private:
     bool file_type_enabled;
     bool file_signature_enabled;
@@ -94,8 +96,6 @@ private:
     FileConfig* file_config;
     time_t expires;
     FileCapture *file_capture;
-    File_Verdict verdict;
-    bool suspend_block_verdict;
     FileState file_state;
     uint32_t file_id;
     uint32_t file_config_version;