From: Russ Combs (rucombs) <rucombs@cisco.com>
Date: Mon, 1 May 2017 16:41:39 +0000 (-0400)
Subject: Merge pull request #876 in SNORT/snort3 from warnings to master
X-Git-Tag: 3.0.0-233~10
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0a97bd660db38874306d58caa8f9ed55ac43e06f;p=thirdparty%2Fsnort3.git

Merge pull request #876 in SNORT/snort3 from warnings to master

Squashed commit of the following:

commit 26670f34b12aba46c2416950ad3ec26f04f0f33c
Author: Michael Altizer <mialtize@cisco.com>
Date:   Mon May 1 11:39:57 2017 -0400

    main: Fix compiler warnings when SHELL is not enabled
---

diff --git a/src/main.cc b/src/main.cc
index 3fee35c28..e7830c03f 100644
--- a/src/main.cc
+++ b/src/main.cc
@@ -110,7 +110,9 @@ static int main_read()
 
 static Request request;
 static Request* current_request = &request;
+#ifdef SHELL
 static int current_fd = -1;
+#endif
 
 //-------------------------------------------------------------------------
 // pig foo
@@ -270,7 +272,9 @@ static void broadcast(AnalyzerCommand* ac)
 
 static AnalyzerCommand* get_command(AnalyzerCommand* ac, bool from_shell)
 {
-#ifdef SHELL
+#ifndef SHELL
+    UNUSED(from_shell);
+#else
     if ( from_shell )
         return ( new ACShellCmd(current_fd, ac) );
     else