From: Russ Combs (rucombs) <rucombs@cisco.com>
Date: Thu, 4 Feb 2016 22:26:03 +0000 (-0500)
Subject: Merge pull request #239 in SNORT/snort3 from ~JOCORNET/snort3:file_api_quickfix to... 
X-Git-Tag: 3.0.0-233~634
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9880f36b9dcb155d883f763127786d3658cd3da4;p=thirdparty%2Fsnort3.git

Merge pull request #239 in SNORT/snort3 from ~JOCORNET/snort3:file_api_quickfix to master

Squashed commit of the following:

commit 8b6ed886036a2e6bdf86a07aff0161503d363447
Author: Joel Cornett <joel.cornett@gmail.com>
Date:   Thu Feb 4 17:22:50 2016 -0500

    fixed mismatched return types in FileCapture::capture_size() signature
---

diff --git a/src/file_api/file_capture.cc b/src/file_api/file_capture.cc
index fa312e9be..651bcd4d0 100644
--- a/src/file_api/file_capture.cc
+++ b/src/file_api/file_capture.cc
@@ -399,13 +399,8 @@ FileCaptureBlock* FileCapture::get_file_data(uint8_t** buff, int* size)
     return (current_block);
 }
 
-/*
- * Get the file size captured in the file buffer
- *
- * Returns:
- *   the size of file
- */
-size_t FileCapture::capture_size()
+// Get the file size captured in the file buffer
+uint64_t FileCapture::capture_size() const
 {
     return file_size;
 }
diff --git a/src/file_api/file_capture.h b/src/file_api/file_capture.h
index 84bba83b9..790df8623 100644
--- a/src/file_api/file_capture.h
+++ b/src/file_api/file_capture.h
@@ -70,7 +70,7 @@ public:
     // Get the file size captured in the file buffer
     // Returns:
     //   the size of file
-    uint64_t capture_size();
+    uint64_t capture_size() const;
 
     // Store files on local disk
     void store_file(FileContext *file);