From: Russ Combs (rucombs) <rucombs@cisco.com>
Date: Wed, 24 Feb 2016 11:53:34 +0000 (-0500)
Subject: Merge pull request #290 in SNORT/snort3 from ~JOCORNET/snort3:warnings_fix to master
X-Git-Tag: 3.0.0-233~584
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8cd5ee1308ffe1adc624b74db1ea1be31eed93ac;p=thirdparty%2Fsnort3.git

Merge pull request #290 in SNORT/snort3 from ~JOCORNET/snort3:warnings_fix to master

Squashed commit of the following:

commit 500d61d4e061d2858f6b79cb356bc7ede254e37a
Author: Joel Cornett <joel.cornett@gmail.com>
Date:   Wed Feb 24 00:14:29 2016 -0500

    fix warnings in trough
---

diff --git a/src/packet_io/trough.cc b/src/packet_io/trough.cc
index 4f973a027..b4604e141 100644
--- a/src/packet_io/trough.cc
+++ b/src/packet_io/trough.cc
@@ -49,8 +49,6 @@ unsigned Trough::file_count = 0;
  ****************************************************************/
 int Trough::get_pcaps(std::vector<struct PcapReadObject> &pol, std::vector<std::string> &pcap_queue)
 {
-    int ret = 0;
-
     for (const PcapReadObject &pro : pol)
     {
         const std::string& arg = pro.arg;
@@ -134,7 +132,8 @@ int Trough::get_pcaps(std::vector<struct PcapReadObject> &pol, std::vector<std::
                 {
                     struct stat sb;
                     std::string pcap_name;
-                    auto i = 0, pos = 0;
+                    auto i = 0;
+                    size_t pos = 0;
 
                     if (arg.empty())
                     {