From: Russ Combs <rucombs@cisco.com>
Date: Wed, 1 Jul 2015 21:23:57 +0000 (-0400)
Subject: compiler cleanup
X-Git-Tag: 3.0.0-233~935
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3a20f1b0a8da8d9b2afb2c4f9b14fdf0bc3d3398;p=thirdparty%2Fsnort3.git

compiler cleanup
---

diff --git a/src/framework/parameter.cc b/src/framework/parameter.cc
index 54e15acaf..dc435cb6d 100644
--- a/src/framework/parameter.cc
+++ b/src/framework/parameter.cc
@@ -428,7 +428,7 @@ const Parameter* Parameter::find(const Parameter* p, const char* s)
 {
     while ( p->name )
     {
-        if ( !strcmp(p->name, s) || p->is_wild_card(s) )
+        if ( !strcmp(p->name, s) || p->is_wild_card() )
             return p;
         ++p;
     }
diff --git a/src/service_inspectors/sip/ips_sip_method.cc b/src/service_inspectors/sip/ips_sip_method.cc
index 90bed5290..43e98e24c 100644
--- a/src/service_inspectors/sip/ips_sip_method.cc
+++ b/src/service_inspectors/sip/ips_sip_method.cc
@@ -176,11 +176,9 @@ bool SipMethodModule::set(const char*, Value& v, SnortConfig*)
 {
     if ( v.is("*method") )
     {
-        int i_method;
         char* tok = (char*)v.get_string();
         SIPMethodNode *method = NULL;
 
-        num_tokens++;
         if (tok[0] == '!')
         {
             negated = true;
@@ -190,7 +188,7 @@ bool SipMethodModule::set(const char*, Value& v, SnortConfig*)
             negated = false;
 
         /*Only one method is allowed with !*/
-        if (negated && (num_tokens > 1))
+        if (negated && (++num_tokens > 1))
             ParseError("Only one method is allowed with ! for sip_method\n");
 
         method = add_sip_method(tok);
diff --git a/src/service_inspectors/sip/sip_dialog.cc b/src/service_inspectors/sip/sip_dialog.cc
index 7da354661..750d6a7cc 100644
--- a/src/service_inspectors/sip/sip_dialog.cc
+++ b/src/service_inspectors/sip/sip_dialog.cc
@@ -378,7 +378,6 @@ static int SIP_checkMediaChange(SIPMsg* sipMsg, SIP_DialogData* dialog)
 static int SIP_ignoreChannels(SIP_DialogData* dialog, Packet* p, SIP_PROTO_CONF* config)
 {
     SIP_MediaData* mdataA,* mdataB;
-    FlowData *fd;
 
     if (0 == config->ignoreChannel)
         return false;
@@ -404,21 +403,23 @@ static int SIP_ignoreChannels(SIP_DialogData* dialog, Packet* p, SIP_PROTO_CONF*
             sfip_to_str(&mdataA->maddress), mdataA->mport); );
         DEBUG_WRAP(DebugMessage(DEBUG_SIP, "Ignoring channels Destine IP: %s Port: %u\n",
             sfip_to_str(&mdataB->maddress), mdataB->mport); );
+
         /* Call into Streams to mark data channel as something to ignore. */
 #ifdef HAVE_DAQ_ADDRESS_SPACE_ID
-        fd = stream.get_application_data_from_ip_port((uint8_t)PktType::UDP, IPPROTO_UDP, &mdataA->maddress,mdataA->mport,
-            &mdataB->maddress,
-            mdataB->mport, 0, 0, p->pkth->address_space_id, SipFlowData::flow_id);
+        FlowData* fd = stream.get_application_data_from_ip_port(
+            (uint8_t)PktType::UDP, IPPROTO_UDP, &mdataA->maddress,mdataA->mport,
+            &mdataB->maddress, mdataB->mport, 0, 0, p->pkth->address_space_id,
+            SipFlowData::flow_id);
 #else
-        fd = stream.get_application_data_from_ip_port((uint8_t)PktType::UDP, IPPROTO_UDP, &mdataA->maddress,mdataA->mport,
-            &mdataB->maddress,
-            mdataB->mport, 0, 0, 0, SipFlowData::flow_id);
+        FlowData* fd = stream.get_application_data_from_ip_port(
+            (uint8_t)PktType::UDP, IPPROTO_UDP, &mdataA->maddress,mdataA->mport,
+            &mdataB->maddress, mdataB->mport, 0, 0, 0, SipFlowData::flow_id);
+#endif
         if ( fd )
         {
             stream.set_ignore_direction(p->flow, SSN_DIR_BOTH);
         }
         else
-#endif
         {
             stream.ignore_session(&mdataA->maddress, mdataA->mport, &mdataB->maddress,
                 mdataB->mport, p->type(), SipFlowData::flow_id, SSN_DIR_BOTH);
diff --git a/src/service_inspectors/sip/sip_parser.cc b/src/service_inspectors/sip/sip_parser.cc
index 9c03991ea..860a5a7c6 100644
--- a/src/service_inspectors/sip/sip_parser.cc
+++ b/src/service_inspectors/sip/sip_parser.cc
@@ -957,10 +957,15 @@ static int sip_parse_contact(SIPMsg* msg, const char* start, const char* end, SI
  *  SIP_PARSE_SUCCESS
  ********************************************************************/
 
-static int sip_parse_authorization(SIPMsg* msg, const char* start, const char*, SIP_PROTO_CONF*)
+static int sip_parse_authorization(
+    SIPMsg* msg, const char* start, const char* end, SIP_PROTO_CONF*)
 {
+#ifdef DEBUG_MSGS
     DEBUG_WRAP(int length = end -start; )
     DEBUG_WRAP(DebugMessage(DEBUG_SIP, "Authorization value: %.*s\n", length, start); );
+#else
+    UNUSED(end);
+#endif
     msg->authorization = (char*)start;
     return SIP_PARSE_SUCCESS;
 }
@@ -1036,10 +1041,15 @@ static int sip_parse_content_len(SIPMsg* msg, const char* start, const char*,
  *  SIP_PARSE_SUCCESS
  ********************************************************************/
 
-static int sip_parse_content_encode(SIPMsg* msg, const char* start, const char*, SIP_PROTO_CONF*)
+static int sip_parse_content_encode(
+    SIPMsg* msg, const char* start, const char* end, SIP_PROTO_CONF*)
 {
+#ifdef DEBUG_MSGS
     DEBUG_WRAP(int length = end -start; )
     DEBUG_WRAP(DebugMessage(DEBUG_SIP, "Content encode value: %.*s\n", length, start); );
+#else
+    UNUSED(end);
+#endif
     msg->content_encode = (char*)start;
     return SIP_PARSE_SUCCESS;
 }